wvengen
|
24d04b25db
|
fix some small i18n errors
|
2013-04-04 00:56:45 +02:00 |
|
wvengen
|
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 |
|
Benjamin Meichsner
|
53518039f1
|
Fixed error message, when using GET for password reset actions.
|
2013-03-27 22:20:54 +01:00 |
|
Benjamin Meichsner
|
915e1b9e79
|
Fixed bug in reset password error handling.
|
2013-03-27 22:12:46 +01:00 |
|
Benjamin Meichsner
|
18f6cadca2
|
Ensure mail privacy in message reply and show view.
Thanks to @JuliusR for reporting.
|
2013-03-24 01:37:58 +01:00 |
|
Benjamin Meichsner
|
da72d3a61c
|
Only show undeleted articles in delivery/stock_taking forms.
Fixed 100.
|
2013-03-23 18:25:54 +01:00 |
|
Benjamin Meichsner
|
80b203a8da
|
Fixed missing templates in accept invitation action.
|
2013-03-23 17:51:33 +01:00 |
|
wvengen
|
75a1051668
|
finish articles i18n, controller+model
|
2013-03-22 00:59:42 +01:00 |
|
wvengen
|
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 |
|
Benjamin Meichsner
|
e275403cdd
|
Do not destroy articles in supplier sync. Mark them as deleted.
|
2013-03-18 19:05:11 +01:00 |
|
Benjamin Meichsner
|
dd0bd0ad7e
|
Fixed updating order article in stockit balancing.
|
2013-03-17 18:33:04 +01:00 |
|
Benjamin Meichsner
|
707f989768
|
Fixed routes in redirect after direct_close of orders.
|
2013-03-17 17:50:50 +01:00 |
|
Benjamin Meichsner
|
c05b3e0e19
|
Balancing: Do not update oder summary automaticly when changing group orders.
|
2013-03-17 15:47:50 +01:00 |
|
Benjamin Meichsner
|
9cc98b4662
|
Added some more eager loading for balancing view.
|
2013-03-17 15:12:14 +01:00 |
|
Benjamin Meichsner
|
07581b7ecf
|
Removed acts_as_paranoid. Implemented own version.
|
2013-03-16 17:57:38 +01:00 |
|
Benjamin Meichsner
|
0d3564492b
|
Fixed bug in sorting articles in balancing view.
|
2013-03-12 18:54:51 +01:00 |
|
Benjamin Meichsner
|
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 |
|
Benjamin Meichsner
|
6196bdae41
|
Added some eager loading for balancing new.
|
2013-03-12 12:38:08 +01:00 |
|
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 |
|