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
|
9badaca2f3
|
fix wiki page creation
|
2013-11-25 16:33:12 +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
|
9c3eb9e741
|
Merge pull request #212 from foodcoop-adam/i18n-cleanup
i18n cleanup + small fixes
|
2013-11-25 00:39:21 -08:00 |
|
wvengen
|
935fdedd66
|
hide row when information not present
|
2013-11-24 02:16:15 +01:00 |
|
wvengen
|
6410396489
|
localeapp roundtrip
|
2013-11-24 02:12:32 +01:00 |
|
wvengen
|
20bd86fe65
|
make heading_helper work with empty _short translation
|
2013-11-24 01:59:44 +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
|
ed9a6cca39
|
make result calculation a bit cleaner
|
2013-11-22 23:40:44 +01:00 |
|
wvengen
|
ad2822dd9e
|
Merge pull request #210 from foodcoop-adam/retry-tests
retry failing tests as a workaround for fragile integration tests
|
2013-11-21 03:46:59 -08:00 |
|
wvengen
|
8ac7cbf96f
|
retry tests as a workaround for fragile integration tests (closes foodcoops#205)
|
2013-11-21 00:29:24 +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
|
5adb25caf5
|
copy wiki strings to plugin area
|
2013-11-19 18:33:54 +01:00 |
|
wvengen
|
2ac7016ccc
|
localeapp roundtrip [ci skip]
|
2013-11-18 15:01:26 +01:00 |
|
wvengen
|
3b8dfa7173
|
bundle update
|
2013-11-18 12:12:24 +01:00 |
|
wvengen
|
c4530bca6f
|
Merge pull request #189 from foodcoops/allow-no-nickname
Make the use of a username optional
|
2013-11-18 03:00:27 -08: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 |
|
wvengen
|
9b47e5d6c4
|
use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values
|
2013-11-18 11:31:30 +01:00 |
|
wvengen
|
8a56e271f9
|
Merge pull request #202 from foodcoops/update-spec
Add tests for shared database
|
2013-11-13 14:34:35 -08:00 |
|
wvengen
|
4219eff0ab
|
fix rspec warning
|
2013-11-13 23:22:26 +01:00 |
|
wvengen
|
588898d7b0
|
do not error when calling shared_article on non-shared article
|
2013-11-13 23:20:48 +01:00 |
|
wvengen
|
ac6b00d4f5
|
add unit tests for shared database synchronisation
|
2013-11-13 23:09:17 +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
|
5daf1a466f
|
localeapp roundtrip
|
2013-11-11 18:08:28 +01:00 |
|