b07e855235
Make compatible with Ruby 2.0
2015-06-05 15:35:19 +02:00
ec03d579d0
Merge branch 'feature/edit-recurring-task'
...
Conflicts:
config/locales/en.yml
2015-05-08 20:10:23 +02:00
a00e7c94be
Rework user-interface for editing recurring tasks
2015-05-08 17:39:20 +02:00
a8a434ef7b
Move due date according to delta
2015-05-01 21:31:06 +02:00
fd51b07e21
Allow editing recurring task groups, basic functionality for #152
2015-05-01 21:14:16 +02:00
aa7a2a31ae
Bundle update & restructure tests (RSpec 3)
2015-04-25 17:14:37 +02:00
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
6ce1b7f928
Handle errors in upload and sync form
2015-04-11 02:52:57 +02:00
d5a7f6a074
Move file import logic to model
2015-04-11 02:52:57 +02:00
16e9210035
Fix title of new upload screen
2015-04-11 02:52:57 +02:00
07ba6f0535
Import multiple spreadsheet formats. Make upload work like sync.
2015-04-11 02:52:57 +02:00
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +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
65c7673a41
Allow updating profile without ordergroup
2015-01-16 20:25:58 +01:00
65dee49cdb
Fixed broken eager loading in orders#edit.
2015-01-16 15:57:11 +01:00
7e0aa66936
Use more boolean comparators where it makes sense
2015-01-14 22:56:32 +01:00
2687da357a
Fix mailer warnings
2015-01-13 18:02:30 +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
bf6a31a032
Cleanup groups view on profile page
2014-12-16 21:14:20 +01:00
56f6efa590
Allow to edit address from user profile
2014-12-10 21:27:53 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
7826d2f674
move login and logout to separate methods
...
Conflicts:
app/controllers/sessions_controller.rb
Conflicts:
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
2014-10-18 17:57:07 +02:00
9a7b3378c3
Make invalid login message depend on use_nick (closes foodcoops#321)
2014-10-09 09:42:13 +02:00
cc4e925c1a
Fixed ensure_open_order filter on missing id params.
2014-09-23 10:39:10 +02:00
cf360335ee
fix articles with zero quantity showing
...
complements 8913ad615c
2014-09-11 13:47:03 +02:00
ee1874a15f
fix upload error
2014-09-10 14:42:44 +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
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +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
d906a7342f
workaround receive error with many articles
2014-09-02 12:35:57 +02:00
e61c3c9267
order articles by number then name in fax+receive
...
This makes it easier to enter the receive screen from an order pdf print
with received amounts.
Conflicts:
app/documents/order_fax.rb
2014-08-19 09:19:01 +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
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
64bb8e043d
enable/disable plugins by config option
2014-05-13 17:01:26 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
f71b78665e
allow 500 items per page
2014-05-13 17:01:24 +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
8853b3efdb
fix sort order
2014-03-08 17:15:09 +01:00
d9326dd984
allow plugins to override login redirection when authentication failed
2014-02-25 10:18:14 +01:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +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
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
3e79304c5a
typo
2014-01-27 14:58:39 +01:00
d08f120b27
show message when ignoring articles due to missing order number
2014-01-24 22:20:29 +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
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
65041c78c5
allow to preselect order view
2014-01-17 15:04:03 +01:00
151f851799
do not require authentication for root redirect
2014-01-15 16:33:13 +01:00
ecb2f2a015
fix root redirect when using suburi
2014-01-15 15:43:29 +01:00
bab28d2770
i18n update
2014-01-13 23:23:37 +01:00
8760d87a76
fix receive notice
2014-01-13 11:48:43 +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
ce17bf33e0
complete and improve receive i18n
2014-01-08 13:39:49 +01:00
69a29b8296
Merge pull request #245 from fsmanuel/rss_feed + 1
2014-01-06 13:55:32 +01:00
0d0ff90a64
adds an RSS feed for pages/all
2014-01-04 20:12:01 +01:00
a0f55ba812
Clear return_to URL in session when signing out.
2014-01-03 19:42:08 +01:00
2f02f89089
Allow login through link in message (and remember requested page).
2014-01-03 15:27:15 +01:00
03f61668aa
Redirect to home page on denied access ( fixes #237 ).
2014-01-03 13:51:00 +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
dd138da1a6
Change comment according to 9d61e2e61569159489098eda1bd6c30d7322ce76
2014-01-02 19:17:51 +01:00
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +01:00
a384532619
Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b
2014-01-02 19:17:41 +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
7ef6832ab3
fix invite authentication
2013-12-22 14:20:25 +01:00
cee96915f9
remove unused redirect_to functionality
2013-12-22 13:59:16 +01:00
a28c6031a4
fix receive exception when input is set to nil
2013-12-21 17:39:20 +01:00
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
94b4454a1b
add receive to order screen, and distinguish between finished and closed orders to put it in nicely
2013-12-18 19:21:39 +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
bceabfec5c
Apply publish/subscribe pattern to stock_article manipulation in delivery form
2013-12-07 16:42:25 +01:00
dd08e277c7
AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates
2013-12-07 11:20:44 +01:00
c900cf4988
make product redistribution work!
2013-11-27 00:06:25 +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
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
768796407f
Merge pull request #192 from foodcoop-adam/cleanup-stale
...
Cleanup unused views&controllers
2013-11-11 09:05:19 -08:00
ec85c1de44
doc update [ci skip]
2013-11-07 20:46:05 +01:00
5ead67f88c
remove unused memberships controller/view
2013-10-30 20:46:59 +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
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
e968919cce
beautify map invocations of users
2013-10-29 18:46:55 +01:00
98e7189d31
Merge branch 'master' into i18n
...
Conflicts:
app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
23b38b5a46
fix category heading
2013-10-10 19:22:43 +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
762292ef8e
small i18n move
2013-10-09 22:29:19 +02:00
28644dc334
Force update in Order#finish; rescue if error raised
2013-10-08 19:58:11 +02:00
a9dff7f1df
add missing i18n
2013-10-04 10:25:53 +02:00
fef8c6d99f
Move StockArticle#history to StockArticle#show
2013-10-03 22:24:21 +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
6cfaa4979a
show lines with zero units but with member orders in balancing screen ( closes foodcoops/foodsoft#179 )
2013-10-02 16:32:29 +02:00
6d3db7636a
make search work without nickname usage
2013-09-20 23:18:06 +02:00
f224735718
remember what member ordered when deleted in balancing screen
2013-09-17 14:19:46 +02:00
1bb257c41b
remember member order when order article is deleted + test
2013-09-13 15:37:30 +02:00
71e02ab569
Merge branch 'rails3' into rails3-to-master
...
Conflicts:
app/views/suppliers/shared_suppliers.haml
2013-09-02 13:31:40 +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
0401572580
Merge pull request #1 from foodcoop-adam/extended-i18n
...
cleanup of profile layout + set session on login
2013-07-18 07:19:20 -07:00
206709aa61
sets session[:locale] = user.locale after login
2013-07-18 16:09:32 +02:00
b303b48853
Merge branch 'master' into improve-delivery-workflow-further
2013-07-13 21:08:50 +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
edaf91b029
Inline before_filter of stock_changes_controller
2013-07-12 22:19:11 +02:00
db8a929f0b
Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks
...
Great!
2013-07-11 12:48:41 -07:00
ffcb9490c9
Make stock_changes readonly in index view
2013-07-11 18:20:24 +02:00
65c0b555c2
Added warning/ hint when updating periodic task.
2013-07-11 10:30:55 +02:00
de9541a0df
Ask how to fetch readonly associations
2013-07-09 21:49:39 +02:00
ef62a18ac9
Add StockChanges index
2013-07-09 21:46:04 +02:00
a5565b436f
Resolve merge conflicts
2013-07-07 14:58:57 +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
3da27734c7
allow import of files with categories that do not exist (map to no category)
2013-07-06 17:49:10 +02:00
d7540bdd20
fix i18n key
2013-06-30 13:08:13 +02:00
0978b84f4d
set user language on login to override session
2013-06-28 13:30:26 +02:00
d0ccf07bc5
Merge latest changes in master of http://github.com/foodcoops/foodsoft
2013-06-26 20:23:11 +02:00
dd70b84ef0
Linearize and clean up delivery form
2013-06-26 15:16:52 +02:00
7dbe1363ed
fix adding article balancing failing with 'already taken' ( closes foodcoops/foodsoft#125 )
2013-06-24 13:32:07 +02:00
990397a7f0
Delete only the FOLLOWING tasks.
2013-06-21 22:04:36 +02:00
6b62fc90d8
Now creating periodic task via button
2013-06-21 13:48:48 +02:00
cc1a839246
Allow to create stock_article as copy of article in delivery form
2013-06-18 10:48:19 +02:00
2c1d9aeb9c
finishes i18n set_locale with user settings
2013-06-14 02:39:25 +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
4037ef12da
Users may delete all tasks of a group, i.e. delete the whole group.
2013-06-12 12:02:13 +02:00
f4a0e29297
Fixed bug in with new shared multiple suppliers feature.
2013-06-12 10:47:54 +02:00
25fbb47320
Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers
2013-06-12 10:40:20 +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
7a63394dac
Merge remote-tracking branch 'origin/rails3'
...
Conflicts:
Gemfile
Gemfile.lock
2013-06-10 01:53:31 +02:00
7c4ee01ff2
Define autofill attributes when creating new supplier from shared_supplier.
2013-06-09 18:02:47 +02:00
c38ce28347
fix i18n bug
2013-06-06 02:13:40 +02:00
wvengen
Robert
Patrick Gansterer
Benjamin Meichsner
wvengen
Manuel Wiedenmann
Julius
Benjamin Meichsner
Robert Waltemath