Julius
|
3c88f572a4
|
When updating OrderArticle: save ArticlePrice association
|
2014-01-04 21:22:57 +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
|
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 |
|
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
|
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 |
|
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
|
5d8f71f834
|
move javascript a little
|
2013-12-23 11:51:38 +01:00 |
|
wvengen
|
45ad8e6524
|
move helper to new module
|
2013-12-23 11:48:17 +01:00 |
|
wvengen
|
0a6e0ab514
|
Merge pull request #1 from foodcoop-rostock/feature-store-new-password
Allow browser to store new password after change
|
2013-12-23 01:54:50 -08:00 |
|
wvengen
|
d7f624a089
|
Merge pull request #230 from foodcoop-rostock/workaround-possible-wikicloth-bug
Rescue on WikiCloth exception
|
2013-12-23 01:51:27 -08:00 |
|
Julius
|
3bf1392251
|
Show clearer error message on WikiCloth exception
|
2013-12-22 23:34:54 +01:00 |
|
Julius
|
ed228c4bd7
|
Allow control of password autocomplete by flag
|
2013-12-22 23:21:14 +01:00 |
|
wvengen
|
d071c5bba8
|
fix user search
|
2013-12-22 23:21:02 +01:00 |
|
Julius
|
53e611c1c0
|
Allow browser to store new password after change
|
2013-12-22 18:26:28 +01:00 |
|
Julius
|
42e983f7ee
|
Move html markup of WikiCloth exception from locales to controller
|
2013-12-22 18:09:40 +01:00 |
|
wvengen
|
7ef6832ab3
|
fix invite authentication
|
2013-12-22 14:20:25 +01:00 |
|
wvengen
|
cee96915f9
|
remove unused redirect_to functionality
|
2013-12-22 13:59:16 +01:00 |
|
wvengen
|
3e1d561a5e
|
fix user form field order and autocompletion
|
2013-12-22 13:28:33 +01:00 |
|
Julius
|
496a250495
|
Rescue on WikiCloth exception
|
2013-12-22 12:17:02 +01:00 |
|
wvengen
|
df9cff0eee
|
Do not escape mailing list wiki link in the message form (foodcoops#227)
|
2013-12-22 01:59:33 +01:00 |
|
wvengen
|
537ac52f4e
|
Merge pull request #227 from foodcoop-rostock/fix-escape-new-message-hint
Do not escape mailing list links in message form
|
2013-12-21 16:14:20 -08:00 |
|
Julius
|
3099e740ca
|
Do not escape mailing list links in message form
|
2013-12-21 22:52:39 +01:00 |
|
wvengen
|
b4dfa50409
|
bundle update
|
2013-12-18 11:10:00 +01:00 |
|
wvengen
|
64040d6bb9
|
make some dependencies optional to decrease startup-time
|
2013-12-17 23:03:48 +01:00 |
|
wvengen
|
a02ca1b9c0
|
localeapp roundtrip [ci skip]
|
2013-12-17 18:54:05 +01:00 |
|
wvengen
|
f47413a60f
|
Merge pull request #220 from wvengen/feature-i18n-cleanup
Some more i18n cleanup
|
2013-12-17 07:20:01 -08:00 |
|
wvengen
|
94b2c8eac3
|
Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
Conflicts:
app/views/deliveries/_stock_article_form.html.haml
config/locales/de.yml
config/locales/en.yml
|
2013-12-17 15:58:47 +01:00 |
|
wvengen
|
b26b124b0c
|
Merge pull request #211 from foodcoop-adam/group_order-cleanup
make order result calculation a bit cleaner
|
2013-12-17 06:29:15 -08:00 |
|
wvengen
|
c5b1236f21
|
Merge pull request #218 from foodcoop-adam/article-dialog
Edit article user-interface update
|
2013-12-17 06:29:04 -08:00 |
|
wvengen
|
5af82eb55c
|
Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch
Publish/subscribe pattern for DOM updates after AJAX database manipulation
|
2013-12-17 06:28:25 -08:00 |
|
wvengen
|
147365cba1
|
update coverage and use coveralls.io
|
2013-12-16 23:11:39 +01:00 |
|
wvengen
|
18c946eab1
|
add note about release version to setup documentation
|
2013-12-16 18:13:30 +01:00 |
|
wvengen
|
1e7b1a43c8
|
Bumped new version: 3.2.0
|
2013-12-16 11:30:54 +01:00 |
|
wvengen
|
c72ed20c90
|
add CHANGELOG [ci skip]
|
2013-12-16 11:29:23 +01:00 |
|
wvengen
|
a91c97526e
|
complete German translations (thanks @fsmanuel) [ci skip]
|
2013-12-16 10:55:45 +01:00 |
|
wvengen
|
452db61af8
|
i18n fix (thanks @JuliusR)
|
2013-12-14 23:52:59 +01:00 |
|
Julius
|
9b92d6ff10
|
Mark two i18n issues
|
2013-12-14 14:48:58 +01:00 |
|
wvengen
|
11a2b865aa
|
localeapp roundtrip
|
2013-12-14 13:35:52 +01:00 |
|