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

862 Commits

Author SHA1 Message Date
Sijmen Mulder 630aa383cb Remove apple-touch-icon links 
Safari will fall back to request the default touch icons if the href of the
link 404s, so having them point at nothing generates 4 404s for nothing.
 2013-11-19 22:57:55 +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 9b47e5d6c4 use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values 2013-11-18 11:31:30 +01:00
wvengen 588898d7b0 do not error when calling shared_article on non-shared article 2013-11-13 23:20:48 +01:00
tg(x) de9453fa24 dashboard: link to view order page 2013-11-13 16:42:32 +01:00
wvengen a5a29aff5c Merge pull request #195 from foodcoop-adam/grouporder-many-products 
Allow large product lists in member order
 2013-11-12 08:41:48 -08: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 ce3b89c910 make authentication methods more readable (thanks @fsmanuel) 2013-11-11 16:23:20 +01:00
wvengen 891b9a21c0 fix and improve i18n of "My Ordergroup" 2013-11-09 14:19:54 +01:00
wvengen ec85c1de44 doc update [ci skip] 2013-11-07 20:46:05 +01:00
wvengen a535fbc517 allow large product lists in member order 2013-11-05 10:55:28 +01:00
wvengen f4e4d11bae workaround for integration test problem 2013-11-01 20:27:53 +01:00
wvengen 13c8af3642 use abbr instead of acronym for heading helper 2013-11-01 12:49:21 +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 fef17604c5 remove unused autocomplete templates 2013-10-30 20:50:56 +01:00
wvengen 5ead67f88c remove unused memberships controller/view 2013-10-30 20:46:59 +01:00
wvengen 6e9954c86f remove user referencing page as it is not being used anyway 2013-10-30 11:04:22 +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 e13ca74df3 fix new user form 2013-10-29 19:11:33 +01:00
wvengen 9ba425aafa fallback for when nick is nil 2013-10-29 19:05:24 +01:00
wvengen e968919cce beautify map invocations of users 2013-10-29 18:46:55 +01:00
wvengen 3275e9ba31 small i18n bug 2013-10-22 00:09:11 +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 e1eb6031c8 load fr translation for datepicker 2013-10-17 16:48:34 +02:00
wvengen 4e61e764df fix haml indentation errors 2013-10-17 16:35:50 +02:00
wvengen 389b45a505 fix stockit i18n reference 2013-10-10 19:23:37 +02:00
wvengen 23b38b5a46 fix category heading 2013-10-10 19:22:43 +02:00
wvengen d64590a534 more robustness 2013-10-10 17:50:10 +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 6c17c17982 i18n simple_form move of fax pdf 2013-10-09 23:41:15 +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 b8ff431634 clean up price tooltips javascript 2013-10-09 10:43:41 +02:00
wvengen bdce1b5872 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-10-09 10:37:02 +02:00
Julius 28644dc334 Force update in Order#finish; rescue if error raised 2013-10-08 19:58:11 +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 10d1615cd8 Prepare tooltip for next bootstrap version (as in 1fed9834b3) 2013-10-05 22:28:04 +02:00
Julius 3a948e9b73 Move list.js extensions to plugins 2013-10-04 18:28:45 +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
Julius a3e82f5304 Add article price tooltip to StockTaking form 2013-10-03 22:14:41 +02:00
Julius 26e207aeb1 Reuse some list.js standard template functions (thanks to wvengen https://gist.github.com/wvengen/6784056) 2013-10-03 16:10:18 +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 1870276cd2 show user name with use_nick is false 2013-10-02 23:43:09 +02:00
wvengen 1946cd1ab3 make user creation possible again 2013-10-02 23:33:24 +02:00
wvengen bc5795b052 small model change 2013-10-02 23:29: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 1d8fefcfb7 small i18n update 2013-10-02 17:08:24 +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
Julius d36f2dd4ac Fix minor delivery bug 2013-09-30 11:04:55 +02:00
Julius c1ac95e440 list.unlist.js: Use jQuery's toggleClass instead of native if-else (just for briefness) 2013-09-25 20:58:53 +02:00
Julius a87ced2646 Hide article category if no article matches the search 2013-09-24 21:21:08 +02:00
Julius 9f083dd4d0 Add button to clear article search (list.js customization) 2013-09-23 21:31:54 +02:00
Julius 3c8f56b24f Add dismiss button to sidebars in group_order form (idea stolen from foodcoops#143) 2013-09-22 22:07:34 +02:00
Julius 6ec81ace18 Always show article category headers (do not unlist them on list.js search) 2013-09-22 22:04:29 +02:00
Julius 891293af84 Add delay to list.js search 2013-09-22 21:50:59 +02:00
wvengen ea3db22306 user display changes in model and mailer 2013-09-22 14:38:56 +02:00
wvengen f6c2fd9a9d more user display changes 2013-09-22 02:15:35 +02:00
wvengen 6d3db7636a make search work without nickname usage 2013-09-20 23:18:06 +02:00
wvengen 17c1ee803f fix typo breaking invitation 2013-09-20 23:15:44 +02:00
wvengen e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
wvengen a77c3b59b1 allow to login with email instead of nick as well + tests 2013-09-20 22:39:19 +02:00
Benjamin Meichsner 2060261c89 Merge pull request #144 from foodcoop-adam/fix-closed-group_order-totals 
fix closed group_order totals
 2013-09-19 03:14:40 -07:00
Julius 14d4d2f12d Add list.js for filtering articles (another try for foodcoops#143) 2013-09-18 23:28:18 +02:00
wvengen c7f28a3b5c use plain Ruby memoization to fix deprecation (closes #121) 2013-09-18 22:46:58 +02:00
wvengen ebb22ccb53 Merge branch 'master' into fix-closed-group_order-totals 
Conflicts:
	db/schema.rb
 2013-09-18 18:14:07 +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 857eb64a45 Merge pull request #173 from foodcoop-adam/keep-member-order-on-orderarticle-deletion 
Keep member order on orderarticle deletion
 2013-09-18 08:32:33 -07: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
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 e728e76729 Merge branch 'master' into warn-uncheck-ordered-article 2013-09-17 17:10:56 +02:00
wvengen 6d4aa5ed40 Merge pull request #163 from foodcoop-rostock/order-tasks-alphabetically 
Order tasks with same date by name.
 2013-09-17 05:45:13 -07:00
wvengen f224735718 remember what member ordered when deleted in balancing screen 2013-09-17 14:19:46 +02:00
wvengen b11706f30a sort ordergroups in order screen and pdfs 2013-09-17 00:25:38 +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 1bb257c41b remember member order when order article is deleted + test 2013-09-13 15:37:30 +02:00
wvengen b235592656 add total to order pdf, layout changes (closes foodcoops/foodsoft#138) 2013-09-10 11:59:32 +02:00
wvengen 39b3dee050 do not show empty fields on fax pdf (closes foodcoops/foodsoft#108) 2013-09-10 11:59:32 +02:00
wvengen e20898c5ee Merge branch 'tests-rspec' into master-spec 2013-09-10 11:37:05 +02:00
wvengen 12c0636941 fix i18n buglets (closes #167) 2013-09-10 10:27:13 +02:00
wvengen 7de57715f2 Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
 2013-09-07 01:11:24 +02:00
Benjamin Meichsner a0760ebfdb Fixed delivering emails to users. 
There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
 2013-09-06 11:40:40 +02:00
Robert Waltemath 9f22615a25 Order tasks with same date by name. 2013-09-05 10:16:57 +02:00
Robert Waltemath 805071f3fb Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00