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 |
|
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
|
a28c6031a4
|
fix receive exception when input is set to nil
|
2013-12-21 17:39:20 +01:00 |
|
wvengen
|
41ea9ed66e
|
hide receive screen for stock orders
|
2013-12-21 17:36:25 +01:00 |
|
wvengen
|
aa6041d337
|
show all articles in receive screen (not just of this order)
|
2013-12-21 17:33:06 +01:00 |
|
wvengen
|
bb331f99a7
|
fix units_to_order display [ci skip]
|
2013-12-19 00:45:39 +01:00 |
|
wvengen
|
54e98474b1
|
remove unused helper [ci skip]
|
2013-12-18 22:35:01 +01:00 |
|
wvengen
|
68c4affb02
|
better disabled button
|
2013-12-18 22:22:34 +01:00 |
|
wvengen
|
3d511ea2fb
|
only show receive in finance when access to ordering
|
2013-12-18 22:19:36 +01:00 |
|
wvengen
|
7f813f2c0f
|
fix order add_article
|
2013-12-18 22:16:19 +01:00 |
|
wvengen
|
88f2dad706
|
language change
|
2013-12-18 22:14:52 +01:00 |
|
wvengen
|
84fe791078
|
update balancing screen
|
2013-12-18 22:10:38 +01:00 |
|
wvengen
|
873a1ff108
|
update texts
|
2013-12-18 21:58:15 +01:00 |
|
wvengen
|
4fede30a19
|
hide invoice columns until implemented
|
2013-12-18 21:53:31 +01:00 |
|
wvengen
|
82d1c41e9f
|
update show order
|
2013-12-18 21:46:34 +01:00 |
|
wvengen
|
d299fa4870
|
move receive screen to orders
|
2013-12-18 21:08:58 +01:00 |
|
wvengen
|
94b4454a1b
|
add receive to order screen, and distinguish between finished and closed orders to put it in nicely
|
2013-12-18 19:21:39 +01:00 |
|
wvengen
|
1ab09b41bd
|
fix articles_for_select2 helper
|
2013-12-18 17:34:45 +01:00 |
|
wvengen
|
2b511ee559
|
Merge branch 'master' into fresh-flow
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
|
2013-12-18 17:03:26 +01:00 |
|
wvengen
|
a0c6cf8afe
|
fix warning without text
|
2013-12-18 16:04:30 +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
|
9b27ce29e9
|
fix BigDecimal to_s monkey-patch (complements 0052d4af1a4cc397c4248a7049a52e35ce33cec1)
|
2013-12-17 18:02:11 +01:00 |
|
wvengen
|
be76f29473
|
do not show ".0" even for floats
|
2013-12-17 18:02:04 +01:00 |
|