Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1543 commits 22 branches 1 tag 31 MiB
Commit graph

554 commits

Author SHA1 Message Date
wvengen
94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup 
Conflicts:
	app/views/deliveries/_stock_article_form.html.haml
	config/locales/de.yml
	config/locales/en.yml
 2013-12-17 15:58:47 +01:00
wvengen
c5b1236f21 Merge pull request #218 from foodcoop-adam/article-dialog 
Edit article user-interface update
 2013-12-17 06:29:04 -08:00
wvengen
5af82eb55c Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch 
Publish/subscribe pattern for DOM updates after AJAX database manipulation
 2013-12-17 06:28:25 -08:00
wvengen
a91c97526e complete German translations (thanks @fsmanuel) [ci skip] 2013-12-16 10:55:45 +01:00
wvengen
11a2b865aa localeapp roundtrip 2013-12-14 13:35:52 +01:00
wvengen
46ab4dcc01 proper i18n of last ordergroup order (thanks @JuliusR) 2013-12-14 13:15:47 +01:00
wvengen
2b6a84ddf8 localeapp roundtrip 2013-12-12 00:33:35 +01:00
wvengen
d448707b1a i18n cleanup (affects foodcoops#137) 2013-12-12 00:13:19 +01:00
wvengen
6bbc614e42 localeapp roundtrip (closes foodcoops#156) 2013-12-10 18:03:50 +01:00
wvengen
e42e27957d improve task i18n (affects foodcoops#137) 2013-12-10 17:58:32 +01:00
wvengen
85b6ff908b make new article dialog more responsive 2013-12-10 16:41:26 +01:00
Julius
30b35cdd11 Improve usability of supplier selection for stock_articles in delivery form 2013-12-09 00:03:07 +01:00
Julius
7eb64e3c9d Update locales 2013-12-07 17:58:06 +01:00
Julius
7a673b1a8b Move stock_article locales from delivery to stock_article 2013-12-07 17:48:04 +01:00
Julius
92f560e189 Again revert wrong quotation mark in English locale 2013-12-07 16:46:16 +01:00
Julius
3e49104318 Revert wrong quotation mark in English locale 2013-12-07 16:44: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
13bb4e0a8b Rename 'simple_form.hints.stock_article.copy_stock_article' to 'simple_form.hints.stock_article.copy' 2013-12-07 15:12:08 +01:00
Julius Rapp
11117738ce Resolve merge conflicts 2013-12-07 11:50:37 +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
b05c75aef3 localeapp roundtrip 2013-12-06 23:12:15 +01:00
wvengen
112fa3be23 fix forgotten i18n string (affects foodcoops#137) 2013-12-06 23:08:28 +01:00
wvengen
111c061efa more i18n cleanup (affects foodcoops#137) 2013-12-06 22:53:59 +01:00
wvengen
a475a27f79 i18n cleanup (affects foodcoops#137) 2013-12-06 22:43:36 +01:00
wvengen
2baa1d3349 fix i18n deprecation warning 2013-12-06 16:13:04 +01:00
wvengen
1c4b9591a2 fix edit article dialog title 2013-12-06 12:34:14 +01:00
wvengen
e42589ae72 translations update (localeapp roundtrip) 2013-12-06 11:58:08 +01:00
wvengen
9990e059d4 fix i18n 2013-11-25 15:24:20 +01:00
wvengen
bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00
wvengen
6410396489 localeapp roundtrip 2013-11-24 02:12:32 +01:00
wvengen
e5471b9f73 more i18n cleanup 2013-11-24 01:47:34 +01:00
wvengen
652a392b37 simplify i18n and fix some small ui issues 2013-11-23 17:49:43 +01:00
wvengen
135e938d3d i18n cleanups (affects #137) 2013-11-23 12:05:29 +01:00
wvengen
2ac7016ccc localeapp roundtrip [ci skip] 2013-11-18 15:01:26 +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
5daf1a466f localeapp roundtrip 2013-11-11 18:08:28 +01: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
891b9a21c0 fix and improve i18n of "My Ordergroup" 2013-11-09 14:19:54 +01:00
wvengen
a27dda62e0 copy migrations to default directory instead of trying to make it more easy to use 2013-11-06 10:54:20 +01:00
wvengen
f7a0103553 clearer login field name 2013-10-30 21:28:35 +01:00
wvengen
3588962329 remove unused layout 2013-10-30 20:53:01 +01:00
wvengen
5ead67f88c remove unused memberships controller/view 2013-10-30 20:46:59 +01:00
wvengen
c3068c8d51 move foodsoft_wiki db migration to plugin 2013-10-30 09:43:38 +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
fde7904c1a allow plugins to modify the navigation menu 2013-10-29 22:18:38 +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
9ba425aafa fallback for when nick is nil 2013-10-29 19:05:24 +01:00
wvengen
68b9f6a974 i18n-js assets configuration change 2013-10-23 12:57:42 +02:00
wvengen
13a7f84e35 localeapp roundtrip [ci skip] 2013-10-23 12:48:19 +02:00
wvengen
d1f9b0b090 apply changes to other translations + translation fixes 2013-10-21 17:55:58 +02:00
wvengen
98e7189d31 Merge branch 'master' into i18n 
Conflicts:
	app/assets/javascripts/application.js
 2013-10-18 12:30:34 +02:00
wvengen
51e6a7aeb0 Merge pull request #149 from foodcoop-adam/updated-gems 
run bundle update and make it work again
 2013-10-18 03:12:59 -07:00
wvengen
6e5184d796 use rails-i18n translations 2013-10-17 16:43:14 +02:00
wvengen
092bc6b150 translation updates 2013-10-17 15:32:03 +02:00
wvengen
a339ae4c7c i18n simple_form move of remaining labels 2013-10-10 19:12:59 +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
67e29620f4 i18n simple_form move of invoices 2013-10-09 23:37:08 +02:00
wvengen
6ba971fe15 i18n simple_form move of deliveries 2013-10-09 23:19:40 +02:00
wvengen
c3d22e883d i18n simple_form move of suppliers 2013-10-09 23:12:26 +02:00
wvengen
78c81b194c i18n simple_form move of foodcoop 2013-10-09 23:00:07 +02:00
wvengen
552af7925d i18n simple_form move of tasks 2013-10-09 22:41:23 +02:00
wvengen
762292ef8e small i18n move 2013-10-09 22:29:19 +02:00
wvengen
bdce1b5872 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-10-09 10:37:02 +02:00
wvengen
1b49a08c5e localeapp roundtrip 2013-10-08 11:42:23 +02:00
wvengen
a32a3757d2 Merge pull request #180 from foodcoop-rostock/search-article-list-modified 
Search articles in group_orders form
 2013-10-08 02:21:35 -07:00
Julius
9041a350d5 Add some locales for article attributes 2013-10-05 22:37:17 +02:00
wvengen
dce92b9d7c i18n ordering javascript 2013-10-04 15:01:24 +02:00
wvengen
64a597c689 use i18n-js 2013-10-04 15:01:10 +02:00
wvengen
a9dff7f1df add missing i18n 2013-10-04 10:25:53 +02:00
Julius
ac1341d5b0 Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip 2013-10-03 23:22:31 +02:00
Julius
9a9a782bc4 Complete StockArticle#show view 2013-10-03 23:21:53 +02:00
Julius
fef8c6d99f Move StockArticle#history to StockArticle#show 2013-10-03 22:24:21 +02:00
wvengen
bbcad49831 start moving from simple_form i18n to activerecord 2013-10-03 16:03:13 +02:00
wvengen
1674dcf851 fix i18n of article sync 2013-10-03 14:36:53 +02:00
wvengen
3574f239c6 localeapp roundtrip 2013-10-02 17:33:37 +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
1d8fefcfb7 small i18n update 2013-10-02 17:08:24 +02:00
wvengen
0bb62332c0 localeapp roundtrip 2013-10-01 00:05:46 +02:00
Julius
9f083dd4d0 Add button to clear article search (list.js customization) 2013-09-23 21:31:54 +02:00
wvengen
77fbf3ca81 Merge pull request #175 from foodcoop-rostock/fix-balancing 
Added hint when changing total delivered amount.
 2013-09-23 02:14:50 -07:00
wvengen
e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
Julius
14d4d2f12d Add list.js for filtering articles (another try for foodcoops#143) 2013-09-18 23:28:18 +02:00
wvengen
f1f7e8d709 localeapp roundtrip 2013-09-18 19:14:48 +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
Benjamin Meichsner
b015ceea0b Merge branch 'warn-uncheck-ordered-article' of https://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-warn-uncheck-ordered-article 2013-09-18 17:50:30 +02:00
Benjamin Meichsner
5444c3a1c0 Merged updates from localeapp. 2013-09-18 17:48:24 +02:00
Benjamin Meichsner
7e659e2374 Merge branch 'order-display-improvements' of https://github.com/foodcoop-adam/foodsoft into foodcoop-adam-order-display-improvements 2013-09-18 17:16:04 +02:00
Benjamin Meichsner
c597d70596 Merge branch 'master' of github.com:foodcoops/foodsoft 2013-09-18 15:19:04 +02:00
Benjamin Meichsner
b515d5b2e8 Fixed whenever cron config. 2013-09-18 14:52:23 +02:00
wvengen
0abb63279f Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-09-18 13:00:26 +02:00
Robert Waltemath
142de28ade Split up messages for stock/ supplier orders. 2013-09-18 10:50:56 +02:00
Robert Waltemath
dbb0bb4506 Added hint when changing total delivered amount. 2013-09-18 10:07:50 +02:00
Robert Waltemath
e728e76729 Merge branch 'master' into warn-uncheck-ordered-article 2013-09-17 17:10:56 +02:00
wvengen
8ca95f396f make both ordered and received products visible in order screens and pdfs 2013-09-16 23:52:58 +02:00
wvengen
ee31c0c2af localeapp roundtrip 2013-09-10 12:06:40 +02:00
wvengen
b235592656 add total to order pdf, layout changes (closes foodcoops/foodsoft#138) 2013-09-10 11:59:32 +02:00
wvengen
6418790ef5 localeapp roundtrip, with updated translations 2013-09-10 10:46:02 +02:00
wvengen
12c0636941 fix i18n buglets (closes #167) 2013-09-10 10:27:13 +02:00
wvengen
9922c0322a first version of new translation: French 2013-09-06 19:41:24 +02:00
Robert Waltemath
805071f3fb Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00
Benjamin Meichsner
51a91f376d Updated locales from localeapp. 2013-09-02 13:34:30 +02:00
wvengen
b9599ce455 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-07-18 20:28:56 +02:00
wvengen
3e4c535bb1 update translations and localeapp roundtrip 2013-07-18 19:27:52 +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
wvengen
1d12e09342 update translations and localeapp roundtrip 2013-07-18 16:22:38 +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
wvengen
3fd498d29f translations update 2013-07-13 12:37:20 +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
wvengen
66e0bbc348 cleanup translation changes introduced by last merge 2013-07-11 22:09:58 +02:00
wvengen
db8a929f0b Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks 
Great!
 2013-07-11 12:48:41 -07:00
wvengen
2ee1bef410 translation updates 2013-07-11 21:36:32 +02:00
Julius
469abb753d Merge branch 'master' into improve-delivery-workflow-further 2013-07-11 19:24:37 +02:00
Julius
620686fa46 Merge branch 'master' into stock_article_quantity_history 2013-07-11 19:23:52 +02:00
Julius
54afbb7af5 Add locales for stock_changes index 2013-07-11 19:21:56 +02:00
Robert Waltemath
65c0b555c2 Added warning/ hint when updating periodic task. 2013-07-11 10:30:55 +02:00
wvengen
33d3b9c466 merge branch minimum_balance into master (closes #133) 2013-07-10 22:03:57 +02:00
Julius
ef62a18ac9 Add StockChanges index 2013-07-09 21:46:04 +02:00
Julius
f76b9da1e9 Separate columns for article price and unit in delivery form 2013-07-08 22:19:27 +02:00
Julius
a6228bdcf2 Style bootstrap tooltip; show FC share in article price info 2013-07-08 22:10:36 +02:00
Julius
ff1317b17b Add hint to copy stock_article if price change desired in delivery process 2013-07-08 21:02:43 +02:00
wvengen
e9e7135639 run bundle update and make it work again 2013-07-08 14:32:24 +02:00
Julius Rapp
a5565b436f Resolve merge conflicts 2013-07-07 14:58:57 +02:00
Julius Rapp
02e2ce4bc3 Update locales 2013-07-07 14:30:13 +02:00
Julius Rapp
d3ccfd1929 Add hint to change name of copied StockArticle 2013-07-07 14:16:06 +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
9ef208fa13 small translation changes 2013-06-29 03:02:05 +02:00
wvengen
b807e9d059 beautify order mail 2013-06-29 02:54:00 +02:00
wvengen
9b0db5bb0b translation updates: capitalisations, order_result mail 2013-06-29 02:46:20 +02:00
Robert Waltemath
e5d790021c Add repeated symbol to task list. 2013-06-27 10:22:22 +02:00
Julius
d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft 2013-06-26 20:23:11 +02:00
Julius
8a79dfd167 Add tooltip for article prices 2013-06-26 20:06:38 +02:00
Julius
2ee7f716ae Improve delivery validation: StockArticles must not be associated more than once 2013-06-26 17:58:55 +02:00
Julius
5df4c8f8a6 Update locales for delivery form 2013-06-26 15:21:11 +02:00
Julius
dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
wvengen
e450cf404e harmonize order cycle translations 2013-06-25 00:16:30 +02:00
Robert Waltemath
c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath
2e1a3eb47f Removed unused I18n strings. 2013-06-22 11:23:08 +02:00
Robert Waltemath
990397a7f0 Delete only the FOLLOWING tasks. 2013-06-21 22:04:36 +02:00
wvengen
cab6ada8b8 small invoice i18n cleanup/refactoring 2013-06-21 14:24:05 +02:00
wvengen
c5c4b1f93f small translation updates 2013-06-21 13:54:36 +02:00