5d47171b76
Improve upload error handling
2015-04-17 18:44:38 +02:00
c30ec67548
Allow synchronising units when uploading
2015-04-11 02:52:57 +02:00
4d1e102f47
Checkbox to remove articles not in upload
2015-04-11 02:52:57 +02:00
d5a7f6a074
Move file import logic to model
2015-04-11 02:52:57 +02:00
0d92007274
Improve upload form
2015-04-11 02:52:57 +02:00
16e9210035
Fix title of new upload screen
2015-04-11 02:52:57 +02:00
08c8d25a9d
New message form and checkbox papercuts
2015-04-11 02:32:30 +02:00
07311aa032
Merge pull request #357 from foodcoop1040/user_activity
...
Add last user login and activity
2015-04-03 16:01:18 +02:00
15ac566ece
Add help page for Foodsoft variables
2015-03-20 16:32:58 +01:00
a6f02a24d4
Improve wiki edit documentation
2015-03-20 15:50:49 +01:00
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
55e8ff481c
Add reply_to and group_id to messages schema
2015-02-27 17:30:26 +01:00
26c364bf4b
Merge pull request #354 from foodcoop1040/recipients
...
Show recipients of messages
2015-02-18 23:28:29 +01:00
e57fd500fc
Add possibility to copy an order
...
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
23f0a1613a
Show recipients of messages
2015-02-18 17:45:20 +01:00
cfdfe5f23e
Improve header+footer in PDFs
2015-01-03 00:24:33 +01:00
7bc9d0ede6
Upgrade to rails 4.2
2015-01-02 17:43:44 +01:00
8777830029
Add unit: bag
2015-01-02 17:11:02 +01:00
6272816358
Localeapp roundtrip
2014-12-31 13:11:39 +01:00
1c0db4374f
Merge pull request #332 from foodcoops/feature/edit-address
...
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
86eee94249
Add hint for ordergroup address in user form
2014-12-16 20:53:38 +01:00
0aa098e75b
localeapp roundtrip
2014-12-15 21:11:41 +01:00
12bf2198e5
fix simple_form deprecations
2014-12-10 22:04:32 +01:00
cee2ac8f9f
Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
...
Configure upfront tasks
2014-12-06 14:35:22 +01:00
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +01:00
f6c008c79c
Allow configuration of task periods
2014-11-23 01:34:51 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
6e990fed4c
Upgrade to rails 4.1
2014-11-21 14:37:56 +01:00
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
e9dcaadb06
localeapp roundtrip
2014-10-14 18:39:05 +02:00
9a7b3378c3
Make invalid login message depend on use_nick (closes foodcoops#321)
2014-10-09 09:42:13 +02:00
575928d8a3
fix use_messages heading in config screen (closes foodcoops#319)
2014-10-07 01:07:11 +02:00
b961037fff
Fixed broken login#update_password route.
2014-10-05 20:35:28 +02:00
668ba1e5d6
add webstats_tracking_code to configuration screen (closes foodcoops#311)
2014-09-22 09:36:36 +02:00
81d22e6077
Allow adding tracking code for webstatistics service. E.g. piwik.
2014-09-22 09:15:47 +02:00
418a8b5806
fix i18n issues + localeapp roundtrip
...
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
03b307d359
fix more sensible mailer option defaults
2014-09-03 11:43:15 +02:00
1a3b690757
add custom css to config screen
2014-09-02 15:02:26 +02:00
cf680d3410
add page break to config screen
2014-09-02 15:02:26 +02:00
68ccc19c70
allow to configure currency (closes foodcoops#258)
2014-09-02 15:02:25 +02:00
3fee071a10
specify timezone in configuration (closes foodcoops#282)
2014-09-02 14:21:33 +02:00
6115979bae
allow protected keys to be set/unset + config_db tests
2014-09-02 14:21:32 +02:00
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +02:00
a39c56fdf1
update strings from localeapp
2014-09-02 14:21:15 +02:00
97dc090e4d
Merge pull request #306 from wvengen/feature-styling
...
allow foodcoops to add custom css
2014-09-02 13:59:18 +02:00
19630e8607
allow foodcoops to add custom css
2014-09-02 13:35:45 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
63d52db91b
more sensible mailer option defaults
...
Conflicts:
app/mailers/base_mailer.rb
config/app_config.yml.SAMPLE
spec/app_config.yml
2014-09-02 12:35:57 +02:00
790a6b1972
allow to set page break options for each document
2014-08-29 12:01:21 +02:00
d8f4ac47dd
handle ajax errors (closes foodcoops#300)
2014-07-02 13:55:05 +02:00
94e100b78b
localeapp roundtrip
2014-06-23 17:51:20 +02:00
cdc746b364
update production environment to match 3.3.0 version
2014-06-23 17:51:20 +02:00
ae392ad861
fix number display
2014-06-23 17:51:20 +02:00
873e8d44a2
harmonize foodsoft capitalisation
2014-06-23 17:51:20 +02:00
6466ea9653
revamp footer
2014-06-23 17:51:20 +02:00
a43020463d
normalize article and category attributes (closes foodcoops#294)
2014-06-23 17:51:19 +02:00
e7a476e6b6
remove unused season import fields
2014-06-23 17:51:19 +02:00
99301a0576
make Redis a softer dependency
...
(closes foodcoops#288)
2014-06-23 17:51:18 +02:00
c54e15dc04
localeapp roundtrip
2014-06-23 17:51:18 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
a7ebf78fd4
hide insignificant zeroes for percentage
2014-05-17 14:20:48 +02:00
cf0558b1ff
localeapp roundtrip
2014-05-13 17:01:27 +02:00
9821f111c2
add missing locale
2014-05-13 17:01:26 +02:00
64bb8e043d
enable/disable plugins by config option
2014-05-13 17:01:26 +02:00
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
ea8e4ee560
add pdf configuration options
2014-05-13 17:01:26 +02:00
d7938b752c
fix simple_navigation ids
2014-05-13 17:01:26 +02:00
9743a9f112
localeapp roundtrip
2014-05-13 17:01:25 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
fe0b17cdb0
cleanup email footer
2014-05-13 17:01:25 +02:00
c25d4d3f4f
use ruby-units for unit parsing ( closes foodcoops/foodsoft#200 )
...
Conflicts:
Gemfile
Gemfile.lock
2014-05-13 17:01:25 +02:00
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
03585e272f
add configuration for default language
2014-05-13 17:01:25 +02:00
3f032e5dd9
make apple points optional
...
a next step would be to move this to a plugin
2014-05-13 17:01:25 +02:00
0fa9bebac9
show supplier user-interface update
2014-05-13 17:01:24 +02:00
0014435663
improved shared database import ui
2014-05-13 17:01:24 +02:00
9214fff5a1
localeapp roundtrip (mostly formatting changes)
2014-03-15 17:17:25 +01:00
bb9269f755
avoid word-wrap when showing currency
2014-03-15 16:40:53 +01:00
ab514d7eb6
use encrypted cookies on new installations
2014-02-24 12:46:28 +01:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
346bf00b67
localeapp roundtrip (includes updated German translation)
2014-02-19 11:42:25 +01:00
e61b3dc248
update Dutch translation
2014-02-15 12:38:05 +01:00
286c96196c
localeapp roundtrip
2014-02-15 12:37:01 +01:00
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
f9d2c20aaa
cleanup articles sorted in groups
2014-02-10 15:58:58 +01:00
2de4a2a3a0
Merge pull request #256 from wvengen/feature-partial_shared_sync
...
Small change to allow non-shared articles with shared suppliers
2014-02-07 11:24:33 +01:00
d92f3f2298
deploy: persist changes to session_store iniitalizer [ci skip]
2014-02-03 10:53:22 +01:00
3f12627aa4
Merge pull request #253 from wvengen/feature-cleaner_order_details
...
cleanup show order and add search
2014-01-29 08:44:31 -08:00
381d5de0a3
Merge pull request #250 from wvengen/feature-deploy
...
deployment with Capistrano 3 (in progress)
2014-01-27 03:08:24 -08:00
d08f120b27
show message when ignoring articles due to missing order number
2014-01-24 22:20:29 +01:00
2b0d4b0ad7
fix deploy_to, and use stage
2014-01-21 09:46:18 +01:00
8db516c5f0
Merge branch 'master' into feature-cleaner_order_details
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2014-01-20 13:36:46 +01:00
c5cc714f9b
add Dutch translation texts
2014-01-20 13:30:14 +01:00
3b2d4dfd08
localeapp roundtrip
2014-01-20 12:59:57 +01:00
9308096e96
Merge pull request #252 from wvengen/feature-fix_redirect_with_suburi
...
fix root redirect when using suburi
2014-01-20 03:13:25 -08:00
6c0de3dc74
Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
...
Conflicts:
config/locales/de.yml
config/locales/en.yml
2014-01-20 12:12:00 +01:00
8b4c292ea0
Merge pull request #222 from wvengen/feature-receive
...
New receive screen
2014-01-20 03:02:27 -08:00
5b6d1a66a6
complete show order i18n
...
Conflicts:
app/helpers/orders_helper.rb
2014-01-17 14:25:57 +01:00
42d622d1b2
cleanup orders and add search
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/views/orders/_articles.html.haml
app/views/orders/show.html.haml
2014-01-17 13:41:38 +01:00
d496c452e6
allow to enable/disable plugins in deploy
2014-01-15 21:41:54 +01:00
46b36c42bd
simplify initial database setup deployment rules
2014-01-15 21:40:51 +01:00
151f851799
do not require authentication for root redirect
2014-01-15 16:33:13 +01:00
4e68d3b7f5
remove dysfunctional deployment hook
2014-01-15 15:50:36 +01:00
ecb2f2a015
fix root redirect when using suburi
2014-01-15 15:43:29 +01:00
ca234f0b70
deployment with Capistrano 3 (affects foodcoops#148)
2014-01-15 13:58:24 +01:00
bab28d2770
i18n update
2014-01-13 23:23:37 +01:00
8f0e3af2ba
Merge pull request #221 from wvengen/feature-fix_float_display
...
Fix float display
2014-01-13 03:21:17 -08:00
45e529b008
revert i18n attributes pluralisation
...
until plataformatec/simple_form#974 has a solution
(reverts parts of ce17bf33e09db8cb72df
2014-01-11 16:30:17 +01:00
cb3e2f7ca0
Merge branch 'master' into feature-receive
...
Conflicts:
config/locales/de.yml
2014-01-11 15:56:33 +01:00
9db8cb72df
Synchronize German and English locales
2014-01-10 20:50:58 +01:00
063ec61753
localeapp roundtrip
2014-01-10 00:00:57 +01:00
b30b424540
Merge branch 'master' into feature-receive
...
Conflicts:
app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
2b97ca050a
i18n oops
2014-01-09 13:22:32 +01:00
124341c7d6
receive helper and i18n cleanup
2014-01-09 13:01:10 +01:00
bdb9499535
fix broken update password flow
2014-01-08 14:09:28 +01:00
ce17bf33e0
complete and improve receive i18n
2014-01-08 13:39:49 +01:00
6e60f94484
small receive-related i18n updates
2014-01-08 12:52:29 +01:00
563993fffa
Complete I18n of current receive screen
2014-01-08 00:06:50 +01:00
d7c771d10a
Continue I18n of receive screen
2014-01-06 23:48:39 +01:00
69a29b8296
Merge pull request #245 from fsmanuel/rss_feed + 1
2014-01-06 13:55:32 +01:00
f83f6971e8
Rename update_current_price to update_global_price to avoid confusion
2014-01-04 21:35:19 +01:00
0d0ff90a64
adds an RSS feed for pages/all
2014-01-04 20:12:01 +01:00
2f02f89089
Allow login through link in message (and remember requested page).
2014-01-03 15:27:15 +01:00
133429720c
old price display tweaks
2014-01-03 14:11:50 +01:00
4c9e84ecc6
change layout of receive unlock
2014-01-03 12:40:43 +01:00
98f59a3de3
Readonly receive input if GroupOrderArticle result has manually been changed
...
Conflicts:
app/helpers/orders_helper.rb
app/views/orders/_edit_amount.html.haml
2014-01-03 10:33:09 +01:00
033aa90698
Use OrderArticle#create in receive form instead of Order#add_article
2014-01-02 19:16:09 +01:00
59c118a171
Apply publish/subscribe for OrderArticle#create
2014-01-02 19:16:03 +01:00
01264bc0ac
Clean up OrderArticle#new form and related stuff
2014-01-02 19:14:46 +01:00
baa5f16cfc
Free order_article resource from finance namespace; also unlock for role_orders
2014-01-02 19:14:41 +01:00
cf1e68f11d
Allow to edit OrderArticle in Order#receive form
2014-01-02 19:14:33 +01:00
81dfe8110c
Apply publish/subscribe for OrderArticle#update
2014-01-02 19:14:07 +01:00
27a73be68f
Merge remote-tracking branch 'foodcoops/master' into feature-receive
2014-01-02 18:57:59 +01:00
3336065218
Add missing translations for ArticlePrice attributes
2013-12-30 12:38:26 +01:00
f3c3b7af34
Fix StockArticle#derive title i18n
2013-12-28 20:07:28 +01:00
3bf1392251
Show clearer error message on WikiCloth exception
2013-12-22 23:34:54 +01:00
42e983f7ee
Move html markup of WikiCloth exception from locales to controller
2013-12-22 18:09:40 +01:00
496a250495
Rescue on WikiCloth exception
2013-12-22 12:17:02 +01:00
88f2dad706
language change
2013-12-18 22:14:52 +01:00
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
873a1ff108
update texts
2013-12-18 21:58:15 +01:00
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
2b511ee559
Merge branch 'master' into fresh-flow
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-18 17:03:26 +01:00
a02ca1b9c0
localeapp roundtrip [ci skip]
2013-12-17 18:54:05 +01:00
9b27ce29e9
fix BigDecimal to_s monkey-patch (complements 0052d4af1a4cc397c4248a7049a52e35ce33cec1)
2013-12-17 18:02:11 +01:00
be76f29473
do not show ".0" even for floats
2013-12-17 18:02:04 +01:00
94b2c8eac3
Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
...
Conflicts:
app/views/deliveries/_stock_article_form.html.haml
config/locales/de.yml
config/locales/en.yml
2013-12-17 15:58:47 +01:00
c5b1236f21
Merge pull request #218 from foodcoop-adam/article-dialog
...
Edit article user-interface update
2013-12-17 06:29:04 -08:00
5af82eb55c
Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch
...
Publish/subscribe pattern for DOM updates after AJAX database manipulation
2013-12-17 06:28:25 -08:00
a91c97526e
complete German translations (thanks @fsmanuel) [ci skip]
2013-12-16 10:55:45 +01:00
11a2b865aa
localeapp roundtrip
2013-12-14 13:35:52 +01:00
46ab4dcc01
proper i18n of last ordergroup order (thanks @JuliusR)
2013-12-14 13:15:47 +01:00
2b6a84ddf8
localeapp roundtrip
2013-12-12 00:33:35 +01:00
d448707b1a
i18n cleanup (affects foodcoops#137)
2013-12-12 00:13:19 +01:00
6bbc614e42
localeapp roundtrip (closes foodcoops#156)
2013-12-10 18:03:50 +01:00
e42e27957d
improve task i18n (affects foodcoops#137)
2013-12-10 17:58:32 +01:00
85b6ff908b
make new article dialog more responsive
2013-12-10 16:41:26 +01:00
30b35cdd11
Improve usability of supplier selection for stock_articles in delivery form
2013-12-09 00:03:07 +01:00
7eb64e3c9d
Update locales
2013-12-07 17:58:06 +01:00
7a673b1a8b
Move stock_article locales from delivery to stock_article
2013-12-07 17:48:04 +01:00
92f560e189
Again revert wrong quotation mark in English locale
2013-12-07 16:46:16 +01:00
3e49104318
Revert wrong quotation mark in English locale
2013-12-07 16:44:16 +01:00
bceabfec5c
Apply publish/subscribe pattern to stock_article manipulation in delivery form
2013-12-07 16:42:25 +01:00
13bb4e0a8b
Rename 'simple_form.hints.stock_article.copy_stock_article' to 'simple_form.hints.stock_article.copy'
2013-12-07 15:12:08 +01:00
11117738ce
Resolve merge conflicts
2013-12-07 11:50:37 +01:00
dd08e277c7
AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates
2013-12-07 11:20:44 +01:00
b05c75aef3
localeapp roundtrip
2013-12-06 23:12:15 +01:00
112fa3be23
fix forgotten i18n string (affects foodcoops#137)
2013-12-06 23:08:28 +01:00
111c061efa
more i18n cleanup (affects foodcoops#137)
2013-12-06 22:53:59 +01:00
a475a27f79
i18n cleanup (affects foodcoops#137)
2013-12-06 22:43:36 +01:00
2baa1d3349
fix i18n deprecation warning
2013-12-06 16:13:04 +01:00
1c4b9591a2
fix edit article dialog title
2013-12-06 12:34:14 +01:00
e42589ae72
translations update (localeapp roundtrip)
2013-12-06 11:58:08 +01:00
9990e059d4
fix i18n
2013-11-25 15:24:20 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
6410396489
localeapp roundtrip
2013-11-24 02:12:32 +01:00
e5471b9f73
more i18n cleanup
2013-11-24 01:47:34 +01:00
652a392b37
simplify i18n and fix some small ui issues
2013-11-23 17:49:43 +01:00
135e938d3d
i18n cleanups (affects #137 )
2013-11-23 12:05:29 +01:00
2ac7016ccc
localeapp roundtrip [ci skip]
2013-11-18 15:01:26 +01:00
66ac3be81f
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
bb5a67033d
Merge pull request #194 from foodcoop-adam/plugin-move
...
Better support for plugins (engines) + move wiki to plugin
2013-11-12 03:46:15 -08:00
5daf1a466f
localeapp roundtrip
2013-11-11 18:08:28 +01:00
768796407f
Merge pull request #192 from foodcoop-adam/cleanup-stale
...
Cleanup unused views&controllers
2013-11-11 09:05:19 -08:00
891b9a21c0
fix and improve i18n of "My Ordergroup"
2013-11-09 14:19:54 +01:00
a27dda62e0
copy migrations to default directory instead of trying to make it more easy to use
2013-11-06 10:54:20 +01:00
f7a0103553
clearer login field name
2013-10-30 21:28:35 +01:00
3588962329
remove unused layout
2013-10-30 20:53:01 +01:00
5ead67f88c
remove unused memberships controller/view
2013-10-30 20:46:59 +01:00
c3068c8d51
move foodsoft_wiki db migration to plugin
2013-10-30 09:43:38 +01:00
de948d7692
fix and cleanup routing (closes foodcoops#190)
2013-10-30 02:27:04 +01:00
70c12b7c1f
move wiki functionality to plugin
2013-10-29 22:42:06 +01:00
fde7904c1a
allow plugins to modify the navigation menu
2013-10-29 22:18:38 +01:00
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
9ba425aafa
fallback for when nick is nil
2013-10-29 19:05:24 +01:00
68b9f6a974
i18n-js assets configuration change
2013-10-23 12:57:42 +02:00
13a7f84e35
localeapp roundtrip [ci skip]
2013-10-23 12:48:19 +02:00
d1f9b0b090
apply changes to other translations + translation fixes
2013-10-21 17:55:58 +02:00
98e7189d31
Merge branch 'master' into i18n
...
Conflicts:
app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
51e6a7aeb0
Merge pull request #149 from foodcoop-adam/updated-gems
...
run bundle update and make it work again
2013-10-18 03:12:59 -07:00
6e5184d796
use rails-i18n translations
2013-10-17 16:43:14 +02:00
092bc6b150
translation updates
2013-10-17 15:32:03 +02:00
a339ae4c7c
i18n simple_form move of remaining labels
2013-10-10 19:12:59 +02:00
34a4951e28
Merge branch 'master' into i18n
...
Conflicts:
Gemfile
config/locales/de.yml
config/locales/en.yml
2013-10-09 23:57:43 +02:00
67e29620f4
i18n simple_form move of invoices
2013-10-09 23:37:08 +02:00
6ba971fe15
i18n simple_form move of deliveries
2013-10-09 23:19:40 +02:00
c3d22e883d
i18n simple_form move of suppliers
2013-10-09 23:12:26 +02:00
78c81b194c
i18n simple_form move of foodcoop
2013-10-09 23:00:07 +02:00
552af7925d
i18n simple_form move of tasks
2013-10-09 22:41:23 +02:00
762292ef8e
small i18n move
2013-10-09 22:29:19 +02:00
bdce1b5872
Merge branch 'master' into updated-gems
...
Conflicts:
Gemfile
Gemfile.lock
2013-10-09 10:37:02 +02:00
1b49a08c5e
localeapp roundtrip
2013-10-08 11:42:23 +02:00
a32a3757d2
Merge pull request #180 from foodcoop-rostock/search-article-list-modified
...
Search articles in group_orders form
2013-10-08 02:21:35 -07:00
9041a350d5
Add some locales for article attributes
2013-10-05 22:37:17 +02:00
dce92b9d7c
i18n ordering javascript
2013-10-04 15:01:24 +02:00
64a597c689
use i18n-js
2013-10-04 15:01:10 +02:00
a9dff7f1df
add missing i18n
2013-10-04 10:25:53 +02:00
ac1341d5b0
Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip
2013-10-03 23:22:31 +02:00
9a9a782bc4
Complete StockArticle#show view
2013-10-03 23:21:53 +02:00
fef8c6d99f
Move StockArticle#history to StockArticle#show
2013-10-03 22:24:21 +02:00
bbcad49831
start moving from simple_form i18n to activerecord
2013-10-03 16:03:13 +02:00
1674dcf851
fix i18n of article sync
2013-10-03 14:36:53 +02:00
3574f239c6
localeapp roundtrip
2013-10-02 17:33:37 +02:00
17bbb0705b
fix i18n
2013-10-02 17:23:49 +02:00
a8ace3bc79
add missing i18n
2013-10-02 17:13:49 +02:00
1d8fefcfb7
small i18n update
2013-10-02 17:08:24 +02:00
0bb62332c0
localeapp roundtrip
2013-10-01 00:05:46 +02:00
9f083dd4d0
Add button to clear article search (list.js customization)
2013-09-23 21:31:54 +02:00
77fbf3ca81
Merge pull request #175 from foodcoop-rostock/fix-balancing
...
Added hint when changing total delivered amount.
2013-09-23 02:14:50 -07:00
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
14d4d2f12d
Add list.js for filtering articles (another try for foodcoops#143)
2013-09-18 23:28:18 +02:00
f1f7e8d709
localeapp roundtrip
2013-09-18 19:14:48 +02:00
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
wvengen
wvengen
Patrick Gansterer
wvengen
Benjamin Meichsner
Robert Waltemath
Julius
Manuel Wiedenmann
Benjamin Meichsner
Robert Waltemath