wvengen
|
e25570d870
|
Merge remote-tracking branch 'tg-x/master'
Conflicts:
app/views/shared/_open_orders.html.haml
|
2013-12-11 22:39:37 +01:00 |
|
tg(x)
|
e7de772e2b
|
Merge pull request #1 from wvengen/feature-link_to_group_order
small link_to_ordering refactoring
|
2013-12-11 03:02:01 -08:00 |
|
wvengen
|
3f497e9274
|
allow more than two columns in horizontal form
|
2013-12-10 23:41:45 +01:00 |
|
wvengen
|
675f0e6d16
|
fix workgroup link task list
|
2013-12-10 19:12:29 +01:00 |
|
wvengen
|
6bbc614e42
|
localeapp roundtrip (closes foodcoops#156)
|
2013-12-10 18:03:50 +01:00 |
|
wvengen
|
e42e27957d
|
improve task i18n (affects foodcoops#137)
|
2013-12-10 17:58:32 +01:00 |
|
wvengen
|
da737793e8
|
workaround help block margin issue [ci skip]
|
2013-12-10 16:50:04 +01:00 |
|
wvengen
|
85b6ff908b
|
make new article dialog more responsive
|
2013-12-10 16:41:26 +01:00 |
|
wvengen
|
58de1a231b
|
update price during editing as well
|
2013-12-10 13:30:15 +01:00 |
|
Julius
|
30b35cdd11
|
Improve usability of supplier selection for stock_articles in delivery form
|
2013-12-09 00:03:07 +01:00 |
|
Julius
|
7eb64e3c9d
|
Update locales
|
2013-12-07 17:58:06 +01:00 |
|
Julius
|
7a673b1a8b
|
Move stock_article locales from delivery to stock_article
|
2013-12-07 17:48:04 +01:00 |
|
Julius
|
047a3f63c1
|
Finally fix markdown formating issue in publish_subscribe.md
|
2013-12-07 17:29:44 +01:00 |
|
Julius
|
38cbd47a2f
|
Fix markdown formating issue in publish_subscribe.md
|
2013-12-07 17:27:45 +01:00 |
|
Julius
|
0f141cb709
|
Try to fix markdown formating issue in publish_subscribe.md
|
2013-12-07 17:14:30 +01:00 |
|
Julius
|
cdb87a8389
|
Highlight created/updated stock_article in StockArticle#index view
|
2013-12-07 17:10:40 +01:00 |
|
Julius
|
012327dd7c
|
Slightly cleanup delivery form
|
2013-12-07 16:57:53 +01:00 |
|
Julius
|
92f560e189
|
Again revert wrong quotation mark in English locale
|
2013-12-07 16:46:16 +01:00 |
|
Julius
|
3e49104318
|
Revert wrong quotation mark in English locale
|
2013-12-07 16:44:16 +01:00 |
|
Julius
|
bceabfec5c
|
Apply publish/subscribe pattern to stock_article manipulation in delivery form
|
2013-12-07 16:42:25 +01:00 |
|
Julius
|
13bb4e0a8b
|
Rename 'simple_form.hints.stock_article.copy_stock_article' to 'simple_form.hints.stock_article.copy'
|
2013-12-07 15:12:08 +01:00 |
|
Julius Rapp
|
11117738ce
|
Resolve merge conflicts
|
2013-12-07 11:50:37 +01:00 |
|
Julius Rapp
|
dd08e277c7
|
AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates
|
2013-12-07 11:20:44 +01:00 |
|
wvengen
|
b05c75aef3
|
localeapp roundtrip
|
2013-12-06 23:12:15 +01:00 |
|
wvengen
|
112fa3be23
|
fix forgotten i18n string (affects foodcoops#137)
|
2013-12-06 23:08:28 +01:00 |
|
wvengen
|
111c061efa
|
more i18n cleanup (affects foodcoops#137)
|
2013-12-06 22:53:59 +01:00 |
|
wvengen
|
a475a27f79
|
i18n cleanup (affects foodcoops#137)
|
2013-12-06 22:43:36 +01:00 |
|
Julius Rapp
|
e99752e483
|
disable escape of html from local (one place)
|
2013-12-06 18:33:35 +01:00 |
|
wvengen
|
043607f20d
|
workaround wikicloth i18n issue (closes foodsoft#217)
|
2013-12-06 16:41:16 +01:00 |
|
wvengen
|
2baa1d3349
|
fix i18n deprecation warning
|
2013-12-06 16:13:04 +01:00 |
|
wvengen
|
62ca3cb634
|
small layout cleanup [ci skip]
|
2013-12-06 14:49:13 +01:00 |
|
wvengen
|
2f10210c76
|
remove unimplemented unit_divide box
|
2013-12-06 14:38:28 +01:00 |
|
wvengen
|
c99aa7aab6
|
add availability to article edit dialog
|
2013-12-06 14:33:51 +01:00 |
|
wvengen
|
923b579bd1
|
Merge branch 'master' into article-dialog
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
|
2013-12-06 14:26:50 +01:00 |
|
wvengen
|
3937400683
|
fix modal dialog margin [ci skip]
|
2013-12-06 14:26:04 +01:00 |
|
wvengen
|
1c4b9591a2
|
fix edit article dialog title
|
2013-12-06 12:34:14 +01:00 |
|
wvengen
|
05b934e79f
|
update fc price dynamically in article edit form
|
2013-12-06 12:19:13 +01:00 |
|
wvengen
|
e42589ae72
|
translations update (localeapp roundtrip)
|
2013-12-06 11:58:08 +01:00 |
|
wvengen
|
dfa27dfc7c
|
don't use resque on heroku by default
|
2013-12-05 15:52:32 +01:00 |
|
wvengen
|
2408545496
|
bundle update (fixes rails vulnerability)
|
2013-12-04 21:07:50 +01:00 |
|
wvengen
|
b1e81dc1d7
|
make simple_form see that first_name is required
|
2013-12-03 22:04:22 +01:00 |
|
Robert Waltemath
|
8a1b0386eb
|
Re-indent code blocks according to markdown syntax.
|
2013-12-03 19:46:53 +01:00 |
|
wvengen
|
c900cf4988
|
make product redistribution work!
|
2013-11-27 00:06:25 +01:00 |
|
wvengen
|
2d99141229
|
only allow to add articles not already present in receive
|
2013-11-26 13:31:07 +01:00 |
|
wvengen
|
beabe22a01
|
simplify model
|
2013-11-26 13:22:44 +01:00 |
|
wvengen
|
9cb9bf6c1a
|
focus newly added input in receive
|
2013-11-26 13:00:34 +01:00 |
|
wvengen
|
9badaca2f3
|
fix wiki page creation
|
2013-11-25 16:33:12 +01:00 |
|
wvengen
|
853e8ba9d2
|
add package images [ci skip]
|
2013-11-25 15:25:13 +01:00 |
|
wvengen
|
9990e059d4
|
fix i18n
|
2013-11-25 15:24:20 +01:00 |
|
wvengen
|
9c340ec08e
|
more clarity whether a number is number units or boxes
|
2013-11-25 15:13:54 +01:00 |
|