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

937 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Benjamin Meichsner
60afa85ece Merge pull request #116 from balkansalat/rails3-balancing-delete-article 
Update ordergroup prices in OrderArticles via Order.
 2013-06-09 08:26:38 -07:00
Manuel Wiedenmann
c8c810a0a4 added user setting to set_locale 2013-06-07 19:05:28 +02:00
Julius
0ebe38b7a9 Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-improve-checkall-performance 2013-06-07 09:52:56 +02:00
Julius
966902ff55 Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-order-delivery-articles 2013-06-07 09:51:50 +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
0058e826b2 Reorder delivery articles 2013-06-07 09:35:22 +02:00
Julius
0f4614eb31 Add percent sign for tax in forms 2013-06-06 17:58:02 +02:00
Julius
b8a23a396c Remove test variable 2013-06-06 17:09:22 +02:00
Julius
0d3c23f814 Improve performance of data-check-all 2013-06-06 17:06:05 +02:00
wvengen
a1a469da03 do not fail when common_deploy is not installed 2013-06-06 14:54:54 +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
Manuel Wiedenmann
e8173d44ae adds rails-settings cached and rails-i18n-debug gems 2013-06-06 03:21:44 +02:00
Manuel Wiedenmann
47405b5b19 fixes locales issue 2013-06-06 03:18:02 +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
c38ce28347 fix i18n bug 2013-06-06 02:13:40 +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
Robert Waltemath
82fb6d1dbe Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-06-06 00:37:50 +02:00
wvengen
043fc6391c show header on fax PDF (closes bennibu#109) 2013-06-04 13:08:50 +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
Robert Waltemath
2a1176c31a Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-05-30 10:54:22 +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
2fb7797c12 readds mysql 2013-05-25 20:31:15 +02:00
Manuel Wiedenmann
ec74b642a0 adds sqlite3 to Gemfile to test deployment 2013-05-25 20:16:49 +02:00
Manuel Wiedenmann
6b84f4f117 updates common_deploy 2013-05-25 20:10:48 +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
Manuel Wiedenmann
a3df346110 DEVELOPMENT typo 2013-05-25 15:44:01 +02:00
Manuel Wiedenmann
e49db90dae readme typo 2013-05-25 15:05:09 +02:00
Manuel Wiedenmann
1f44204b58 readme updates 2013-05-25 15:03:31 +02:00