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

450 commits

Author SHA1 Message Date
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
f57038ff56 show quantity/tolerance in order screen when unit_quantity=1 2013-07-11 23:20:37 +02:00
wvengen
db8a929f0b Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks 
Great!
 2013-07-11 12:48:41 -07:00
Julius
620686fa46 Merge branch 'master' into stock_article_quantity_history 2013-07-11 19:23:52 +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
wvengen
d397132f7b be safe even with locale string 2013-07-07 02:31:42 +02:00
wvengen
8080cd6b7e pass locale to datepicker, use gem for that 2013-07-07 01:47:22 +02:00
wvengen
a6688b3b43 import manufacturer and origin too (closes #140) 2013-07-06 17:48:40 +02:00
wvengen
b807e9d059 beautify order mail 2013-06-29 02:54:00 +02:00
wvengen
f11d10ff07 update order result mail (fixing html quoting of quotes) 2013-06-29 02:22:01 +02:00
Robert Waltemath
e5d790021c Add repeated symbol to task list. 2013-06-27 10:22:22 +02:00
wvengen
c31e864c73 internationalise currency in order screen 2013-06-26 01:17:04 +02:00
wvengen
dddd11d8f0 do not autocapitalize or autocorrect on login fields to avoid login errors on iPad/iPhone 2013-06-26 00:42:09 +02:00
Robert Waltemath
c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath
a7fd7a7936 Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
Robert Waltemath
990397a7f0 Delete only the FOLLOWING tasks. 2013-06-21 22:04:36 +02:00
Robert Waltemath
c52e482743 Exclude tasks from groups when changing attributes. 2013-06-21 20:54:24 +02:00
wvengen
cab6ada8b8 small invoice i18n cleanup/refactoring 2013-06-21 14:24:05 +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
wvengen
1e984df3aa more beautiful ordergroup edit form 2013-06-18 01:35:12 +02:00
Benjamin Meichsner
eee5d4a896 Fixed indentation bug in sync template. 2013-06-16 15:10:50 +02:00
Benjamin Meichsner
8c4da55561 Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign 2013-06-16 14:55:48 +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
wvengen
b7f71f5859 fix reset password breakage by avoiding encoding ampersand in url (closes #123) 2013-06-11 00:01:57 +02:00
Julius
9753e6db00 Resolve merge conflicts with i18n 2013-06-10 20:05:47 +02:00
Robert Waltemath
b7416b2210 Fixed percent sign in sync-view. 2013-06-10 11:01:31 +02:00
Julius
ff343933dd Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views 2013-06-07 09:49:32 +02:00
Julius
0f4614eb31 Add percent sign for tax in forms 2013-06-06 17:58:02 +02:00
wvengen
8929f69dc4 add missing i18n text 2013-06-06 02:42:38 +02:00
wvengen
3b7cbf71e0 fix i18n typos 2013-05-16 00:05:47 +02:00
wvengen
8b559269c9 add deliveries, pages, tasks translation in English 2013-05-06 12:43:57 +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
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
3f82138d84 finish deliveries i18n 2013-04-10 17:02:16 +02:00
Benjamin Meichsner
93f4239db6 Fixed wrong articles total in group_order#show. 
Conflicts:

	app/views/group_orders/show.html.haml
 2013-04-10 10:54:56 +02:00
Benjamin Meichsner
d4b9370541 Fixed setting all user setting to false in user profile. 2013-04-10 10:52:41 +02:00
Benjamin Meichsner
5b81c53a73 Fixed setting all user setting to false in user profile. 2013-04-08 15:08:57 +02:00
Benjamin Meichsner
4966aae0ad Fixed modal forms. Submit form when hitting enter. 2013-04-08 14:27:23 +02:00
Benjamin Meichsner
9c21a14c7e Update group results when editing order article in balancing. 2013-04-08 14:26:40 +02:00
Benjamin Meichsner
220343128c Fixed wrong articles total in group_order#show. 2013-04-08 13:39:02 +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