Manuel Wiedenmann
|
5b7ec86ed6
|
Merge branch master into i18n
|
2013-06-14 02:02:57 +02:00 |
wvengen
|
3d1847fabb
|
small i18n and translation updates
|
2013-06-12 22:44:51 +02:00 |
|
wvengen
|
b7f71f5859
|
fix reset password breakage by avoiding encoding ampersand in url (closes #123)
|
2013-06-11 00:01:57 +02: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 |
|
wvengen
|
8929f69dc4
|
add missing i18n text
|
2013-06-06 02:42:38 +02:00 |
|
wvengen
|
3b7cbf71e0
|
fix i18n typos
|
2013-05-16 00:05:47 +02:00 |
|
wvengen
|
8b559269c9
|
add deliveries, pages, tasks translation in English
|
2013-05-06 12:43:57 +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 |
|
wvengen
|
692c70d324
|
finish pages i18n
|
2013-04-12 00:59:45 +02:00 |
|
wvengen
|
1a8c8537a4
|
finish tasks i18n
|
2013-04-12 00:00:02 +02:00 |
|
wvengen
|
6c65799025
|
use more beautiful close mark
|
2013-04-10 17:34:24 +02:00 |
|
wvengen
|
3f82138d84
|
finish deliveries i18n
|
2013-04-10 17:02:16 +02:00 |
Benjamin Meichsner
|
93f4239db6
|
Fixed wrong articles total in group_order#show.
Conflicts:
app/views/group_orders/show.html.haml
|
2013-04-10 10:54:56 +02:00 |
|
Benjamin Meichsner
|
d4b9370541
|
Fixed setting all user setting to false in user profile.
|
2013-04-10 10:52:41 +02:00 |
|
Benjamin Meichsner
|
5b81c53a73
|
Fixed setting all user setting to false in user profile.
|
2013-04-08 15:08:57 +02:00 |
|
Benjamin Meichsner
|
4966aae0ad
|
Fixed modal forms. Submit form when hitting enter.
|
2013-04-08 14:27:23 +02:00 |
|
Benjamin Meichsner
|
9c21a14c7e
|
Update group results when editing order article in balancing.
|
2013-04-08 14:26:40 +02:00 |
|
Benjamin Meichsner
|
220343128c
|
Fixed wrong articles total in group_order#show.
|
2013-04-08 13:39:02 +02:00 |
|
Benjamin Meichsner
|
13e921a632
|
Fixed some errors in articles#sync. Show better error messages.
|
2013-04-08 01:00:49 +02:00 |
|
wvengen
|
f1d6df9ecc
|
move commonly used verbs to common i18n identifier
|
2013-04-04 02:49:52 +02:00 |
|
wvengen
|
ec1ef0289b
|
finish i18n of article_categories + translation
|
2013-04-04 00:44:07 +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 |
|
wvengen
|
e1f5969719
|
use short form plus title for unit quantity
|
2013-04-04 00:24:14 +02:00 |
|
Benjamin Meichsner
|
915e1b9e79
|
Fixed bug in reset password error handling.
|
2013-03-27 22:12:46 +01:00 |
|
wvengen
|
aabeb1a332
|
finish articles i18n
|
2013-03-22 00:20:37 +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
|
22550029b3
|
Added missing ajax support for messages index. Fixed #101
|
2013-03-20 23:31:13 +01:00 |
|
Benjamin Meichsner
|
931bb1d7ca
|
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
|
2013-03-17 20:03:18 +01:00 |
|
Benjamin Meichsner
|
6745b79bb9
|
Allow importing articles again, when article was deleted before.
|
2013-03-17 20:02:14 +01:00 |
|
bennibu
|
033d3459a0
|
Merge pull request #98 from balkansalat/rails3-stock-taking-article-name
Prevent article name from being truncated in StockTaking form
|
2013-03-17 11:41:32 -07:00 |
|
Benjamin Meichsner
|
dd0bd0ad7e
|
Fixed updating order article in stockit balancing.
|
2013-03-17 18:33:04 +01:00 |
|
Benjamin Meichsner
|
3a9ec5a3dd
|
Fixed wiki site-map, when there is no homepage.
|
2013-03-17 17:57:35 +01:00 |
|
Benjamin Meichsner
|
329c451774
|
Fixed articles sync view.
|
2013-03-17 17:47:37 +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
|
07581b7ecf
|
Removed acts_as_paranoid. Implemented own version.
|
2013-03-16 17:57:38 +01:00 |
Julius
|
396e220369
|
Prevent article names from being truncated in StockTaking form
|
2013-03-14 22:30:22 +01:00 |
|
Benjamin Meichsner
|
8bafb3f4b2
|
Show supplier name for articles in stockit order.
|
2013-03-12 19:08:18 +01:00 |
|
Benjamin Meichsner
|
6196bdae41
|
Added some eager loading for balancing new.
|
2013-03-12 12:38:08 +01:00 |
|
Benjamin Meichsner
|
762d529894
|
Added info link for apple restriction feature.
|
2013-03-09 18:14:53 +01:00 |
|
Benjamin Meichsner
|
50873addf8
|
Fixed deleting of articles. Added missing id.
|
2013-03-09 16:46:33 +01:00 |
|
wvengen
|
19527f8425
|
fix some link handling in i18n (using html_safe)
|
2013-03-09 00:48:52 +01:00 |
|
wvengen
|
cb537bc11c
|
start articles i18n
|
2013-03-09 00:40:07 +01:00 |
|
wvengen
|
b81f414ae5
|
finish finance/order_articles i18n + en translation
|
2013-03-08 23:35:50 +01:00 |
|
wvengen
|
c9b2d01fa5
|
i18n last merge
|
2013-03-06 01:24:57 +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 |
|
wvengen
|
2b03a15a9a
|
finish finance invoice i18n and en translation
|
2013-02-27 12:31:01 +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 |