Julius
|
3099e740ca
|
Do not escape mailing list links in message form
|
2013-12-21 22:52:39 +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
|
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
|
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
|
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
|
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
|
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
|
142e8a0473
|
i18n fixes
|
2013-12-14 13:34:58 +01:00 |
|
wvengen
|
4e54388b83
|
Merge remote-tracking branch 'foodcoop-rostock/question-form-i18n' into feature-i18n-cleanup
|
2013-12-14 13:20:03 +01:00 |
|
wvengen
|
46ab4dcc01
|
proper i18n of last ordergroup order (thanks @JuliusR)
|
2013-12-14 13:15:47 +01:00 |
|
wvengen
|
d67a0083f1
|
fix price hint escaping (thanks @JuliusR)
|
2013-12-14 13:15:16 +01:00 |
|
Julius
|
40e9e82295
|
Mark two i18n issues
|
2013-12-14 10:03:32 +01:00 |
|
wvengen
|
d448707b1a
|
i18n cleanup (affects foodcoops#137)
|
2013-12-12 00:13:19 +01:00 |
|
wvengen
|
b53cb36714
|
give proper block to link_to_ordering (closes #201)
|
2013-12-11 22:58:50 +01:00 |
|
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 |
|
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
|
e42e27957d
|
improve task i18n (affects foodcoops#137)
|
2013-12-10 17:58:32 +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
|
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
|
bceabfec5c
|
Apply publish/subscribe pattern to stock_article manipulation in delivery form
|
2013-12-07 16:42:25 +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
|
112fa3be23
|
fix forgotten i18n string (affects foodcoops#137)
|
2013-12-06 23:08:28 +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
|
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
|
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
|
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
|
9cb9bf6c1a
|
focus newly added input in receive
|
2013-11-26 13:00:34 +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 |
|
wvengen
|
bd1b932775
|
add receive screen, quantities for model, redistribution
|
2013-11-25 14:17:31 +01:00 |
|
wvengen
|
1f08ee4759
|
Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order
Conflicts:
app/views/shared/_open_orders.html.haml
|
2013-11-25 10:11:56 +01:00 |
|
wvengen
|
810656a53b
|
small link_to_ordering refactoring
|
2013-11-25 10:04:44 +01:00 |
|
wvengen
|
9a0100e382
|
Merge pull request #207 from sjmulder/bug/130
Remove apple-touch-icon link
|
2013-11-25 00:39:52 -08:00 |
|
wvengen
|
935fdedd66
|
hide row when information not present
|
2013-11-24 02:16:15 +01:00 |
|
wvengen
|
e5471b9f73
|
more i18n cleanup
|
2013-11-24 01:47:34 +01:00 |
|
wvengen
|
652a392b37
|
simplify i18n and fix some small ui issues
|
2013-11-23 17:49:43 +01:00 |
|
wvengen
|
135e938d3d
|
i18n cleanups (affects #137)
|
2013-11-23 12:05:29 +01:00 |
|
wvengen
|
84191ddcd0
|
first shot on improving edit article form
(see also foodcoops#209)
|
2013-11-20 23:46:11 +01:00 |
|
Sijmen Mulder
|
630aa383cb
|
Remove apple-touch-icon links
Safari will fall back to request the default touch icons if the href of the
link 404s, so having them point at nothing generates 4 404s for nothing.
|
2013-11-19 22:57:55 +01:00 |
|
wvengen
|
66ac3be81f
|
Merge branch 'master' into allow-no-nickname
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
|
2013-11-18 11:42:49 +01:00 |
|
tg(x)
|
de9453fa24
|
dashboard: link to view order page
|
2013-11-13 16:42:32 +01:00 |
|
wvengen
|
a5a29aff5c
|
Merge pull request #195 from foodcoop-adam/grouporder-many-products
Allow large product lists in member order
|
2013-11-12 08:41:48 -08:00 |
|
wvengen
|
bb5a67033d
|
Merge pull request #194 from foodcoop-adam/plugin-move
Better support for plugins (engines) + move wiki to plugin
|
2013-11-12 03:46:15 -08:00 |
|
wvengen
|
768796407f
|
Merge pull request #192 from foodcoop-adam/cleanup-stale
Cleanup unused views&controllers
|
2013-11-11 09:05:19 -08:00 |
|
wvengen
|
891b9a21c0
|
fix and improve i18n of "My Ordergroup"
|
2013-11-09 14:19:54 +01:00 |
|
wvengen
|
a535fbc517
|
allow large product lists in member order
|
2013-11-05 10:55:28 +01:00 |
|
wvengen
|
f7a0103553
|
clearer login field name
|
2013-10-30 21:28:35 +01:00 |
|
wvengen
|
3588962329
|
remove unused layout
|
2013-10-30 20:53:01 +01:00 |
|
wvengen
|
fef17604c5
|
remove unused autocomplete templates
|
2013-10-30 20:50:56 +01:00 |
|
wvengen
|
5ead67f88c
|
remove unused memberships controller/view
|
2013-10-30 20:46:59 +01:00 |
|
wvengen
|
de948d7692
|
fix and cleanup routing (closes foodcoops#190)
|
2013-10-30 02:27:04 +01:00 |
|
wvengen
|
70c12b7c1f
|
move wiki functionality to plugin
|
2013-10-29 22:42:06 +01:00 |
|
wvengen
|
c37ed74942
|
Merge branch 'master' into allow-no-nickname
Conflicts:
app/views/foodcoop/users/_users.html.haml
|
2013-10-29 19:15:52 +01:00 |
|
wvengen
|
e13ca74df3
|
fix new user form
|
2013-10-29 19:11:33 +01:00 |
|
wvengen
|
9ba425aafa
|
fallback for when nick is nil
|
2013-10-29 19:05:24 +01:00 |
|
wvengen
|
e968919cce
|
beautify map invocations of users
|
2013-10-29 18:46:55 +01:00 |
|
wvengen
|
3275e9ba31
|
small i18n bug
|
2013-10-22 00:09:11 +02:00 |
|
wvengen
|
98e7189d31
|
Merge branch 'master' into i18n
Conflicts:
app/assets/javascripts/application.js
|
2013-10-18 12:30:34 +02:00 |
|
wvengen
|
51e6a7aeb0
|
Merge pull request #149 from foodcoop-adam/updated-gems
run bundle update and make it work again
|
2013-10-18 03:12:59 -07:00 |
|
wvengen
|
4e61e764df
|
fix haml indentation errors
|
2013-10-17 16:35:50 +02:00 |
|
wvengen
|
389b45a505
|
fix stockit i18n reference
|
2013-10-10 19:23:37 +02:00 |
|
wvengen
|
23b38b5a46
|
fix category heading
|
2013-10-10 19:22:43 +02:00 |
|
wvengen
|
34a4951e28
|
Merge branch 'master' into i18n
Conflicts:
Gemfile
config/locales/de.yml
config/locales/en.yml
|
2013-10-09 23:57:43 +02:00 |
|
wvengen
|
67e29620f4
|
i18n simple_form move of invoices
|
2013-10-09 23:37:08 +02:00 |
|
wvengen
|
6ba971fe15
|
i18n simple_form move of deliveries
|
2013-10-09 23:19:40 +02:00 |
|
wvengen
|
c3d22e883d
|
i18n simple_form move of suppliers
|
2013-10-09 23:12:26 +02:00 |
|
wvengen
|
78c81b194c
|
i18n simple_form move of foodcoop
|
2013-10-09 23:00:07 +02:00 |
|
wvengen
|
552af7925d
|
i18n simple_form move of tasks
|
2013-10-09 22:41:23 +02:00 |
|
wvengen
|
b8ff431634
|
clean up price tooltips javascript
|
2013-10-09 10:43:41 +02:00 |
|
wvengen
|
bdce1b5872
|
Merge branch 'master' into updated-gems
Conflicts:
Gemfile
Gemfile.lock
|
2013-10-09 10:37:02 +02:00 |
|
wvengen
|
a32a3757d2
|
Merge pull request #180 from foodcoop-rostock/search-article-list-modified
Search articles in group_orders form
|
2013-10-08 02:21:35 -07:00 |
|
Julius
|
10d1615cd8
|
Prepare tooltip for next bootstrap version (as in 1fed9834b3)
|
2013-10-05 22:28:04 +02:00 |
|
Julius
|
3a948e9b73
|
Move list.js extensions to plugins
|
2013-10-04 18:28:45 +02:00 |
|
wvengen
|
64a597c689
|
use i18n-js
|
2013-10-04 15:01:10 +02:00 |
|
wvengen
|
a9dff7f1df
|
add missing i18n
|
2013-10-04 10:25:53 +02:00 |
|