Commit Graph

866 Commits

Author SHA1 Message Date
Robert Waltemath 7942ccfae6 Added missing migration files. 2013-06-24 12:02:22 +02:00
Robert Waltemath c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath abe7c7181d Remove obsolete columns from database. 2013-06-24 10:57:42 +02:00
Robert Waltemath 3d1faa9ed3 Skip save callback when migrating data. 2013-06-24 10:36:14 +02:00
Robert Waltemath d081a2c66b Validate done/weekly combination only on creation of task. 2013-06-24 09:49:06 +02:00
Robert Waltemath 577945e591 Add validation for task.done in combination with periodic task. 2013-06-22 18:56:17 +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 ef329b5647 Added up and down migration for weekly task data. 2013-06-22 17:35:45 +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
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 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
wvengen 931b3bef5e fix touch event twice bug (complements ac62dcce9d) 2013-06-20 01:20:13 +02:00
wvengen 1e984df3aa more beautiful ordergroup edit form 2013-06-18 01:35:12 +02:00
wvengen f47237ebe0 update link 2013-06-17 03:13:42 +02:00
wvengen 9523eba65f add badges 2013-06-17 02:59:36 +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 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
wvengen 18f067ea60 make localeapp updates work in production environment too 2013-06-14 03:10:32 +02:00
wvengen 2f31d1a5f8 add heroku deploy script 2013-06-14 02:42:13 +02:00
wvengen 9b05923d7c Merge branch 'touchscreens' 2013-06-14 01:44:04 +02:00
wvengen ac62dcce9d make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104) 2013-06-14 01:42:47 +02:00
wvengen 8141ad0233 remove duplicate code 2013-06-14 01:39:30 +02:00
wvengen 13f2c128c6 do not use string values for integers (closes foodcoops/foodsoft#128) 2013-06-14 01:36:41 +02:00
wvengen add4afd172 make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104) 2013-06-13 11:59:50 +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 71d8f9bde7 Fixed schema.rb. 2013-06-12 10:20:06 +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
wvengen ad29a238f2 finish English translation 2013-06-10 10:02:33 +02:00
Manuel Wiedenmann d9b6723975 adds infos about the new branch structure to readme 2013-06-10 02:01:15 +02:00
Manuel Wiedenmann 7a63394dac Merge remote-tracking branch 'origin/rails3'
Conflicts:
	Gemfile
	Gemfile.lock
2013-06-10 01:53:31 +02:00
Benjamin Meichsner 241c5666ec Merge pull request #119 from balkansalat/rails3-improve-checkall-performance
Improve performance of *check-all* checkbox
2013-06-09 09:19:19 -07:00
Benjamin Meichsner fd091d9b89 Merge pull request #118 from balkansalat/rails3-order-delivery-articles
Order articles for delivery selection by name only
2013-06-09 09:15:20 -07:00
Benjamin Meichsner 7c4ee01ff2 Define autofill attributes when creating new supplier from shared_supplier. 2013-06-09 18:02:47 +02:00
Benjamin Meichsner e74c6b4068 Avoid having content-length warning in dev log. 2013-06-09 17:33:11 +02:00