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

788 Commits

Author SHA1 Message Date
wvengen 2b97ca050a i18n oops 2014-01-09 13:22:32 +01:00
wvengen 124341c7d6 receive helper and i18n cleanup 2014-01-09 13:01:10 +01:00
wvengen bdb9499535 fix broken update password flow 2014-01-08 14:09:28 +01:00
wvengen ce17bf33e0 complete and improve receive i18n 2014-01-08 13:39:49 +01:00
wvengen 6e60f94484 small receive-related i18n updates 2014-01-08 12:52:29 +01:00
Julius 563993fffa Complete I18n of current receive screen 2014-01-08 00:06:50 +01:00
Julius d7c771d10a Continue I18n of receive screen 2014-01-06 23:48:39 +01:00
wvengen 69a29b8296 Merge pull request #245 from fsmanuel/rss_feed + 1 2014-01-06 13:55:32 +01:00
Julius f83f6971e8 Rename update_current_price to update_global_price to avoid confusion 2014-01-04 21:35:19 +01:00
Manuel Wiedenmann 0d0ff90a64 adds an RSS feed for pages/all 2014-01-04 20:12:01 +01:00
Robert Waltemath 2f02f89089 Allow login through link in message (and remember requested page). 2014-01-03 15:27:15 +01:00
wvengen 133429720c old price display tweaks 2014-01-03 14:11:50 +01:00
wvengen 4c9e84ecc6 change layout of receive unlock 2014-01-03 12:40:43 +01:00
wvengen 98f59a3de3 Readonly receive input if GroupOrderArticle result has manually been changed 
Conflicts:
	app/helpers/orders_helper.rb
	app/views/orders/_edit_amount.html.haml
 2014-01-03 10:33:09 +01:00
Julius 033aa90698 Use OrderArticle#create in receive form instead of Order#add_article 2014-01-02 19:16:09 +01:00
Julius 59c118a171 Apply publish/subscribe for OrderArticle#create 2014-01-02 19:16:03 +01:00
Julius 01264bc0ac Clean up OrderArticle#new form and related stuff 2014-01-02 19:14:46 +01:00
Julius baa5f16cfc Free order_article resource from finance namespace; also unlock for role_orders 2014-01-02 19:14:41 +01:00
Julius cf1e68f11d Allow to edit OrderArticle in Order#receive form 2014-01-02 19:14:33 +01:00
Julius 81dfe8110c Apply publish/subscribe for OrderArticle#update 2014-01-02 19:14:07 +01:00
wvengen 27a73be68f Merge remote-tracking branch 'foodcoops/master' into feature-receive 2014-01-02 18:57:59 +01:00
Julius 3336065218 Add missing translations for ArticlePrice attributes 2013-12-30 12:38:26 +01:00
Julius f3c3b7af34 Fix StockArticle#derive title i18n 2013-12-28 20:07:28 +01:00
Julius 3bf1392251 Show clearer error message on WikiCloth exception 2013-12-22 23:34:54 +01:00
Julius 42e983f7ee Move html markup of WikiCloth exception from locales to controller 2013-12-22 18:09:40 +01:00
Julius 496a250495 Rescue on WikiCloth exception 2013-12-22 12:17:02 +01:00
wvengen 88f2dad706 language change 2013-12-18 22:14:52 +01:00
wvengen 84fe791078 update balancing screen 2013-12-18 22:10:38 +01:00
wvengen 873a1ff108 update texts 2013-12-18 21:58:15 +01:00
wvengen d299fa4870 move receive screen to orders 2013-12-18 21:08:58 +01:00
wvengen 2b511ee559 Merge branch 'master' into fresh-flow 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-18 17:03:26 +01:00
wvengen a02ca1b9c0 localeapp roundtrip [ci skip] 2013-12-17 18:54:05 +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 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
wvengen 906093b3ce small i18n fixes and clarifications 2013-06-21 13:49:34 +02:00
Robert Waltemath 6b62fc90d8 Now creating periodic task via button 2013-06-21 13:48:48 +02:00
wvengen 3cfd8b2d44 fix i18n key 2013-06-21 13:25:52 +02:00
Julius bf32e72414 Improve delivery form validation 2013-06-19 11:21:55 +02:00
wvengen c48ce138f3 cleanup of profile layout 2013-06-18 12:25:05 +02:00
Julius 04c9770e80 Complete I18n 2013-06-18 10:59:53 +02:00
Julius 9502ca28dd Merge latest changes in master 2013-06-17 15:47:08 +02:00
wvengen 713c030213 i18n and translate missing entry 2013-06-15 18:43:42 +02:00
wvengen 8c08de9eae translation fixes, clarifications and additions 2013-06-15 17:59:15 +02:00
Manuel Wiedenmann 6569579c02 styles the preferences in user profile 2013-06-14 22:38:07 +02:00
Julius b5acd9b116 Merge master branch of base 2013-06-14 18:59:17 +02:00
Julius 885b11dba8 Add english translations for novel delivery functionality 2013-06-14 12:33:16 +02:00
Manuel Wiedenmann ba923a8f16 updates locale files 2013-06-14 02:53:17 +02:00
Manuel Wiedenmann 5b7ec86ed6 Merge branch master into i18n 2013-06-14 02:02:57 +02:00
Julius 65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
wvengen ca9841dd02 fixup translation string order for localeapp roundtrip 2013-06-13 00:09:04 +02:00
wvengen e3e1b5a1b3 add start of Dutch translation 2013-06-13 00:08:15 +02:00
wvengen d63e1f8066 translation updates previously missed 2013-06-12 23:20:02 +02:00
wvengen 848ef67e40 update documentation urls in config after repository move 2013-06-12 22:57:44 +02:00
wvengen a9c3d538d0 use rfc2606 compliant domains in sample config 2013-06-12 22:56:37 +02:00
wvengen 3d1847fabb small i18n and translation updates 2013-06-12 22:44:51 +02:00
Robert Waltemath 4037ef12da Users may delete all tasks of a group, i.e. delete the whole group. 2013-06-12 12:02:13 +02:00
Robert Waltemath 46b07a6136 Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks 
Conflicts:
	config/locales/de.yml
 2013-06-12 10:00:11 +02:00
Julius 49cfa9aded Cleanup StockArticle creation during delivery 2013-06-11 15:05:19 +02:00
Julius e28f3eda65 Fix StockArticle creation during delivery; small cleanups 2013-06-11 13:10:18 +02:00
wvengen ad29a238f2 finish English translation 2013-06-10 10:02:33 +02:00
Manuel Wiedenmann 0061e45198 removes routes locale constrain and fixes some bugs 2013-06-06 04:29:53 +02:00
Manuel Wiedenmann 60c4c5510a adds a new user settings system + migration + rake task/worker updates 2013-06-06 03:40:15 +02:00
wvengen 8929f69dc4 add missing i18n text 2013-06-06 02:42:38 +02:00
wvengen 3d05900067 make translation roundtrip over localeapp work without changes 2013-06-06 02:28:58 +02:00
wvengen fb6196b78b fix translation errors and inconsistencies between German and English 2013-06-06 01:54:50 +02:00
wvengen 75c4e7d6f7 move English translations to single file 2013-06-06 01:33:41 +02:00
wvengen bf94a4b472 remove superfluous newlines in German translation 2013-06-06 01:33:04 +02:00
wvengen c4b5a658c0 move German translations to single file 2013-06-06 01:15:56 +02:00
Manuel Wiedenmann c2c1961bd0 adds i18n support to routes and application controller; default_locale is set to :en 2013-05-31 18:42:28 +02:00
Manuel Wiedenmann c42c00b5f1 adds mailcatcher to foodsoft:setup_development 2013-05-29 12:35:16 +02:00
Manuel Wiedenmann 21c7fa40c1 adds a foodsoft:setup_development rake task 2013-05-26 14:02:16 +02:00
Manuel Wiedenmann ec74b642a0 adds sqlite3 to Gemfile to test deployment 2013-05-25 20:16:49 +02:00
Manuel Wiedenmann 4024329474 adds doc/DEPLOYMENT instructions 2013-05-25 20:03:53 +02:00
Manuel Wiedenmann 92d9a57f3f adds capistrano for deployment 2013-05-25 19:38:14 +02:00
wvengen d0c74b394e i18n and translate page number text too 2013-05-20 17:14:42 +02:00
wvengen 0c94ef5912 also translate mail subjects 2013-05-07 13:28:14 +02:00
wvengen 305ae9b5c0 translate missing defaults 2013-05-07 00:15:00 +02:00
wvengen 8b559269c9 add deliveries, pages, tasks translation in English 2013-05-06 12:43:57 +02:00
wvengen 53d5eabf79 fix login i18n 2013-04-26 21:35:23 +02:00
Manuel Wiedenmann 98b729eb71 i18n SimpleForm uses AR as attribute name fallback 2013-04-21 18:22:56 +07:00
wvengen f95652c756 fix multiline i18n fields 2013-04-19 11:16:21 +02:00
Lippe cb39a4e587 Corrects typo in en.workgroups.yml 2013-04-16 02:08:47 -04:00
Lippe f9a87d65a7 Changes copy, grammar, typos in en.simple_form.yml 2013-04-16 02:05:58 -04:00
Lippe ea83baa676 Changes copy, grammar, typos in en.shared.yml 2013-04-16 02:03:01 -04:00
Lippe e7a3390371 Changes copy, grammar, typos in en.login.yml 2013-04-16 01:59:36 -04:00
Lippe c958fe4aac Changes copy, grammar, typos in en.invites.yml 2013-04-16 01:53:36 -04:00
Lippe c0437c5145 Changes copy, grammar, typos in en.home.yml 2013-04-16 01:50:12 -04:00
Lippe fd8d73b768 Changes copy, grammar, typos in en.group_orders.yml 2013-04-16 01:46:17 -04:00
Lippe ffd6da2d61 Changes copy, grammar, typos in en.foodcoop.yml 2013-04-16 01:44:04 -04:00
Lippe df6371c4b6 Changes copy, grammar, typos in en.finance.yml 2013-04-16 01:42:45 -04:00
Lippe c41a849be3 Changes copy, grammar, typos in en.feedback.yml 2013-04-16 01:38:35 -04:00
Lippe 29bb2413aa Changes copy, grammar, typos in en.defaults.yml 2013-04-16 01:36:23 -04:00
Lippe 022c26f580 Changes copy, grammar, typos in en.articles.yml 2013-04-16 01:36:01 -04:00
Lippe 5362eab4ad Changes copy, grammar, typos in en.admin.yml 2013-04-16 01:34:57 -04:00
wvengen 5e2a3fb3f0 fix articles controller i18n 
Conflicts:

	app/controllers/articles_controller.rb
 2013-04-12 16:17:12 +02:00
wvengen f6ba21832d Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.haml
	app/views/articles/sync.html.haml
	app/views/finance/balancing/_edit_note.html.haml
	app/views/finance/group_order_articles/_form.html.haml
	app/views/finance/order_articles/_edit.html.haml
	app/views/finance/order_articles/_new.html.haml
	app/views/group_orders/show.html.haml
	app/views/invites/_modal_form.html.haml
 2013-04-12 15:45:24 +02:00
wvengen 70542c1ad7 update en translation 2013-04-12 01:30:02 +02:00
wvengen ccb116f504 add documents en translation 2013-04-12 01:15:11 +02:00
wvengen 368d44e26b fix tasks error reference 2013-04-12 01:08:35 +02:00
wvengen 692c70d324 finish pages i18n 2013-04-12 00:59:45 +02:00
wvengen 1a8c8537a4 finish tasks i18n 2013-04-12 00:00:02 +02:00
wvengen 6c65799025 use more beautiful close mark 2013-04-10 17:34:24 +02:00
wvengen a501fac76f helpers i18n 2013-04-10 17:29:06 +02:00
wvengen 3f82138d84 finish deliveries i18n 2013-04-10 17:02:16 +02:00
wvengen ee5f7ff1b8 small i18n/translation fixes 2013-04-10 14:07:59 +02:00
Benjamin Meichsner 13e921a632 Fixed some errors in articles#sync. Show better error messages. 2013-04-08 01:00:49 +02:00
wvengen f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen 4aa40b387a finish article_categories controllers i18n + translation 2013-04-04 02:10:52 +02:00
wvengen 8c8778459e finish documents i18n 2013-04-04 02:04:31 +02:00
wvengen 24d04b25db fix some small i18n errors 2013-04-04 00:56:45 +02:00
wvengen ec1ef0289b finish i18n of article_categories + translation 2013-04-04 00:44:07 +02:00
wvengen 0bb080526a Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/login_controller.rb
	app/models/message.rb
	app/views/sessions/new.html.haml
 2013-04-04 00:29:50 +02:00
wvengen e1f5969719 use short form plus title for unit quantity 2013-04-04 00:24:14 +02:00
wvengen f55a0955d3 add articles, workgroups translation plus other translation updates 2013-04-04 00:13:16 +02:00
Benjamin Meichsner 915e1b9e79 Fixed bug in reset password error handling. 2013-03-27 22:12:46 +01:00
wvengen f81e315d6f finish i18n of models without view 2013-03-22 01:21:44 +01:00
wvengen 75a1051668 finish articles i18n, controller+model 2013-03-22 00:59:42 +01:00
wvengen aabeb1a332 finish articles i18n 2013-03-22 00:20:37 +01:00
wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
 2013-03-21 22:08:09 +01:00
Benjamin Meichsner c05b3e0e19 Balancing: Do not update oder summary automaticly when changing group orders. 2013-03-17 15:47:50 +01:00
Robert Waltemath 981944b869 Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks 
Conflicts:
	Gemfile
	db/schema.rb
 2013-03-15 17:59:19 +01: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
wvengen cb537bc11c start articles i18n 2013-03-09 00:40:07 +01:00
wvengen b81f414ae5 finish finance/order_articles i18n + en translation 2013-03-08 23:35:50 +01:00
wvengen c9b2d01fa5 i18n last merge 2013-03-06 01:24:57 +01:00
wvengen 2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
 2013-03-06 01:01:12 +01:00
wvengen 2b03a15a9a finish finance invoice i18n and en translation 2013-02-27 12:31:01 +01:00
wvengen d3d4bf1e2b add en translation of finance 2013-02-27 12:11:48 +01:00
wvengen d9949681a2 localize invite model 2013-02-27 11:59:03 +01:00
Julius 467b53c009 Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete 2013-02-25 11:14:48 +01:00
Benjamin Meichsner 3fb5c313ee Show usefull error message for uniqueness_of_name with acts_as_paranoid. 
Fixed #88

Conflicts:

	app/models/ordergroup.rb
 2013-02-25 10:49:55 +01:00
wvengen 0b66fe6d62 add en translation foodcop, navigation 2013-02-25 10:36:15 +01:00
wvengen ae727576dd en translation update 2013-02-25 10:35:14 +01:00
Julius 5dc3fc30ad Revert 099e2b9b06 2013-02-25 10:29:47 +01:00
Julius 8f15cfb446 Revert 396a47b6af 2013-02-25 10:13:44 +01:00
Benjamin Meichsner 82178161fa Show usefull error message for uniqueness_of_name with acts_as_paranoid. 
Fixed #88
 2013-02-24 23:26:16 +01:00
wvengen c8c269e66a update en translation after small additions 2013-02-22 00:51:58 +01:00
wvengen 569cdce2db finish finance controller i18n 2013-02-22 00:44:39 +01:00
wvengen 922a6f3a2a finish navigation i18n 2013-02-22 00:37:17 +01:00
wvengen 8043fd2164 finish foodcoop i18n + controller + model 2013-02-22 00:19:22 +01:00
wvengen c69a559dc4 add en translation stock_takings 2013-02-13 23:17:28 +01:00
wvengen c693f697ff workgroups i18n 2013-02-13 01:34:58 +01:00
wvengen 02f04be6e8 finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
wvengen 1cb933240b improve translations 2013-02-13 00:53:36 +01:00
wvengen b59244783e initial en translation of simple_form, stockit 2013-02-13 00:39:21 +01:00
wvengen d88a9757ca improve translations 2013-02-12 00:25:54 +01:00
wvengen 734179a2bd clarify group_orders i18n 2013-02-12 00:06:23 +01:00
wvengen dea0d9e215 initial en translation of layouts, mailer, ordergroups, shared 2013-02-11 23:44:36 +01:00
wvengen 20533a5163 fix orders i18n 2013-02-11 15:34:31 +01:00
wvengen a0a974b9ce finish stockit i18n + controllers + model 2013-02-11 11:19:26 +01:00
Manuel Wiedenmann 0065c44b74 i18n finance ordergroups 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann d2cd5b2b02 i18n group order articles 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann 640e9799aa i18n financial_transactions + controller 2013-02-11 10:21:39 +07:00
wvengen 8722a5ed36 small en translation updates 2013-02-11 02:29:22 +01:00
wvengen 471405ae21 improve translations 2013-02-11 02:29:22 +01:00
wvengen df58bf0f18 add translations to en 2013-02-11 02:29:22 +01:00
Manuel Wiedenmann 8be93c33f8 i18n finance + controller 2013-02-10 15:05:31 +07:00
wvengen 36b18bcfbd finish messages i18n + controller + model 2013-02-09 10:18:52 +01:00
Manuel Wiedenmann 5941bbbf4f i18n feedback + controller 2013-02-09 13:01:44 +07:00
Manuel Wiedenmann 6a564f0a25 admin controllers 2013-02-09 12:47:21 +07:00
wvengen 8d899581bd finish group_orders i18n + controller 2013-02-09 02:01:31 +01:00
wvengen 28c66642f5 finish shared i18n 2013-02-08 19:16:06 +01:00
wvengen e06524ca37 finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
wvengen d818ea5d53 finish suppliers controller I18n 2013-02-08 00:31:09 +01:00
wvengen eb1e02015e finish suppliers i18n 2013-02-08 00:11:58 +01:00
wvengen 27b488a926 fix whitespace characters in translation 2013-02-07 02:35:46 +01:00
wvengen e3cf3f4839 improve translations 2013-02-07 00:58:42 +01:00
wvengen 98ef93c74f add admin, invites and session translations to en 2013-02-07 00:47:26 +01:00
wvengen de730808e7 finish mailer i18n 2013-02-06 00:50:59 +01:00
wvengen b12a906a74 finish login i18n + controller 2013-02-05 12:54:55 +01:00
wvengen 419f5ef0ad fix layouts i18n 2013-02-05 12:43:21 +01:00
wvengen 39812bef99 finish layouts i18n, use help url from config, use html language from locale 2013-02-05 12:11:29 +01:00
wvengen ecce8041a1 invites controller i18n 2013-02-04 13:01:06 +01:00
wvengen 034f6a8f5c finish invites i18n 2013-02-04 12:59:04 +01:00
wvengen 9138f0da03 also internationalize home controller 2013-02-04 02:12:24 +01:00
wvengen 1860e1c4cc also internationalize sessions controller 2013-02-04 02:00:27 +01:00
wvengen 0c09696b2c finish sessions i18n 2013-02-04 01:46:07 +01:00
wvengen 2b11549d33 finished home i18n 2013-02-04 00:46:22 +01:00
wvengen 22e7f6a9cf update comment 2013-02-04 00:45:31 +01:00
Manuel Wiedenmann 3c70f5e702 de.admin.yml cleanup 2013-02-04 01:42:01 +07:00
Manuel Wiedenmann 64b3d7e17d finished admin/users i18n + dry the admin i18n 2013-02-04 01:38:18 +07:00
Manuel Wiedenmann 75c9338fd9 finished admin/workgroups i18n 2013-02-04 00:36:03 +07:00
Manuel Wiedenmann e949257912 finished admin/ordergroups i18n 2013-02-04 00:10:11 +07:00
Manuel Wiedenmann 42c97520a1 started with admin views 2013-02-03 23:16:42 +07:00
wvengen e0b781fca6 split locales into directory, and load from there 2013-02-01 17:56:34 +01:00
wvengen afda844380 initial English locale translation 2013-01-31 11:03:32 +01:00
Julius 396a47b6af Improve stock_article_selections 2013-01-28 20:46:35 +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
Benjamin Meichsner 0683738003 Removed html ids from navigation. 2013-01-26 16:16:06 +01:00
Julius 099e2b9b06 Add stock_article_selection (deleting multiple stock articles at once) 2013-01-12 16:14:06 +01:00
Julius ecb7ce7cd3 Remove secret_token.rb from git's tracked files 2013-01-12 16:11:07 +01:00
benni e509e28fd0 Force access over ssl in production mode. 2012-12-26 14:12:48 +01:00
benni d347e2404b Added whenever to manage cronjobs. 2012-12-26 14:03:35 +01:00
benni 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
benni 344abf5a26 Deployment stuff. Ignore capistrano. Faster precompiling. 2012-12-22 18:38:49 +01:00
benni bae09624b7 Avoid deleting categories which still have articles. 2012-12-11 10:53:01 +01:00
benni 620ec946f1 Merge branch 'master' into master-rails3-merging 
Conflicts:
	.gitignore
	.rbenv-version
	app/controllers/finance/balancing_controller.rb
	app/views/finance/balancing/_order_article_form.html.haml

Fixed updating current price in finance balancing.
 2012-12-11 10:32:59 +01:00
Robert Waltemath 1cdb9e8501 Outlined new concept for multiple periodically recurring tasks (#3). 2012-11-28 10:13:54 +01:00