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

774 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
wvengen
b7f71f5859 fix reset password breakage by avoiding encoding ampersand in url (closes #123) 2013-06-11 00:01:57 +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
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
0058e826b2 Reorder delivery articles 2013-06-07 09:35:22 +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
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
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
Manuel Wiedenmann
15f1ade167 Merge branch 'rails3' into master 
Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/models/article_price.rb
	app/models/message.rb
	config/environment.rb
	vendor/plugins/acts_as_configurable/Rakefile
	vendor/plugins/acts_as_configurable/tasks/acts_as_configurable_tasks.rake
	vendor/plugins/acts_as_ordered/Rakefile
	vendor/plugins/acts_as_paranoid/Rakefile
	vendor/plugins/acts_as_tree/Rakefile
	vendor/plugins/acts_as_versioned/Rakefile
	vendor/plugins/auto_complete/Rakefile
	vendor/plugins/prawnto/Rakefile
	vendor/plugins/wikicloth/Rakefile
	vendor/plugins/will_paginate/Rakefile
 2013-05-21 20:36:07 +02:00
wvengen
d0c74b394e i18n and translate page number text too 2013-05-20 17:14:42 +02:00
wvengen
3b7cbf71e0 fix i18n typos 2013-05-16 00:05:47 +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