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

323 Commits

Author SHA1 Message Date
wvengen 7ef6832ab3 fix invite authentication 2013-12-22 14:20:25 +01:00
wvengen cee96915f9 remove unused redirect_to functionality 2013-12-22 13:59:16 +01:00
Julius bceabfec5c Apply publish/subscribe pattern to stock_article manipulation in delivery form 2013-12-07 16:42:25 +01:00
Julius Rapp dd08e277c7 AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates 2013-12-07 11:20:44 +01:00
wvengen 66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 2013-11-18 11:42:49 +01:00
wvengen bb5a67033d Merge pull request #194 from foodcoop-adam/plugin-move 
Better support for plugins (engines) + move wiki to plugin
 2013-11-12 03:46:15 -08:00
wvengen 768796407f Merge pull request #192 from foodcoop-adam/cleanup-stale 
Cleanup unused views&controllers
 2013-11-11 09:05:19 -08:00
wvengen ec85c1de44 doc update [ci skip] 2013-11-07 20:46:05 +01:00
wvengen 5ead67f88c remove unused memberships controller/view 2013-10-30 20:46:59 +01:00
wvengen de948d7692 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01:00
wvengen 70c12b7c1f move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
wvengen c37ed74942 Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/foodcoop/users/_users.html.haml
 2013-10-29 19:15:52 +01:00
wvengen e968919cce beautify map invocations of users 2013-10-29 18:46:55 +01:00
wvengen 98e7189d31 Merge branch 'master' into i18n 
Conflicts:
	app/assets/javascripts/application.js
 2013-10-18 12:30:34 +02:00
wvengen 23b38b5a46 fix category heading 2013-10-10 19:22:43 +02:00
wvengen 34a4951e28 Merge branch 'master' into i18n 
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
 2013-10-09 23:57:43 +02:00
wvengen 762292ef8e small i18n move 2013-10-09 22:29:19 +02:00
Julius 28644dc334 Force update in Order#finish; rescue if error raised 2013-10-08 19:58:11 +02:00
wvengen a9dff7f1df add missing i18n 2013-10-04 10:25:53 +02:00
Julius fef8c6d99f Move StockArticle#history to StockArticle#show 2013-10-03 22:24:21 +02:00
wvengen 17bbb0705b fix i18n 2013-10-02 17:23:49 +02:00
wvengen a8ace3bc79 add missing i18n 2013-10-02 17:13:49 +02:00
wvengen 6cfaa4979a show lines with zero units but with member orders in balancing screen (closes foodcoops/foodsoft#179) 2013-10-02 16:32:29 +02:00
wvengen 6d3db7636a make search work without nickname usage 2013-09-20 23:18:06 +02:00
wvengen f224735718 remember what member ordered when deleted in balancing screen 2013-09-17 14:19:46 +02:00
wvengen 1bb257c41b remember member order when order article is deleted + test 2013-09-13 15:37:30 +02:00
Benjamin Meichsner 71e02ab569 Merge branch 'rails3' into rails3-to-master 
Conflicts:
	app/views/suppliers/shared_suppliers.haml
 2013-09-02 13:31:40 +02:00
wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. 
Updated migration date to today.

Conflicts:
	db/schema.rb
 2013-07-18 18:48:49 +02:00
Manuel Wiedenmann dfe1cee4cd german i18n + mini fix 2013-07-18 16:23:29 +02:00
Manuel Wiedenmann 0401572580 Merge pull request #1 from foodcoop-adam/extended-i18n 
cleanup of profile layout + set session on login
 2013-07-18 07:19:20 -07:00
Manuel Wiedenmann 206709aa61 sets session[:locale] = user.locale after login 2013-07-18 16:09:32 +02:00
Julius b303b48853 Merge branch 'master' into improve-delivery-workflow-further 2013-07-13 21:08:50 +02:00
wvengen 126f7e7459 Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history 
Show StockChanges index
 2013-07-13 03:16:31 -07:00
Julius 730dc7cf2a Move StockChanges#index to StockArticles#history 2013-07-13 09:32:27 +02:00
Julius edaf91b029 Inline before_filter of stock_changes_controller 2013-07-12 22:19:11 +02:00
wvengen db8a929f0b Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks 
Great!
 2013-07-11 12:48:41 -07:00
Julius ffcb9490c9 Make stock_changes readonly in index view 2013-07-11 18:20:24 +02:00
Robert Waltemath 65c0b555c2 Added warning/ hint when updating periodic task. 2013-07-11 10:30:55 +02:00
Julius de9541a0df Ask how to fetch readonly associations 2013-07-09 21:49:39 +02:00
Julius ef62a18ac9 Add StockChanges index 2013-07-09 21:46:04 +02:00
Julius Rapp a5565b436f Resolve merge conflicts 2013-07-07 14:58:57 +02:00
Julius Rapp 4a208c83c0 Separate actions for new StockArticle 2013-07-07 14:14:32 +02:00
wvengen 76645ebd12 add default tax percentage to app_config 2013-07-06 23:11:50 +02:00
wvengen 3da27734c7 allow import of files with categories that do not exist (map to no category) 2013-07-06 17:49:10 +02:00
wvengen d7540bdd20 fix i18n key 2013-06-30 13:08:13 +02:00
wvengen 0978b84f4d set user language on login to override session 2013-06-28 13:30:26 +02:00
Julius d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft 2013-06-26 20:23:11 +02:00
Julius dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
wvengen 7dbe1363ed fix adding article balancing failing with 'already taken' (closes foodcoops/foodsoft#125) 2013-06-24 13:32:07 +02:00
Robert Waltemath 990397a7f0 Delete only the FOLLOWING tasks. 2013-06-21 22:04:36 +02:00