wvengen
|
6d4aa5ed40
|
Merge pull request #163 from foodcoop-rostock/order-tasks-alphabetically
Order tasks with same date by name.
|
2013-09-17 05:45:13 -07:00 |
|
wvengen
|
7de57715f2
|
Merge branch 'master' into tests-rspec
Conflicts:
Gemfile
|
2013-09-07 01:11:24 +02:00 |
|
Benjamin Meichsner
|
a0760ebfdb
|
Fixed delivering emails to users.
There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
|
2013-09-06 11:40:40 +02:00 |
|
Robert Waltemath
|
9f22615a25
|
Order tasks with same date by name.
|
2013-09-05 10:16:57 +02:00 |
|
Benjamin Meichsner
|
71e02ab569
|
Merge branch 'rails3' into rails3-to-master
Conflicts:
app/views/suppliers/shared_suppliers.haml
|
2013-09-02 13:31:40 +02:00 |
|
wvengen
|
bb20e9abea
|
Merge branch 'master' into tests-rspec
Conflicts:
Gemfile
Gemfile.lock
|
2013-07-24 21:25:36 +02:00 |
|
wvengen
|
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 |
|
Manuel Wiedenmann
|
c85a7fcc5c
|
fixes User#receive_email?
|
2013-07-18 16:58:04 +02:00 |
|
wvengen
|
ebe93e292b
|
Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further
Improve delivery workflow
|
2013-07-17 01:43:59 -07:00 |
|
wvengen
|
db80fbd807
|
Merge branch 'master' into tests-rspec
|
2013-07-15 18:45:04 +02:00 |
|
wvengen
|
5e9a49b2c7
|
make uniqueness_of_name validations work again (closes foodcoops/foodsoft#157)
|
2013-07-15 18:03:02 +02:00 |
|
wvengen
|
3ed8e0bc84
|
allow longer supplier phone number
|
2013-07-15 17:57:00 +02:00 |
|
Julius
|
b303b48853
|
Merge branch 'master' into improve-delivery-workflow-further
|
2013-07-13 21:08:50 +02:00 |
|
wvengen
|
126f7e7459
|
Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history
Show StockChanges index
|
2013-07-13 03:16:31 -07:00 |
|
wvengen
|
db8a929f0b
|
Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks
Great!
|
2013-07-11 12:48:41 -07:00 |
|
Julius
|
ef62a18ac9
|
Add StockChanges index
|
2013-07-09 21:46:04 +02:00 |
|
Julius
|
d0ccf07bc5
|
Merge latest changes in master of http://github.com/foodcoops/foodsoft
|
2013-06-26 20:23:11 +02:00 |
|
Julius
|
a29d52dcae
|
Fix ordering of stock_changes in delivery (case-insensitive ordering did not work properly for all database flavors)
|
2013-06-26 20:14:33 +02:00 |
|
Julius
|
2ee7f716ae
|
Improve delivery validation: StockArticles must not be associated more than once
|
2013-06-26 17:58:55 +02:00 |
|
wvengen
|
befe89d4ef
|
fix tolerance display in group_order form
|
2013-06-26 01:36:44 +02:00 |
|
Robert Waltemath
|
c27127c745
|
Added i18n strings.
|
2013-06-24 11:53:52 +02:00 |
|
Robert Waltemath
|
3d1faa9ed3
|
Skip save callback when migrating data.
|
2013-06-24 10:36:14 +02:00 |
|
Robert Waltemath
|
d081a2c66b
|
Validate done/weekly combination only on creation of task.
|
2013-06-24 09:49:06 +02:00 |
|
Robert Waltemath
|
577945e591
|
Add validation for task.done in combination with periodic task.
|
2013-06-22 18:56:17 +02:00 |
|
Robert Waltemath
|
a7fd7a7936
|
Removed obsolete code of old workgroup-centric weekly task concept.
|
2013-06-22 18:14:11 +02:00 |
|
Robert Waltemath
|
ef329b5647
|
Added up and down migration for weekly task data.
|
2013-06-22 17:35:45 +02:00 |
|
Robert Waltemath
|
990397a7f0
|
Delete only the FOLLOWING tasks.
|
2013-06-21 22:04:36 +02:00 |
|
Robert Waltemath
|
c52e482743
|
Exclude tasks from groups when changing attributes.
|
2013-06-21 20:54:24 +02:00 |
|
Robert Waltemath
|
6b62fc90d8
|
Now creating periodic task via button
|
2013-06-21 13:48:48 +02:00 |
|
Julius
|
bf32e72414
|
Improve delivery form validation
|
2013-06-19 11:21:55 +02:00 |
|
Julius
|
9502ca28dd
|
Merge latest changes in master
|
2013-06-17 15:47:08 +02:00 |
|
wvengen
|
713c030213
|
i18n and translate missing entry
|
2013-06-15 18:43:42 +02:00 |
|
Julius
|
b5acd9b116
|
Merge master branch of base
|
2013-06-14 18:59:17 +02:00 |
|
Manuel Wiedenmann
|
2c1d9aeb9c
|
finishes i18n set_locale with user settings
|
2013-06-14 02:39:25 +02:00 |
|
Manuel Wiedenmann
|
5b7ec86ed6
|
Merge branch master into i18n
|
2013-06-14 02:02:57 +02:00 |
|
wvengen
|
8141ad0233
|
remove duplicate code
|
2013-06-14 01:39:30 +02:00 |
|
wvengen
|
13f2c128c6
|
do not use string values for integers (closes foodcoops/foodsoft#128)
|
2013-06-14 01:36:41 +02:00 |
|
Julius
|
65f61e09d5
|
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
|
2013-06-13 23:36:22 +02:00 |
|
Benjamin Meichsner
|
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 |
|
Robert Waltemath
|
46b07a6136
|
Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks
Conflicts:
config/locales/de.yml
|
2013-06-12 10:00:11 +02:00 |
|
Manuel Wiedenmann
|
7a63394dac
|
Merge remote-tracking branch 'origin/rails3'
Conflicts:
Gemfile
Gemfile.lock
|
2013-06-10 01:53:31 +02:00 |
|
Benjamin Meichsner
|
7c4ee01ff2
|
Define autofill attributes when creating new supplier from shared_supplier.
|
2013-06-09 18:02:47 +02:00 |
|
Benjamin Meichsner
|
60afa85ece
|
Merge pull request #116 from balkansalat/rails3-balancing-delete-article
Update ordergroup prices in OrderArticles via Order.
|
2013-06-09 08:26:38 -07:00 |
|
Manuel Wiedenmann
|
0061e45198
|
removes routes locale constrain and fixes some bugs
|
2013-06-06 04:29:53 +02:00 |
|
Manuel Wiedenmann
|
60c4c5510a
|
adds a new user settings system + migration + rake task/worker updates
|
2013-06-06 03:40:15 +02:00 |
|
Robert Waltemath
|
82fb6d1dbe
|
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
|
2013-06-06 00:37:50 +02:00 |
|
Robert Waltemath
|
c194d2545f
|
Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
|
2013-06-04 11:28:25 +02:00 |
|
Robert Waltemath
|
2a1176c31a
|
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
|
2013-05-30 10:54:22 +02:00 |
|
wvengen
|
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 |
|
Benjamin Meichsner
|
3e9ca336a8
|
Fixed loosing assignments when updating a task.
|
2013-04-10 10:55:43 +02:00 |
|