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
c194d2545f
Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
2013-06-04 11:28:25 +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
53d5eabf79
fix login i18n
2013-04-26 21:35:23 +02: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
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
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
4aa40b387a
finish article_categories controllers i18n + translation
2013-04-04 02:10:52 +02:00
24d04b25db
fix some small i18n errors
2013-04-04 00:56:45 +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
53518039f1
Fixed error message, when using GET for password reset actions.
2013-03-27 22:20:54 +01:00
915e1b9e79
Fixed bug in reset password error handling.
2013-03-27 22:12:46 +01:00
18f6cadca2
Ensure mail privacy in message reply and show view.
...
Thanks to @JuliusR for reporting.
2013-03-24 01:37:58 +01:00
da72d3a61c
Only show undeleted articles in delivery/stock_taking forms.
...
Fixed 100.
2013-03-23 18:25:54 +01:00
80b203a8da
Fixed missing templates in accept invitation action.
2013-03-23 17:51:33 +01:00
75a1051668
finish articles i18n, controller+model
2013-03-22 00:59:42 +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
e275403cdd
Do not destroy articles in supplier sync. Mark them as deleted.
2013-03-18 19:05:11 +01:00
dd0bd0ad7e
Fixed updating order article in stockit balancing.
2013-03-17 18:33:04 +01:00
707f989768
Fixed routes in redirect after direct_close of orders.
2013-03-17 17:50:50 +01:00
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
9cc98b4662
Added some more eager loading for balancing view.
2013-03-17 15:12:14 +01:00
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
0d3564492b
Fixed bug in sorting articles in balancing view.
2013-03-12 18:54:51 +01:00
c4376f35bf
Removed article from includes in as it does not work with acts_as_paranoid.
...
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62 .
Better we remove acts_as_paranoid and filter manually?
2013-03-12 12:50:56 +01:00
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +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
0e1bd5c75e
Improve (AJAX) deletion of StockArticles
2013-02-25 11:12:28 +01:00
5dc3fc30ad
Revert 099e2b9b06
2013-02-25 10:29:47 +01:00
8f15cfb446
Revert 396a47b6af
2013-02-25 10:13:44 +01:00
ccf0d010b4
Apply AJAX for deleting a StockArticle
2013-02-25 10:02:21 +01:00
569cdce2db
finish finance controller i18n
2013-02-22 00:44:39 +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
a0a974b9ce
finish stockit i18n + controllers + model
2013-02-11 11:19:26 +01:00
640e9799aa
i18n financial_transactions + controller
2013-02-11 10:21:39 +07: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
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
b12a906a74
finish login i18n + controller
2013-02-05 12:54:55 +01:00
c5de69bfc5
typo
2013-02-05 12:30:44 +01:00
ecce8041a1
invites controller i18n
2013-02-04 13:01:06 +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
a511da9ae3
Prevent stock_articles from appearing in supplier article index
2013-01-30 21:21:49 +01:00
396a47b6af
Improve stock_article_selections
2013-01-28 20:46:35 +01:00
8b2b70f8bf
Fixed saving user for new orders.
2013-01-26 16:24:45 +01:00
ce0300df43
Fix order.created_by
2013-01-12 16:24:13 +01:00
099e2b9b06
Add stock_article_selection (deleting multiple stock articles at once)
2013-01-12 16:14:06 +01:00
0364562273
Fixed return_to when authorization gets lost.
2012-12-30 16:34:01 +01:00
349cadd5e9
Renabled mail delivering in invites and login contrller.
2012-12-30 16:11:35 +01:00
a489079334
Fixed wrong request method in deny_access.
2012-12-30 15:13:50 +01:00
ba75a6e328
Fixed accidently switching to english locale in production.
2012-12-29 17:48:14 +01:00
2c0fe08be6
Replaced delayed_job with resque. See README_DEVEL
2012-12-23 17:38:04 +01:00
807d476e44
Fixed missing scoping by ordergroup in financial index.
2012-12-22 14:23:58 +01:00
0dff5ea784
Fixed some bugs in tasks, apple feature:
...
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
2012-12-16 19:07:45 +01:00
0edd29dfd4
Merge branch 'master' into master-to-rails3
...
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
2012-12-14 18:10:46 +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
c032fdca6e
Merge remote-tracking branch 'upstream/master'
2012-11-13 08:55:50 +01:00
d086fe7cc7
Fix task validation again #16 ; mark assignment validation TODO
2012-11-12 21:31:04 +01:00
e561ddb064
Fix task validation #16
2012-11-12 20:14:06 +01:00
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +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
181695d1bd
Small fixes for article_categories.
2012-11-10 16:51:30 +01:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
8f7e21b918
Fixed stockit.
2012-10-29 18:28:17 +01:00
fc1c173718
Fixed articles module.
2012-10-28 18:03:50 +01:00
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
e9383e0d17
Remove searching shared articles by list.
...
This is necessary to go with newest fixes in sharedlists app.
2012-10-13 22:19:01 +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
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
eb532babd6
Refactored pdf generation with newest prawn.
2012-10-02 02:50:48 +02:00
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +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
2860a3ca44
Fixed authentication when User is deleted during session.
2012-08-24 15:20:58 +02:00
edadb7d8d1
Moved message delivering into background process.
2012-08-24 14:33:45 +02:00
af3875d46b
Refactored order finishing. Delay user notifications.
2012-08-24 14:24:36 +02:00
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
c936813967
Some fixes for mailer module.
2012-08-17 19:08:02 +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
ef2ce98e46
Performance improvement for stockit view.
2012-07-31 17:37:32 +02:00
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
2c1385c9ce
Preisänderungen beim Abrechnen können auch global angewandt werden.
2012-07-18 22:16:08 +02:00
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
6bd4bbec86
Deactivated broken links in balancing.
2012-05-12 11:18:46 +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
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +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
38b5dcba1f
Refactored ordering part two. Integrated stock order.
2011-06-19 19:56:04 +02:00
eb4705857b
Ordering refactored: Made everything RESTful.
2011-06-19 15:30:33 +02:00
45e0048490
Minor refactoring for ordering js data.
2011-06-13 16:45:37 +02:00
5b2df07378
Fixed ordering before filter.
2011-06-10 13:58:50 +02:00
9ad93e9c06
Catch exceptions when deleting ordegroups.
2011-06-10 13:33:10 +02:00
172db1d37e
Admin namespace beendet.
2011-06-10 13:22:15 +02:00
6ddef7267a
Refactored items_per_page. Start on admin/workgroups.
2011-06-10 12:18:55 +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
013637a4fc
Refactored shared article import. Added meta search gem.
2011-05-19 22:22:05 +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
6ac04d5e19
Fixed foodcoop/ordergroups view.
2011-05-18 11:47:00 +02:00
2ee30fee16
Refactored home/ordergroup.
2011-05-16 11:00:52 +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
c87ead8da9
Added meta where and jquery observe field. Fixed members view.
2011-05-15 23:43:23 +02:00
6c98c7c755
Some fixes for task module.
2011-05-15 22:06:54 +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
2a72263bd3
Replaced protoype with jquery. Some fixes in mailer class.
2011-05-11 15:14:39 +02:00
e40f865c45
Refactored login module. Implemented standard sessions controller.
2011-05-11 13:38:46 +02:00
2d7d0d3b94
Updated actionmailer classes and API.
2011-05-11 10:54:02 +02:00
be321798a7
Fixed some links in tasks module.
2010-06-10 23:25:13 +02:00
b71e809f34
Fixed ajax bug on categories page.
2010-05-28 12:01:19 +02:00
a8a243b5fa
Avoid exception on blank comments.
2010-05-28 11:55:12 +02:00
571548dfbc
Fixed routing bug on (ex) admin controller.
2010-03-22 01:58:37 +01:00
9a54d8504c
Secured users session, considering foodcoop token.
2010-03-22 01:38:23 +01:00
18e8a11b7d
Removed unnecessary config params. Improved error handling.
2010-03-22 01:25:24 +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
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
55d2976e98
Moved order stats and cleanup stuff into rake task.
...
Closes #14
2010-02-09 21:45:57 +01:00
036bc10282
Hide/show unavailable articles via js.
2009-10-17 20:33:36 +02:00
d0e04a05ec
Removed unecessary weekly task templates.
2009-10-16 20:45:20 +02:00
90f760858e
Added site map and titel list to pages/all
...
* pages/all now consists of three alternativ views: recent changes, site map and title list
2009-10-06 22:24:51 +02:00
c3ca3e23f9
Hide redirected pages in collection for parent ids.
2009-09-28 17:22:24 +02:00
65e41efc18
Fixed problems when deleting redirected pages.
2009-09-28 17:18:09 +02:00
6eba04d30d
Better messages and redirect when a page is deleted.
2009-09-28 16:26:53 +02:00
7c192bbad3
Redirect /pages/id to /wiki/permalink
2009-09-28 15:31:20 +02:00
529956ea5a
Merge branch 'wiki'
...
Conflicts:
app/helpers/pages_helper.rb
public/stylesheets/main.css
public/stylesheets/print.css
2009-09-28 15:04:07 +02:00
67661cb716
Added toc to wikipages. Patched wikicloth.
...
* patched wikicloth to serve anchor links for sections
* added table of contents
* subpages list doesn't show up per default
2009-09-28 14:57:11 +02:00
aa341628a6
Fixed bug when ending the group membership on profile page.
2009-09-11 16:13:04 +02:00
21f128ef1d
Handle bad entries when creating new order articles in balancing
...
controller.
2009-09-07 13:31:03 +02:00
a1ca9f368d
Fixed bug when adding new article to a stock order (balancing
...
controller)
2009-09-07 10:57:49 +02:00
8927a80246
You can change the page parent now at pages/edit.
...
* Increased text area size for better layout with the new feature.
* Closes #39
2009-08-22 23:04:51 +02:00
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
27bec1f860
Remember per_page number when updating multiple articles. Closes #36
2009-08-13 17:23:14 +02:00
fd97c1fc60
Made multi coop installation available as an option in app_config.yml.
2009-08-13 16:36:01 +02:00
f4edfacd91
Fixed missing error message.
2009-08-13 16:09:06 +02:00
a8c93c08b7
Added parent-child relationship to pages to visualize a breadcrump and subpages.
2009-08-12 18:41:25 +02:00
83e741c1af
Improved delivery creating/updating prozess.
2009-08-12 13:38:03 +02:00
d8cdbe4abb
Added rake task for auto create of upcoming workgroup tasks (weekly tasks).
2009-08-11 17:22:08 +02:00
c7e37fc7b2
Added possibility to give feedbacks via ajax form. Closes #2
...
* Feedback message will send to error_recipients, configured in app_config.yml
2009-08-04 15:22:11 +02:00
6761a41048
Hide articles with a stock amount of zero. Closes #17
2009-08-04 13:35:52 +02:00
f0caabfb53
Check account balance after creating a transaction.
2009-08-04 13:13:46 +02:00
116b1c4ed9
Fixed broken link on startpage for non ordergroup members.
2009-08-04 13:05: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
ecc1176020
Member search now includes the attribute 'nick'. Closes #18
2009-07-20 19:29:24 +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
255a4cd6c7
Fixed problems in interacting of acts_as_versioned and optimistic locking.
2009-05-20 15:26:53 +02:00
7de45543c4
Added page-preview feature to wiki module.
2009-05-20 12:42:01 +02:00
2af35e55bc
Improved stockit overiew. Fixed article ordering by suppliers.
2009-05-17 16:50:13 +02:00
a8e35bd421
Refactoring of delivery-workflow. Added ability to add stock_changes after creating a delivery.
2009-05-17 16:11:39 +02:00
43fc7b06f8
Upgrade foodsoft to rails 2.3.2.
2009-05-17 15:01:36 +02:00
c03f3da21a
Added more info to delivery/show for easier comparision of invoice amount and sum of delivered items.
2009-05-15 17:58:02 +02:00
053c665270
Added version control for wiki pages.
2009-05-15 17:32:45 +02:00
7ba6bc3680
Added optimistic locking to wiki pages.
2009-05-15 13:54:42 +02:00
8bfa83118c
Update ordergroup values after deleting an ordered article. Closes #11
...
* TODO: Implement callbacks to avoid such mistakes.
2009-05-13 13:04:39 +02:00
7e4409bc11
Few improvements to wiki module.
2009-05-07 18:15:14 +02:00
4c57c57827
Changed default order of articles on balancing page.
2009-05-04 17:56:52 +02:00
e8fa912e8c
Removed contact data from ordergroups-page. Added names of users and date of last order.
2009-05-04 17:06:08 +02:00
a3fbc2d37b
Merge branch 'master' of git@github.com:bennibu/foodsoft
2009-04-20 14:13:47 +02:00
4db8184daa
Fixed some bugs in orders lists. Closes #3
2009-04-20 14:11:11 +02:00
fac0c05a46
Hide private messages on start page.
2009-04-20 13:54:39 +02:00
e32e97d178
Added "ordergroups" view to list the ordergroups
...
* You can search in the name.
* You can show only active order groups (order in last 3 months)
* Future feature: generate text and pdf files for the box
labels
2009-04-18 15:39:07 +02:00
e95cdad5ec
Added ordergroups view to foodcoop namespace.
...
* For now just a searchable list. Nothing more.
2009-04-18 15:39:07 +02:00
c6187ebade
Fixed bug in password reset feature.
...
* Translated messages
* Cleaned up some code
2009-04-17 12:06:36 +02:00
1e011256e9
Remove all non-digits before sorting by order number in finance/balancing
...
* Since order_number is a string, there can be more than a-zA-Z + digits
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:30 +08:00
40886b71f9
Fixed Bug in balancing controller when adding an ordergroup-result.
2009-04-05 14:59:55 +02:00
d62d45e4a4
Hide zero results in matrix pdf.
2009-04-03 23:32:24 +02:00
wvengen
Julius
Benjamin Meichsner
Manuel Wiedenmann
wvengen
Robert Waltemath
davidrabel
Benjamin Meichsner
Benjamin Meichsner
sandoz