wvengen
|
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 |
|
Julius
|
0e1bd5c75e
|
Improve (AJAX) deletion of StockArticles
|
2013-02-25 11:12:28 +01:00 |
|
Julius
|
5dc3fc30ad
|
Revert 099e2b9b06
|
2013-02-25 10:29:47 +01:00 |
|
Julius
|
8f15cfb446
|
Revert 396a47b6af
|
2013-02-25 10:13:44 +01:00 |
|
Julius
|
ccf0d010b4
|
Apply AJAX for deleting a StockArticle
|
2013-02-25 10:02:21 +01:00 |
|
wvengen
|
569cdce2db
|
finish finance controller i18n
|
2013-02-22 00:44:39 +01:00 |
|
wvengen
|
c693f697ff
|
workgroups i18n
|
2013-02-13 01:34:58 +01:00 |
|
wvengen
|
02f04be6e8
|
finish stock_takings i18n + controller
|
2013-02-13 01:20:20 +01:00 |
|
wvengen
|
a0a974b9ce
|
finish stockit i18n + controllers + model
|
2013-02-11 11:19:26 +01:00 |
|
Manuel Wiedenmann
|
640e9799aa
|
i18n financial_transactions + controller
|
2013-02-11 10:21:39 +07:00 |
|
Manuel Wiedenmann
|
8be93c33f8
|
i18n finance + controller
|
2013-02-10 15:05:31 +07:00 |
|
wvengen
|
36b18bcfbd
|
finish messages i18n + controller + model
|
2013-02-09 10:18:52 +01:00 |
|
Manuel Wiedenmann
|
5941bbbf4f
|
i18n feedback + controller
|
2013-02-09 13:01:44 +07:00 |
|
Manuel Wiedenmann
|
6a564f0a25
|
admin controllers
|
2013-02-09 12:47:21 +07:00 |
|
wvengen
|
8d899581bd
|
finish group_orders i18n + controller
|
2013-02-09 02:01:31 +01:00 |
|
wvengen
|
e06524ca37
|
finish ordergroups and orders i18n + controller
|
2013-02-08 01:52:20 +01:00 |
|
wvengen
|
d818ea5d53
|
finish suppliers controller I18n
|
2013-02-08 00:31:09 +01:00 |
|
wvengen
|
b12a906a74
|
finish login i18n + controller
|
2013-02-05 12:54:55 +01:00 |
|
wvengen
|
c5de69bfc5
|
typo
|
2013-02-05 12:30:44 +01:00 |
|
wvengen
|
ecce8041a1
|
invites controller i18n
|
2013-02-04 13:01:06 +01:00 |
|
wvengen
|
9138f0da03
|
also internationalize home controller
|
2013-02-04 02:12:24 +01:00 |
|
wvengen
|
1860e1c4cc
|
also internationalize sessions controller
|
2013-02-04 02:00:27 +01:00 |
|
Julius
|
a511da9ae3
|
Prevent stock_articles from appearing in supplier article index
|
2013-01-30 21:21:49 +01:00 |
|
Julius
|
396a47b6af
|
Improve stock_article_selections
|
2013-01-28 20:46:35 +01:00 |
|
Benjamin Meichsner
|
8b2b70f8bf
|
Fixed saving user for new orders.
|
2013-01-26 16:24:45 +01:00 |
|
Julius
|
ce0300df43
|
Fix order.created_by
|
2013-01-12 16:24:13 +01:00 |
|
Julius
|
099e2b9b06
|
Add stock_article_selection (deleting multiple stock articles at once)
|
2013-01-12 16:14:06 +01:00 |
|
benni
|
0364562273
|
Fixed return_to when authorization gets lost.
|
2012-12-30 16:34:01 +01:00 |
|
benni
|
349cadd5e9
|
Renabled mail delivering in invites and login contrller.
|
2012-12-30 16:11:35 +01:00 |
|
benni
|
a489079334
|
Fixed wrong request method in deny_access.
|
2012-12-30 15:13:50 +01:00 |
|
benni
|
ba75a6e328
|
Fixed accidently switching to english locale in production.
|
2012-12-29 17:48:14 +01:00 |
|
benni
|
2c0fe08be6
|
Replaced delayed_job with resque. See README_DEVEL
|
2012-12-23 17:38:04 +01:00 |
|
benni
|
807d476e44
|
Fixed missing scoping by ordergroup in financial index.
|
2012-12-22 14:23:58 +01:00 |
|
benni
|
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 |
|
benni
|
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 |
|
benni
|
bae09624b7
|
Avoid deleting categories which still have articles.
|
2012-12-11 10:53:01 +01:00 |
|
benni
|
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 |
|
Robert Waltemath
|
c032fdca6e
|
Merge remote-tracking branch 'upstream/master'
|
2012-11-13 08:55:50 +01:00 |
|
Julius
|
d086fe7cc7
|
Fix task validation again #16; mark assignment validation TODO
|
2012-11-12 21:31:04 +01:00 |
|
Julius
|
e561ddb064
|
Fix task validation #16
|
2012-11-12 20:14:06 +01:00 |
|
Julius
|
c17ff281c3
|
Save and display creator of Order
|
2012-11-12 14:24:49 +01:00 |
|
benni
|
1d9815731c
|
Removed fancybox. Fixed profile, my ordergroup and tasks.
|
2012-11-12 09:18:44 +01:00 |
|
benni
|
dce79802e0
|
Fixed feedback.
|
2012-11-10 17:05:43 +01:00 |
|
benni
|
181695d1bd
|
Small fixes for article_categories.
|
2012-11-10 16:51:30 +01:00 |
|
benni
|
0236fb5a60
|
Fixed finance module to work with bootstrap design.
|
2012-11-10 16:44:05 +01:00 |
|
benni
|
16de9124fe
|
Fixes orders.
|
2012-10-30 00:20:47 +01:00 |
|
benni
|
8f7e21b918
|
Fixed stockit.
|
2012-10-29 18:28:17 +01:00 |
|
benni
|
fc1c173718
|
Fixed articles module.
|
2012-10-28 18:03:50 +01:00 |
|
benni
|
f30e57dd49
|
Fixed articles views.
|
2012-10-19 01:12:47 +02:00 |
|
benni
|
552c553b77
|
Fixed admin, orders, wiki views. Converted all erb to haml.
|
2012-10-15 21:19:17 +02:00 |
|