Julius
|
9db8cb72df
|
Synchronize German and English locales
|
2014-01-10 20:50:58 +01:00 |
|
wvengen
|
b30b424540
|
Merge branch 'master' into feature-receive
Conflicts:
app/helpers/finance/order_articles_helper.rb
|
2014-01-09 18:42:29 +01:00 |
|
wvengen
|
0b4cfde1b2
|
put footer below body, now that is allowed in html5
|
2014-01-09 14:47:05 +01:00 |
|
wvengen
|
dcb17e04b5
|
do not show article hint in order view after all, since "old price" is
actually the price of the current article, which will probably be
different in the future
|
2014-01-09 13:24:40 +01:00 |
|
wvengen
|
2b97ca050a
|
i18n oops
|
2014-01-09 13:22:32 +01:00 |
|
wvengen
|
bea2706005
|
fix receive dynamic update (complements 90c81de872)
|
2014-01-09 13:19:27 +01:00 |
|
wvengen
|
124341c7d6
|
receive helper and i18n cleanup
|
2014-01-09 13:01:10 +01:00 |
|
wvengen
|
90c81de872
|
update receive delta column + responsive css
|
2014-01-09 12:20:54 +01:00 |
|
wvengen
|
56bd527a8b
|
keep white input background with package class [ci skip]
|
2014-01-09 10:51:54 +01:00 |
|
wvengen
|
5a7c9b817c
|
fix receive js for document updates [ci skip]
|
2014-01-09 10:14:05 +01:00 |
|
wvengen
|
b331d9a2a9
|
better css responsiveness [ci skip]
|
2014-01-08 19:58:51 +01:00 |
|
wvengen
|
65e79d7e1b
|
small receive usability changes
|
2014-01-08 19:28:39 +01:00 |
|
wvengen
|
d1c3c83ed7
|
use plural in table headings by default
|
2014-01-08 18:23:34 +01:00 |
|
wvengen
|
ffdfa63d86
|
add coveralls badge to README
|
2014-01-08 14:45:10 +01:00 |
|
wvengen
|
abb3770d08
|
bundle update
|
2014-01-08 14:39:17 +01:00 |
|
wvengen
|
bdb9499535
|
fix broken update password flow
|
2014-01-08 14:09:28 +01:00 |
|
wvengen
|
0e8e93204a
|
Merge pull request #240 from foodcoop-rostock/fix-order-article-helper-undeleted
Offer _undeleted_ StockArticles for new OrderArticle only
|
2014-01-08 04:42:55 -08:00 |
|
wvengen
|
ce17bf33e0
|
complete and improve receive i18n
|
2014-01-08 13:39:49 +01:00 |
|
wvengen
|
8f14ab31f3
|
cleanup and expand receive integration test
|
2014-01-08 13:07:11 +01:00 |
|
wvengen
|
6e60f94484
|
small receive-related i18n updates
|
2014-01-08 12:52:29 +01:00 |
|
wvengen
|
ccdb1e8add
|
Merge remote-tracking branch 'foodcoop-rostock/feature-receive-i18n' into feature-receive
|
2014-01-08 12:35:44 +01:00 |
|
wvengen
|
d01d1bc496
|
add integration tests for receive
|
2014-01-08 11:52:45 +01:00 |
|
Julius
|
563993fffa
|
Complete I18n of current receive screen
|
2014-01-08 00:06:50 +01:00 |
|
Julius
|
d7c771d10a
|
Continue I18n of receive screen
|
2014-01-06 23:48:39 +01:00 |
|
wvengen
|
69a29b8296
|
Merge pull request #245 from fsmanuel/rss_feed + 1
|
2014-01-06 13:55:32 +01:00 |
|
wvengen
|
fe111a1422
|
require gem in plugin
|
2014-01-06 13:54:56 +01:00 |
|
Julius
|
8479678530
|
Improve unlock button for receiving OrderArticles manually adjusted
Conflicts:
app/views/orders/_edit_amount.html.haml
|
2014-01-04 20:51:42 +01:00 |
|
Julius
|
a8e604c196
|
When receiving: hide OrderArticle unit fields also after failed validation
|
2014-01-04 20:46:50 +01:00 |
|
wvengen
|
aa57cee96f
|
do not show units fields in receive edit order article screen
|
2014-01-04 20:46:13 +01:00 |
|
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 |
|