Manuel Wiedenmann
|
0d0ff90a64
|
adds an RSS feed for pages/all
|
2014-01-04 20:12:01 +01:00 |
|
JuliusR
|
e807ff8b38
|
Merge pull request #244 from foodcoop-rostock/fix-clean-session-on-logout
The original bug has really been annoying. Nice to have it fixed.
Tested it and found it fine. Should be finished now.
|
2014-01-03 14:03:35 -08:00 |
|
Robert Waltemath
|
a0f55ba812
|
Clear return_to URL in session when signing out.
|
2014-01-03 19:42:08 +01:00 |
|
wvengen
|
933f4fe67a
|
Merge pull request #243 from foodcoop-rostock/fix-access-denied-cycle
Redirect to home page on denied access (fixes #237).
|
2014-01-03 06:59:43 -08:00 |
|
Robert Waltemath
|
2f02f89089
|
Allow login through link in message (and remember requested page).
|
2014-01-03 15:27:15 +01:00 |
|
wvengen
|
b800da9b9b
|
use helper in ajax update too
|
2014-01-03 14:52:44 +01:00 |
|
wvengen
|
7b0d8aa91a
|
Merge pull request #242 from foodcoop-rostock/fix-gitignore-dotbundler
Ignore bundler config.
|
2014-01-03 05:18:56 -08:00 |
|
wvengen
|
436ebc0190
|
Merge pull request #234 from foodcoop-adam/article-dialog
introduce new layout in balancing article screen as well
|
2014-01-03 05:16:03 -08:00 |
|
wvengen
|
133429720c
|
old price display tweaks
|
2014-01-03 14:11:50 +01:00 |
|
Robert Waltemath
|
bf8ef2f45c
|
Ignore bundler config.
|
2014-01-03 13:54:15 +01:00 |
|
Robert Waltemath
|
03f61668aa
|
Redirect to home page on denied access (fixes #237).
|
2014-01-03 13:51:00 +01:00 |
|
wvengen
|
1a5dc3ebe4
|
consider group_order_article without result not manually changed
|
2014-01-03 13:03:28 +01:00 |
|
wvengen
|
438de97464
|
fix non-closed order display
|
2014-01-03 13:00:14 +01:00 |
|
wvengen
|
ebe2966895
|
fix migration, complements 7aae7f4d55
|
2014-01-03 12:50:49 +01:00 |
|
wvengen
|
9219d099c8
|
ui update for packages display
|
2014-01-03 12:42:36 +01:00 |
|
wvengen
|
4c9e84ecc6
|
change layout of receive unlock
|
2014-01-03 12:40:43 +01:00 |
|
wvengen
|
014a62aa11
|
use disabled property for input and fix style
|
2014-01-03 10:59:42 +01:00 |
|
wvengen
|
f1ae2724c6
|
fix unit quantity display after ajax update
|
2014-01-03 10:45:15 +01:00 |
|
wvengen
|
5ead0fb441
|
show correct price
|
2014-01-03 10:44:57 +01:00 |
|
Julius
|
f230d39055
|
Merge price columns in receive form into one
Conflicts:
app/views/orders/_edit_amount.html.haml
|
2014-01-03 10:36:57 +01:00 |
|
Julius
|
0af8a065a1
|
Fix calculation of OrderArticle.total_price and .total_gross_price
|
2014-01-03 10:33:31 +01:00 |
|
Julius
|
2ec3d38238
|
Set readonly property with javascript by .prop instead of .attr
|
2014-01-03 10:33:23 +01:00 |
|
wvengen
|
98f59a3de3
|
Readonly receive input if GroupOrderArticle result has manually been changed
Conflicts:
app/helpers/orders_helper.rb
app/views/orders/_edit_amount.html.haml
|
2014-01-03 10:33:09 +01:00 |
|
wvengen
|
7aae7f4d55
|
Add result_computed to GroupOrderArticle
|
2014-01-03 10:07:03 +01:00 |
|
wvengen
|
a439f26b67
|
ui design update
|
2014-01-02 22:30:04 +01:00 |
|
Julius
|
dd138da1a6
|
Change comment according to 9d61e2e61569159489098eda1bd6c30d7322ce76
|
2014-01-02 19:17:51 +01:00 |
|
Julius
|
8e52fca304
|
Do not set quantity of newly created OrderArticles to 1
|
2014-01-02 19:17:46 +01:00 |
|
Julius
|
a384532619
|
Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b
|
2014-01-02 19:17:41 +01:00 |
|
Julius
|
033aa90698
|
Use OrderArticle#create in receive form instead of Order#add_article
|
2014-01-02 19:16:09 +01:00 |
|
Julius
|
59c118a171
|
Apply publish/subscribe for OrderArticle#create
|
2014-01-02 19:16:03 +01:00 |
|
Julius
|
5349ee142e
|
Offer _undeleted_ StockArticles for new OrderArticle only
|
2014-01-02 19:14:50 +01:00 |
|
Julius
|
01264bc0ac
|
Clean up OrderArticle#new form and related stuff
|
2014-01-02 19:14:46 +01:00 |
|
Julius
|
baa5f16cfc
|
Free order_article resource from finance namespace; also unlock for role_orders
|
2014-01-02 19:14:41 +01:00 |
|
Julius
|
9ed906f425
|
Correct haml comment from '#' to '-#'
|
2014-01-02 19:14:37 +01:00 |
|
Julius
|
cf1e68f11d
|
Allow to edit OrderArticle in Order#receive form
|
2014-01-02 19:14:33 +01:00 |
|
Julius
|
81dfe8110c
|
Apply publish/subscribe for OrderArticle#update
|
2014-01-02 19:14:07 +01:00 |
|
wvengen
|
27a73be68f
|
Merge remote-tracking branch 'foodcoops/master' into feature-receive
|
2014-01-02 18:57:59 +01:00 |
|
wvengen
|
428678fe49
|
Merge pull request #238 from foodcoop-rostock/fix-order-link-from-invoice-form
Change order link from invoice form to avoid access problems
|
2014-01-02 07:43:28 -08:00 |
|
Julius
|
3819fa012e
|
Offer _undeleted_ StockArticles for new OrderArticle only
|
2013-12-31 12:35:30 +01:00 |
|
wvengen
|
9bed751d28
|
Merge pull request #239 from foodcoop-rostock/add-article-price-locales
Add missing translations for ArticlePrice attributes
|
2013-12-31 01:48:44 -08:00 |
|
Julius
|
3336065218
|
Add missing translations for ArticlePrice attributes
|
2013-12-30 12:38:26 +01:00 |
|
Julius
|
b22677eced
|
Change order link from invoice form to avoid access problems
|
2013-12-30 11:26:10 +01:00 |
|
wvengen
|
4f80fd0e8c
|
Merge pull request #231 from wvengen/feature-autocomplete-fixes-2
fix user form field order and autocompletion
|
2013-12-30 02:03:48 -08:00 |
|
wvengen
|
19f583381d
|
Merge pull request #232 from wvengen/feature-remove_unused_redirect_to
Security improvements
|
2013-12-30 01:46:28 -08:00 |
|
wvengen
|
1c03aade53
|
Merge pull request #235 from foodcoop-rostock/fix-derive-title
Fix StockArticle#derive title i18n
|
2013-12-30 01:39:44 -08:00 |
|
Julius
|
f3c3b7af34
|
Fix StockArticle#derive title i18n
|
2013-12-28 20:07:28 +01:00 |
|
wvengen
|
699be6a6d9
|
introduce new layout in balancing article screen as well
|
2013-12-23 16:11:14 +01:00 |
|
wvengen
|
f5bd7a43e4
|
update balancing order article edit screen to support received units
|
2013-12-23 15:25:45 +01:00 |
|
wvengen
|
03bb83ecc0
|
show different warning signs for mismatch with ordered and received
|
2013-12-23 12:35:09 +01:00 |
|
wvengen
|
5d8f71f834
|
move javascript a little
|
2013-12-23 11:51:38 +01:00 |
|