5681553ca0
Avoid connecting to redis backend in test environment.
...
This makes it also possible to test if certain background task are doing what they should do.
2013-09-18 18:04:40 +02:00
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
5444c3a1c0
Merged updates from localeapp.
2013-09-18 17:48:24 +02:00
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
c597d70596
Merge branch 'master' of github.com:foodcoops/foodsoft
2013-09-18 15:19:04 +02:00
b515d5b2e8
Fixed whenever cron config.
2013-09-18 14:52:23 +02:00
0abb63279f
Merge branch 'master' into updated-gems
...
Conflicts:
Gemfile.lock
2013-09-18 13:00:26 +02:00
142de28ade
Split up messages for stock/ supplier orders.
2013-09-18 10:50:56 +02:00
dbb0bb4506
Added hint when changing total delivered amount.
2013-09-18 10:07:50 +02:00
e728e76729
Merge branch 'master' into warn-uncheck-ordered-article
2013-09-17 17:10:56 +02:00
8ca95f396f
make both ordered and received products visible in order screens and pdfs
2013-09-16 23:52:58 +02:00
ee31c0c2af
localeapp roundtrip
2013-09-10 12:06:40 +02:00
b235592656
add total to order pdf, layout changes ( closes foodcoops/foodsoft#138 )
2013-09-10 11:59:32 +02:00
6418790ef5
localeapp roundtrip, with updated translations
2013-09-10 10:46:02 +02:00
12c0636941
fix i18n buglets ( closes #167 )
2013-09-10 10:27:13 +02:00
9922c0322a
first version of new translation: French
2013-09-06 19:41:24 +02:00
805071f3fb
Added checkbox to ignore warnings. Added translations.
2013-09-04 10:52:14 +02:00
51a91f376d
Updated locales from localeapp.
2013-09-02 13:34:30 +02:00
b9599ce455
Merge branch 'master' into updated-gems
...
Conflicts:
Gemfile.lock
2013-07-18 20:28:56 +02:00
3e4c535bb1
update translations and localeapp roundtrip
2013-07-18 19:27:52 +02:00
74bfc85562
Merge remote-tracking branch 'fsmanuel/master' into master.
...
Updated migration date to today.
Conflicts:
db/schema.rb
2013-07-18 18:48:49 +02:00
dfe1cee4cd
german i18n + mini fix
2013-07-18 16:23:29 +02:00
1d12e09342
update translations and localeapp roundtrip
2013-07-18 16:22:38 +02:00
eef4626107
Merge branch 'master' into updated-gems
...
Conflicts:
Gemfile.lock
app/views/deliveries/_form.html.haml
2013-07-17 11:04:28 +02:00
ea399b2c72
client_side_validations config
2013-07-16 00:39:11 +02:00
9fb6597980
Merge branch 'master' into updated-gems
2013-07-16 00:00:55 +02:00
fc6fbdaa95
use less-rails, and make exception_notifier work again
2013-07-13 23:06:30 +02:00
b303b48853
Merge branch 'master' into improve-delivery-workflow-further
2013-07-13 21:08:50 +02:00
3fd498d29f
translations update
2013-07-13 12:37:20 +02:00
126f7e7459
Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history
...
Show StockChanges index
2013-07-13 03:16:31 -07:00
730dc7cf2a
Move StockChanges#index to StockArticles#history
2013-07-13 09:32:27 +02:00
66e0bbc348
cleanup translation changes introduced by last merge
2013-07-11 22:09:58 +02:00
db8a929f0b
Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks
...
Great!
2013-07-11 12:48:41 -07:00
2ee1bef410
translation updates
2013-07-11 21:36:32 +02:00
469abb753d
Merge branch 'master' into improve-delivery-workflow-further
2013-07-11 19:24:37 +02:00
620686fa46
Merge branch 'master' into stock_article_quantity_history
2013-07-11 19:23:52 +02:00
54afbb7af5
Add locales for stock_changes index
2013-07-11 19:21:56 +02:00
65c0b555c2
Added warning/ hint when updating periodic task.
2013-07-11 10:30:55 +02:00
33d3b9c466
merge branch minimum_balance into master ( closes #133 )
2013-07-10 22:03:57 +02:00
ef62a18ac9
Add StockChanges index
2013-07-09 21:46:04 +02:00
f76b9da1e9
Separate columns for article price and unit in delivery form
2013-07-08 22:19:27 +02:00
a6228bdcf2
Style bootstrap tooltip; show FC share in article price info
2013-07-08 22:10:36 +02:00
ff1317b17b
Add hint to copy stock_article if price change desired in delivery process
2013-07-08 21:02:43 +02:00
e9e7135639
run bundle update and make it work again
2013-07-08 14:32:24 +02:00
a5565b436f
Resolve merge conflicts
2013-07-07 14:58:57 +02:00
02e2ce4bc3
Update locales
2013-07-07 14:30:13 +02:00
d3ccfd1929
Add hint to change name of copied StockArticle
2013-07-07 14:16:06 +02:00
4a208c83c0
Separate actions for new StockArticle
2013-07-07 14:14:32 +02:00
76645ebd12
add default tax percentage to app_config
2013-07-06 23:11:50 +02:00
9ef208fa13
small translation changes
2013-06-29 03:02:05 +02:00
b807e9d059
beautify order mail
2013-06-29 02:54:00 +02:00
9b0db5bb0b
translation updates: capitalisations, order_result mail
2013-06-29 02:46:20 +02:00
e5d790021c
Add repeated symbol to task list.
2013-06-27 10:22:22 +02:00
d0ccf07bc5
Merge latest changes in master of http://github.com/foodcoops/foodsoft
2013-06-26 20:23:11 +02:00
8a79dfd167
Add tooltip for article prices
2013-06-26 20:06:38 +02:00
2ee7f716ae
Improve delivery validation: StockArticles must not be associated more than once
2013-06-26 17:58:55 +02:00
5df4c8f8a6
Update locales for delivery form
2013-06-26 15:21:11 +02:00
dd70b84ef0
Linearize and clean up delivery form
2013-06-26 15:16:52 +02:00
e450cf404e
harmonize order cycle translations
2013-06-25 00:16:30 +02:00
c27127c745
Added i18n strings.
2013-06-24 11:53:52 +02:00
2e1a3eb47f
Removed unused I18n strings.
2013-06-22 11:23:08 +02:00
990397a7f0
Delete only the FOLLOWING tasks.
2013-06-21 22:04:36 +02:00
cab6ada8b8
small invoice i18n cleanup/refactoring
2013-06-21 14:24:05 +02:00
c5c4b1f93f
small translation updates
2013-06-21 13:54:36 +02:00
906093b3ce
small i18n fixes and clarifications
2013-06-21 13:49:34 +02:00
6b62fc90d8
Now creating periodic task via button
2013-06-21 13:48:48 +02:00
3cfd8b2d44
fix i18n key
2013-06-21 13:25:52 +02:00
bf32e72414
Improve delivery form validation
2013-06-19 11:21:55 +02:00
c48ce138f3
cleanup of profile layout
2013-06-18 12:25:05 +02:00
04c9770e80
Complete I18n
2013-06-18 10:59:53 +02:00
9502ca28dd
Merge latest changes in master
2013-06-17 15:47:08 +02:00
713c030213
i18n and translate missing entry
2013-06-15 18:43:42 +02:00
8c08de9eae
translation fixes, clarifications and additions
2013-06-15 17:59:15 +02:00
6569579c02
styles the preferences in user profile
2013-06-14 22:38:07 +02:00
b5acd9b116
Merge master branch of base
2013-06-14 18:59:17 +02:00
885b11dba8
Add english translations for novel delivery functionality
2013-06-14 12:33:16 +02:00
ba923a8f16
updates locale files
2013-06-14 02:53:17 +02:00
5b7ec86ed6
Merge branch master into i18n
2013-06-14 02:02:57 +02:00
65f61e09d5
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
2013-06-13 23:36:22 +02:00
ca9841dd02
fixup translation string order for localeapp roundtrip
2013-06-13 00:09:04 +02:00
e3e1b5a1b3
add start of Dutch translation
2013-06-13 00:08:15 +02:00
d63e1f8066
translation updates previously missed
2013-06-12 23:20:02 +02:00
848ef67e40
update documentation urls in config after repository move
2013-06-12 22:57:44 +02:00
a9c3d538d0
use rfc2606 compliant domains in sample config
2013-06-12 22:56:37 +02:00
3d1847fabb
small i18n and translation updates
2013-06-12 22:44:51 +02:00
4037ef12da
Users may delete all tasks of a group, i.e. delete the whole group.
2013-06-12 12:02:13 +02:00
46b07a6136
Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks
...
Conflicts:
config/locales/de.yml
2013-06-12 10:00:11 +02:00
49cfa9aded
Cleanup StockArticle creation during delivery
2013-06-11 15:05:19 +02:00
e28f3eda65
Fix StockArticle creation during delivery; small cleanups
2013-06-11 13:10:18 +02:00
ad29a238f2
finish English translation
2013-06-10 10:02:33 +02:00
0061e45198
removes routes locale constrain and fixes some bugs
2013-06-06 04:29:53 +02:00
60c4c5510a
adds a new user settings system + migration + rake task/worker updates
2013-06-06 03:40:15 +02:00
8929f69dc4
add missing i18n text
2013-06-06 02:42:38 +02:00
3d05900067
make translation roundtrip over localeapp work without changes
2013-06-06 02:28:58 +02:00
fb6196b78b
fix translation errors and inconsistencies between German and English
2013-06-06 01:54:50 +02:00
75c4e7d6f7
move English translations to single file
2013-06-06 01:33:41 +02:00
bf94a4b472
remove superfluous newlines in German translation
2013-06-06 01:33:04 +02:00
c4b5a658c0
move German translations to single file
2013-06-06 01:15:56 +02:00
c2c1961bd0
adds i18n support to routes and application controller; default_locale is set to :en
2013-05-31 18:42:28 +02:00
c42c00b5f1
adds mailcatcher to foodsoft:setup_development
2013-05-29 12:35:16 +02:00
21c7fa40c1
adds a foodsoft:setup_development rake task
2013-05-26 14:02:16 +02:00
ec74b642a0
adds sqlite3 to Gemfile to test deployment
2013-05-25 20:16:49 +02:00
4024329474
adds doc/DEPLOYMENT instructions
2013-05-25 20:03:53 +02:00
92d9a57f3f
adds capistrano for deployment
2013-05-25 19:38:14 +02:00
d0c74b394e
i18n and translate page number text too
2013-05-20 17:14:42 +02:00
0c94ef5912
also translate mail subjects
2013-05-07 13:28:14 +02:00
305ae9b5c0
translate missing defaults
2013-05-07 00:15:00 +02:00
8b559269c9
add deliveries, pages, tasks translation in English
2013-05-06 12:43:57 +02:00
53d5eabf79
fix login i18n
2013-04-26 21:35:23 +02:00
98b729eb71
i18n SimpleForm uses AR as attribute name fallback
2013-04-21 18:22:56 +07:00
f95652c756
fix multiline i18n fields
2013-04-19 11:16:21 +02:00
cb39a4e587
Corrects typo in en.workgroups.yml
2013-04-16 02:08:47 -04:00
f9a87d65a7
Changes copy, grammar, typos in en.simple_form.yml
2013-04-16 02:05:58 -04:00
ea83baa676
Changes copy, grammar, typos in en.shared.yml
2013-04-16 02:03:01 -04:00
e7a3390371
Changes copy, grammar, typos in en.login.yml
2013-04-16 01:59:36 -04:00
c958fe4aac
Changes copy, grammar, typos in en.invites.yml
2013-04-16 01:53:36 -04:00
c0437c5145
Changes copy, grammar, typos in en.home.yml
2013-04-16 01:50:12 -04:00
fd8d73b768
Changes copy, grammar, typos in en.group_orders.yml
2013-04-16 01:46:17 -04:00
ffd6da2d61
Changes copy, grammar, typos in en.foodcoop.yml
2013-04-16 01:44:04 -04:00
df6371c4b6
Changes copy, grammar, typos in en.finance.yml
2013-04-16 01:42:45 -04:00
c41a849be3
Changes copy, grammar, typos in en.feedback.yml
2013-04-16 01:38:35 -04:00
29bb2413aa
Changes copy, grammar, typos in en.defaults.yml
2013-04-16 01:36:23 -04:00
022c26f580
Changes copy, grammar, typos in en.articles.yml
2013-04-16 01:36:01 -04:00
5362eab4ad
Changes copy, grammar, typos in en.admin.yml
2013-04-16 01:34:57 -04:00
5e2a3fb3f0
fix articles controller i18n
...
Conflicts:
app/controllers/articles_controller.rb
2013-04-12 16:17:12 +02:00
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
70542c1ad7
update en translation
2013-04-12 01:30:02 +02:00
ccb116f504
add documents en translation
2013-04-12 01:15:11 +02:00
368d44e26b
fix tasks error reference
2013-04-12 01:08:35 +02:00
692c70d324
finish pages i18n
2013-04-12 00:59:45 +02:00
1a8c8537a4
finish tasks i18n
2013-04-12 00:00:02 +02:00
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
a501fac76f
helpers i18n
2013-04-10 17:29:06 +02:00
3f82138d84
finish deliveries i18n
2013-04-10 17:02:16 +02:00
ee5f7ff1b8
small i18n/translation fixes
2013-04-10 14:07:59 +02:00
13e921a632
Fixed some errors in articles#sync. Show better error messages.
2013-04-08 01:00:49 +02:00
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
4aa40b387a
finish article_categories controllers i18n + translation
2013-04-04 02:10:52 +02:00
8c8778459e
finish documents i18n
2013-04-04 02:04:31 +02:00
24d04b25db
fix some small i18n errors
2013-04-04 00:56:45 +02:00
ec1ef0289b
finish i18n of article_categories + translation
2013-04-04 00:44:07 +02:00
0bb080526a
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/login_controller.rb
app/models/message.rb
app/views/sessions/new.html.haml
2013-04-04 00:29:50 +02:00
e1f5969719
use short form plus title for unit quantity
2013-04-04 00:24:14 +02:00
f55a0955d3
add articles, workgroups translation plus other translation updates
2013-04-04 00:13:16 +02:00
915e1b9e79
Fixed bug in reset password error handling.
2013-03-27 22:12:46 +01:00
f81e315d6f
finish i18n of models without view
2013-03-22 01:21:44 +01:00
75a1051668
finish articles i18n, controller+model
2013-03-22 00:59:42 +01:00
aabeb1a332
finish articles i18n
2013-03-22 00:20:37 +01:00
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
981944b869
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
...
Conflicts:
Gemfile
db/schema.rb
2013-03-15 17:59:19 +01:00
1cbf663b39
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
2013-03-09 16:31:00 +01:00
2f109c376d
Fixed bug when submitting huge forms. (stock taking etc)
2013-03-09 16:14:20 +01:00
cb537bc11c
start articles i18n
2013-03-09 00:40:07 +01:00
b81f414ae5
finish finance/order_articles i18n + en translation
2013-03-08 23:35:50 +01:00
c9b2d01fa5
i18n last merge
2013-03-06 01:24:57 +01:00
2d382df1f1
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/controllers/stockit_controller.rb
app/models/ordergroup.rb
app/models/workgroup.rb
app/views/stockit/index.html.haml
2013-03-06 01:01:12 +01:00
2b03a15a9a
finish finance invoice i18n and en translation
2013-02-27 12:31:01 +01:00
d3d4bf1e2b
add en translation of finance
2013-02-27 12:11:48 +01:00
d9949681a2
localize invite model
2013-02-27 11:59:03 +01:00
467b53c009
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete
2013-02-25 11:14:48 +01:00
3fb5c313ee
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
...
Fixed #88
Conflicts:
app/models/ordergroup.rb
2013-02-25 10:49:55 +01:00
0b66fe6d62
add en translation foodcop, navigation
2013-02-25 10:36:15 +01:00
ae727576dd
en translation update
2013-02-25 10:35:14 +01:00
5dc3fc30ad
Revert 099e2b9b06
2013-02-25 10:29:47 +01:00
8f15cfb446
Revert 396a47b6af
2013-02-25 10:13:44 +01:00
82178161fa
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
...
Fixed #88
2013-02-24 23:26:16 +01:00
c8c269e66a
update en translation after small additions
2013-02-22 00:51:58 +01:00
569cdce2db
finish finance controller i18n
2013-02-22 00:44:39 +01:00
922a6f3a2a
finish navigation i18n
2013-02-22 00:37:17 +01:00
8043fd2164
finish foodcoop i18n + controller + model
2013-02-22 00:19:22 +01:00
c69a559dc4
add en translation stock_takings
2013-02-13 23:17:28 +01:00
c693f697ff
workgroups i18n
2013-02-13 01:34:58 +01:00
02f04be6e8
finish stock_takings i18n + controller
2013-02-13 01:20:20 +01:00
1cb933240b
improve translations
2013-02-13 00:53:36 +01:00
b59244783e
initial en translation of simple_form, stockit
2013-02-13 00:39:21 +01:00
d88a9757ca
improve translations
2013-02-12 00:25:54 +01:00
734179a2bd
clarify group_orders i18n
2013-02-12 00:06:23 +01:00
dea0d9e215
initial en translation of layouts, mailer, ordergroups, shared
2013-02-11 23:44:36 +01:00
20533a5163
fix orders i18n
2013-02-11 15:34:31 +01:00
a0a974b9ce
finish stockit i18n + controllers + model
2013-02-11 11:19:26 +01:00
0065c44b74
i18n finance ordergroups
2013-02-11 10:21:39 +07:00
d2cd5b2b02
i18n group order articles
2013-02-11 10:21:39 +07:00
640e9799aa
i18n financial_transactions + controller
2013-02-11 10:21:39 +07:00
8722a5ed36
small en translation updates
2013-02-11 02:29:22 +01:00
471405ae21
improve translations
2013-02-11 02:29:22 +01:00
df58bf0f18
add translations to en
2013-02-11 02:29:22 +01:00
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
36b18bcfbd
finish messages i18n + controller + model
2013-02-09 10:18:52 +01:00
5941bbbf4f
i18n feedback + controller
2013-02-09 13:01:44 +07:00
6a564f0a25
admin controllers
2013-02-09 12:47:21 +07:00
8d899581bd
finish group_orders i18n + controller
2013-02-09 02:01:31 +01:00
28c66642f5
finish shared i18n
2013-02-08 19:16:06 +01:00
e06524ca37
finish ordergroups and orders i18n + controller
2013-02-08 01:52:20 +01:00
d818ea5d53
finish suppliers controller I18n
2013-02-08 00:31:09 +01:00
eb1e02015e
finish suppliers i18n
2013-02-08 00:11:58 +01:00
27b488a926
fix whitespace characters in translation
2013-02-07 02:35:46 +01:00
e3cf3f4839
improve translations
2013-02-07 00:58:42 +01:00
98ef93c74f
add admin, invites and session translations to en
2013-02-07 00:47:26 +01:00
de730808e7
finish mailer i18n
2013-02-06 00:50:59 +01:00
b12a906a74
finish login i18n + controller
2013-02-05 12:54:55 +01:00
419f5ef0ad
fix layouts i18n
2013-02-05 12:43:21 +01:00
39812bef99
finish layouts i18n, use help url from config, use html language from locale
2013-02-05 12:11:29 +01:00
ecce8041a1
invites controller i18n
2013-02-04 13:01:06 +01:00
034f6a8f5c
finish invites i18n
2013-02-04 12:59:04 +01:00
9138f0da03
also internationalize home controller
2013-02-04 02:12:24 +01:00
1860e1c4cc
also internationalize sessions controller
2013-02-04 02:00:27 +01:00
0c09696b2c
finish sessions i18n
2013-02-04 01:46:07 +01:00
2b11549d33
finished home i18n
2013-02-04 00:46:22 +01:00
22e7f6a9cf
update comment
2013-02-04 00:45:31 +01:00
3c70f5e702
de.admin.yml cleanup
2013-02-04 01:42:01 +07:00
64b3d7e17d
finished admin/users i18n + dry the admin i18n
2013-02-04 01:38:18 +07:00
75c9338fd9
finished admin/workgroups i18n
2013-02-04 00:36:03 +07:00
e949257912
finished admin/ordergroups i18n
2013-02-04 00:10:11 +07:00
42c97520a1
started with admin views
2013-02-03 23:16:42 +07:00
e0b781fca6
split locales into directory, and load from there
2013-02-01 17:56:34 +01:00
afda844380
initial English locale translation
2013-01-31 11:03:32 +01:00
396a47b6af
Improve stock_article_selections
2013-01-28 20:46:35 +01:00
524819b86f
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3
...
Conflicts:
app/helpers/application_helper.rb
2013-01-27 22:01:53 +01:00
44ef0a9807
Added bullet gem to track unusued eager loading.
2013-01-26 16:16:50 +01:00
0683738003
Removed html ids from navigation.
2013-01-26 16:16:06 +01:00
099e2b9b06
Add stock_article_selection (deleting multiple stock articles at once)
2013-01-12 16:14:06 +01:00
ecb7ce7cd3
Remove secret_token.rb from git's tracked files
2013-01-12 16:11:07 +01:00
e509e28fd0
Force access over ssl in production mode.
2012-12-26 14:12:48 +01:00
d347e2404b
Added whenever to manage cronjobs.
2012-12-26 14:03:35 +01:00
2c0fe08be6
Replaced delayed_job with resque. See README_DEVEL
2012-12-23 17:38:04 +01:00
344abf5a26
Deployment stuff. Ignore capistrano. Faster precompiling.
2012-12-22 18:38:49 +01:00
bae09624b7
Avoid deleting categories which still have articles.
2012-12-11 10:53:01 +01:00
620ec946f1
Merge branch 'master' into master-rails3-merging
...
Conflicts:
.gitignore
.rbenv-version
app/controllers/finance/balancing_controller.rb
app/views/finance/balancing/_order_article_form.html.haml
Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
1cdb9e8501
Outlined new concept for multiple periodically recurring tasks ( #3 ).
2012-11-28 10:13:54 +01:00
ecc31641aa
Changed header to copy old foodsoft style.
2012-11-24 15:23:12 +01:00
1d9815731c
Removed fancybox. Fixed profile, my ordergroup and tasks.
2012-11-12 09:18:44 +01:00
dce79802e0
Fixed feedback.
2012-11-10 17:05:43 +01:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
699fb9b233
Fixed wiki pages.
2012-10-09 02:31:10 +02:00
acdb331e36
Improved tasks.
2012-10-08 21:52:03 +02:00
52e62f8ddb
Fixed messages. New styling for token input plugin.
2012-10-08 18:19:15 +02:00
c0c41a7752
Fixed foodcoop/ordergroups and workgroups views.
2012-10-08 16:20:24 +02:00
ab81ef09d5
Replace will_paginate with kaminari. Fixed foodcoop/users page.
2012-10-08 15:24:32 +02:00
1708df3f6c
Fixed login, new_password and invitation views.
2012-10-08 11:51:56 +02:00
f20ae890dd
Added twitter bootstrap layout. Adapt home page.
2012-10-06 17:14:57 +02:00
0a1c326f14
Upgraded to rails 3.2.8
2012-09-30 21:38:52 +02:00
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
cd91436f7f
Allow ignoring apple restriction for specific ordergroup.
2012-09-30 13:34:16 +02:00
ff4ab44bcc
Add option to restrict ordering when not enough apples.
2012-09-29 17:52:25 +02:00
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
7bc23698d1
Updated README_DEVEL.
2012-08-24 15:20:33 +02:00
b0c9580b53
Added delayed_job as new background queue manager.
2012-08-24 13:48:45 +02:00
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
6f7682d6a0
Fixed new user invite.
2012-08-06 12:00:40 +02:00
fc8418bc8e
Some fixes in group forms.
2012-07-31 18:48:41 +02:00
f759552022
Fixed user settings.
2012-07-31 18:21:42 +02:00
8a74e7d77f
Removed annoate and hirb Gemfiles.
...
Annotate: Better look in schema.rb, this reference should be always up
to date.
Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
2012-07-27 18:07:42 +02:00
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
c49edb79a2
Fixed edit_not in balancing.
2012-05-12 10:55:20 +02:00
b295f62322
Updated finance/invoices
2012-04-20 18:33:47 +02:00
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
b3c64ecb85
Fixed order views.
2011-06-20 00:26:17 +02:00
88b268cb0b
Refactoring of order comments.
2011-06-19 20:47:27 +02:00
eb4705857b
Ordering refactored: Made everything RESTful.
2011-06-19 15:30:33 +02:00
172db1d37e
Admin namespace beendet.
2011-06-10 13:22:15 +02:00
c173cf4a6a
my_profile and admin/ordergroups.
2011-06-10 01:36:04 +02:00
a787b3cf24
Admin/users refactored.
2011-06-09 22:03:27 +02:00
ea6348bc5c
Refactored finance/ordergroups|transactions module.
2011-06-09 21:35:05 +02:00
fc1d130113
Refactored stockit, delivery an stock_takings.
2011-05-27 14:09:01 +02:00
3f133bb8c3
Added client side validations. Fixed shared sync.
2011-05-19 22:35:13 +02:00
1e33411516
refactored some js stuff. Fixed forms in article modul.
2011-05-19 19:49:37 +02:00
9388e918a7
Implemented fancy box for ajax forms. Refactored articles modul.
2011-05-18 17:37:10 +02:00
0decbb36e1
Refactored article_categories.
2011-05-18 16:10:30 +02:00
0b1682af7c
Fixed suppliers module.
2011-05-18 15:52:06 +02:00
772cf87c92
Fixed wiki module.
2011-05-18 15:29:38 +02:00
d5552059ce
Refactored messages modul, but refactoring is still neccessary.
2011-05-18 14:47:17 +02:00
1cf63fc40b
Some fixes to home view.
2011-05-16 10:34:14 +02:00
06f2cc2007
Fixed and refactored foodcoop/workgroups.
2011-05-16 00:34:43 +02:00
5d028ccf3a
Added new autocomplete for task assignments.
...
Introduced the cool jquery token plugin.
2011-05-14 19:41:46 +02:00
2e56bfe895
Some fixes for tasks.
2011-05-14 19:02:52 +02:00
03d84aed1d
Added simple form for easier form building.
2011-05-14 17:06:32 +02:00
ca15bb1102
Include session_store in git repo, but not the secret token.
2011-05-14 16:51:10 +02:00
0757be8319
Updated rails i18n translations.
2011-05-14 16:34:10 +02:00
e589ad5274
Updated rails i18n translations.
2011-05-13 22:44:18 +02:00
197516b7fc
Fixed language and flash divs.
2011-05-11 17:41:43 +02:00
2a72263bd3
Replaced protoype with jquery. Some fixes in mailer class.
2011-05-11 15:14:39 +02:00
bdb177dfa6
Fixed bug in routes.rb
2011-05-11 14:21:06 +02:00
e40f865c45
Refactored login module. Implemented standard sessions controller.
2011-05-11 13:38:46 +02:00
eab16e337e
Updated router. Temporarly replaced routing filter with rails internal.
2011-05-11 12:27:58 +02:00
b71fcdf371
Do not load exception notifier in development mode.
2011-05-11 11:20:10 +02:00
d09d3922c1
Upgraded exception notifier plugin.
2011-05-11 11:03:36 +02:00
8679356ccf
Updated development.rb.SAMPLE.
2011-05-11 10:13:56 +02:00
dbe86b4f0f
Modified new session store initializers.
2011-05-11 10:11:47 +02:00
4eba5fbc9c
First step for upgrading to rails 3.
...
Check rake rails:upgrade:check for next steps.
2011-05-11 01:32:21 +02:00
bea145f33d
Upgrade rails to 2.3.11.
2011-05-10 23:29:36 +02:00
be85296ddb
Enabled hirb for better console formatting.
2011-05-07 21:14:11 +02:00
face58ebef
Updated README_DEVEL.
2011-05-06 20:38:39 +02:00
50a45cfa7d
Updated config/boot.rb to rails 2.3.10
2011-05-06 20:07:54 +02:00
0df0519947
Upgrade to rails 2.3.10.
2011-05-06 19:52:50 +02:00
20b7db306b
Implemented bundler. No more confusiong with gem versions!
2011-01-30 22:59:32 +01:00
be321798a7
Fixed some links in tasks module.
2010-06-10 23:25:13 +02:00
74407a5912
Fixed paths in task-menu.
2010-06-01 16:18:20 +02:00
7067294133
Fixed broken links/paths.
2010-05-25 23:36:05 +02:00
00d9f060cc
Merge branch 'routing-filter'
2010-05-25 23:16:49 +02:00
ca1c5d7db4
Start with I18n implementation.
2010-05-15 11:11:09 +02:00
571548dfbc
Fixed routing bug on (ex) admin controller.
2010-03-22 01:58:37 +01:00
18e8a11b7d
Removed unnecessary config params. Improved error handling.
2010-03-22 01:25:24 +01:00
61a87dacb6
Fixed routing bug in last commit.
2010-03-21 00:08:02 +01:00
f49c6493f4
Removed hard coded links from mailer and views.
...
* Not tested every mail template. Hopefully everything works ;-)
2010-03-20 14:49:46 +01:00
2c1952d625
Removed hardcoded links from main tabnav.
...
* Reorganized routes and foodsoft config
* Avoid saving of wrong foodcoop tokens when following hard coded link
2010-03-20 13:45:58 +01:00
9cb367463c
Merge branch 'master' into routing-filter
2010-03-20 13:45:27 +01:00
d11c619c82
Removed session key from version control.
...
* Maybe you have to delete your cookies after pulling this commit.
2010-03-20 02:46:06 +01:00
e7af7e82b5
Implemented routing filter for foodcoop select.
...
* Allows now a multi coop installation for one domain!
* SSL, we are coming...
* TODO: Remove all the hardcoded urls, check email-links etc.
2010-03-20 02:26:30 +01:00
356d922eb4
New prawn gem breaks application.
...
* Require specific version.
2010-02-23 21:02:17 +01:00
7a77d1aa66
Caching of css and javascript for better speed results.
2010-02-09 21:06:24 +01:00
20c7c0ef02
Revert "Tasks should be default page in foodcoop module."
...
This reverts commit b5b27cee6e
2009-10-17 11:53:17 +02:00
b5b27cee6e
Tasks should be default page in foodcoop module.
2009-10-16 21:10:52 +02:00
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
fd97c1fc60
Made multi coop installation available as an option in app_config.yml.
2009-08-13 16:36:01 +02:00
5d9385cde4
Changed wiki parser to wikicloth.
...
* Temporarly removing of TOC.
2009-08-11 14:30:35 +02:00
8c3c8a1f95
Extended config sample for the new tolerance_not_costly feature.
2009-08-05 12:15:37 +02:00
178fba7b30
Create restful invites controller and ajaxified the workflow.
2009-08-02 19:41:09 +02:00
5cf75ee32a
Moved foodcoop/members into new foodcoop/users restful controller.
2009-08-02 19:01:45 +02:00
0d910dfbbd
Moved foodcoop/workgroups into new namespace foodcoop. Closes #20
2009-08-02 18:42:52 +02:00
1a8026c5a7
Move foodcoop/ordergroups into nwe namespace foodcoop. Made it more restful.
2009-08-02 18:12:13 +02:00
709425855e
Added validation for unit_quantity and localization for article attributes.
2009-07-21 15:09:55 +02:00
55729e20f9
Create a redirect when editing the title of a page.
2009-06-11 23:51:26 +02:00
434fc4b2ff
Change wiki-parser again. Now wikitext is used.
2009-06-11 22:40:56 +02:00
d371839eba
Prefer textile over markup because markup doesn't support any tables. bähh.
2009-05-20 13:03:58 +02:00
43fc7b06f8
Upgrade foodsoft to rails 2.3.2.
2009-05-17 15:01:36 +02:00
053c665270
Added version control for wiki pages.
2009-05-15 17:32:45 +02:00
f83d2659de
Added better routing for wiki-root-path.
2009-05-15 13:53:45 +02:00
dafbb077b6
wiki-syntax: Use markup instead of textile.
2009-05-07 17:59:34 +02:00
f450070dbf
First steps for an own wiki.
...
* Scaffold for Page Objekt
* Using textile for rendering html
* Easy wiki-links with [[wikipage]]
2009-03-25 19:54:04 +01:00
ffc3adf907
Second (last) part of multiple foodcoop installation.
...
* When before_filter select_foodcoop is activated,
the database and configs will be loaded on each request.
* Replaced APP_CONFIG with new Foodsoft.config method.
2009-03-24 17:25:33 +01:00
1c24127928
First part of multiple foodcoop installation.
2009-03-24 17:01:10 +01:00
e4c394d881
New foodcoop configuration option. Use own mailinglist instead of messaging system.
2009-03-17 18:13:00 +01:00
3ea8d5a2ef
Refactoring of message system.
2009-02-18 01:06:35 +01:00
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +01:00
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +01:00
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +01:00
24b66ee8d4
Small bugfix in shared view. Translations on start-page.
2009-02-06 21:18:20 +01:00
c17b63b192
Second part of stock-integration.
...
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +01:00
1912a3fd80
First part of stock-integratino. Orders with supplier_id == 0 become stockorders.
2009-02-05 16:40:02 +01:00
aec93d4b73
Fixed bugs from last commit and in ExceptionNotification-config.
2009-02-02 17:12:08 +01:00
0a2a79237a
Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.
2009-02-02 16:35:43 +01:00
aa47a24fda
Refactoring of invitations.
2009-02-02 00:09:50 +01:00
d75c206db5
Fixed some wrong links in startpage. Added gettext-help for controllers.
2009-02-01 23:09:03 +01:00
7f09bb55e4
Fixed some wrong links in admin-startpage and bugs in ordergroup-model.
2009-02-01 21:53:08 +01:00
e16bebd042
Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'.
2009-02-01 20:56:23 +01:00
9eb2125f15
Complete refactoring of orders-workflow.
...
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
2009-01-29 01:57:51 +01:00
80287aeea4
Updating README_DEVEL and fixing environment.rb so foodsoft runs on a clean system.
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-01-27 19:57:07 +08:00
fc45345e0d
Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results)
2009-01-20 19:37:15 +01:00
b820577382
Update License (to GPL3) and install instructions.
2009-01-20 15:59:06 +01:00
2630ca2b14
Removed finance-controller for more clarity.
2009-01-19 16:40:06 +01:00
936e6ef69a
Refactoring of articles and article_categories. articles are now a nested resource of supplier.
2009-01-16 16:19:26 +01:00
b38025869a
Introduced StockChange. Implemented first part of stockit-logic with updating article's quantity.
2009-01-16 02:17:49 +01:00
e8d55e50c0
Complete refactoring of messaging module. From now messages are saved only once and send afterwards via a the 'send_emails'-rake-task.
2009-01-15 18:26:37 +01:00
6ce6c2c75a
Replaced IndexController by Home- and FoodcoopController. Some reorganizing in groups/memberships-logic (moved memberships out of admin-namespace).
2009-01-15 12:14:01 +01:00
fadc951208
Second part of admin-namespace-reorder. Also renamed OrderGroup into Ordergroup. More view-sharing between groups is neccessary.
2009-01-14 12:46:01 +01:00
2d5dc03b90
Groups are now workgroups. First part of moving groups-logic into admin-namespace.
2009-01-13 19:01:56 +01:00
461dfa8531
Moved users into new admin-namespace and made the controller restful. Also moved some logic from the controller into the user-model (dry it up..).
2009-01-12 18:26:09 +01:00
47398c6a70
Moved balancing logic into new namespace 'finance'.
2009-01-10 22:22:16 +01:00
c282cae79c
Moved financial_transaction into the new finance-namespace.
2009-01-10 21:28:22 +01:00
1d85b880f2
Created namespace 'finance' and moved invoices into it.
2009-01-10 19:36:58 +01:00
30f3d199d3
Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet.
2009-01-08 16:33:27 +01:00
a6c7b04e33
Replaced rfpdf with prawn and prawnto. Start to convert pdf-views.
2009-01-07 15:29:23 +01:00
da309f03b0
Add missing method for gettext-string-converter.
2009-01-06 15:55:29 +01:00
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
Benjamin Meichsner
wvengen
Robert Waltemath
Manuel Wiedenmann
Julius
wvengen
Lippe
Benjamin Meichsner
Benjamin Meichsner
sandoz
Benjamin Meichsner
lasse