Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
1,685 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

57 Commits

Author SHA1 Message Date
wvengen 8777830029 Add unit: bag 2015-01-02 17:11:02 +01:00
wvengen 12bf2198e5 fix simple_form deprecations 2014-12-10 22:04:32 +01:00
wvengen 6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen 03b307d359 fix more sensible mailer option defaults 2014-09-03 11:43:15 +02:00
wvengen 68ccc19c70 allow to configure currency (closes foodcoops#258) 2014-09-02 15:02:25 +02:00
wvengen ae392ad861 fix number display 2014-06-23 17:51:20 +02:00
wvengen a43020463d normalize article and category attributes (closes foodcoops#294) 2014-06-23 17:51:19 +02:00
wvengen 99301a0576 make Redis a softer dependency 
(closes foodcoops#288)
 2014-06-23 17:51:18 +02:00
wvengen d7938b752c fix simple_navigation ids 2014-05-13 17:01:26 +02:00
wvengen c25d4d3f4f use ruby-units for unit parsing (closes foodcoops/foodsoft#200) 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-05-13 17:01:25 +02:00
wvengen ab514d7eb6 use encrypted cookies on new installations 2014-02-24 12:46:28 +01:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen 9b27ce29e9 fix BigDecimal to_s monkey-patch (complements 0052d4af1a4cc397c4248a7049a52e35ce33cec1) 2013-12-17 18:02:11 +01:00
wvengen be76f29473 do not show ".0" even for floats 2013-12-17 18:02:04 +01:00
wvengen bdce1b5872 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-10-09 10:37:02 +02:00
Benjamin Meichsner 5681553ca0 Avoid connecting to redis backend in test environment. 
This makes it also possible to test if certain background task are doing what they should do.
 2013-09-18 18:04:40 +02:00
wvengen eef4626107 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml
 2013-07-17 11:04:28 +02:00
wvengen ea399b2c72 client_side_validations config 2013-07-16 00:39:11 +02:00
wvengen 9fb6597980 Merge branch 'master' into updated-gems 2013-07-16 00:00:55 +02:00
wvengen fc6fbdaa95 use less-rails, and make exception_notifier work again 2013-07-13 23:06:30 +02:00
Julius b303b48853 Merge branch 'master' into improve-delivery-workflow-further 2013-07-13 21:08:50 +02:00
Julius ef62a18ac9 Add StockChanges index 2013-07-09 21:46:04 +02:00
wvengen e9e7135639 run bundle update and make it work again 2013-07-08 14:32:24 +02:00
Julius dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
Julius bf32e72414 Improve delivery form validation 2013-06-19 11:21:55 +02:00
Benjamin Meichsner 1cbf663b39 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 2013-03-09 16:31:00 +01:00
Benjamin Meichsner 2f109c376d Fixed bug when submitting huge forms. (stock taking etc) 2013-03-09 16:14:20 +01:00
Julius 524819b86f Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3 
Conflicts:
	app/helpers/application_helper.rb
 2013-01-27 22:01:53 +01:00
Benjamin Meichsner 44ef0a9807 Added bullet gem to track unusued eager loading. 2013-01-26 16:16:50 +01:00
Julius ecb7ce7cd3 Remove secret_token.rb from git's tracked files 2013-01-12 16:11:07 +01:00
benni 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
benni 1708df3f6c Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
benni 0a1c326f14 Upgraded to rails 3.2.8 2012-09-30 21:38:52 +02:00
benni 29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni ec2e761e7f Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
benni b0c9580b53 Added delayed_job as new background queue manager. 2012-08-24 13:48:45 +02:00
benni ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni eb4705857b Ordering refactored: Made everything RESTful. 2011-06-19 15:30:33 +02:00
benni 3f133bb8c3 Added client side validations. Fixed shared sync. 2011-05-19 22:35:13 +02:00
benni 2e56bfe895 Some fixes for tasks. 2011-05-14 19:02:52 +02:00
benni 03d84aed1d Added simple form for easier form building. 2011-05-14 17:06:32 +02:00
benni ca15bb1102 Include session_store in git repo, but not the secret token. 2011-05-14 16:51:10 +02:00
benni b71fcdf371 Do not load exception notifier in development mode. 2011-05-11 11:20:10 +02:00
benni d09d3922c1 Upgraded exception notifier plugin. 2011-05-11 11:03:36 +02:00
benni dbe86b4f0f Modified new session store initializers. 2011-05-11 10:11:47 +02:00
benni 4eba5fbc9c First step for upgrading to rails 3. 
Check rake rails:upgrade:check for next steps.
 2011-05-11 01:32:21 +02:00
Benjamin Meichsner 18e8a11b7d Removed unnecessary config params. Improved error handling. 2010-03-22 01:25:24 +01:00
Benjamin Meichsner f49c6493f4 Removed hard coded links from mailer and views. 
* Not tested every mail template. Hopefully everything works ;-)
 2010-03-20 14:49:46 +01:00
Benjamin Meichsner 2c1952d625 Removed hardcoded links from main tabnav. 
* Reorganized routes and foodsoft config
* Avoid saving of wrong foodcoop tokens when following hard coded link
 2010-03-20 13:45:58 +01:00
Benjamin Meichsner d11c619c82 Removed session key from version control. 
* Maybe you have to delete your cookies after pulling this commit.
 2010-03-20 02:46:06 +01:00