wvengen
|
6e990fed4c
|
Upgrade to rails 4.1
|
2014-11-21 14:37:56 +01:00 |
|
wvengen
|
68d54e7e25
|
add sudo functionality
|
2014-10-18 17:58:31 +02:00 |
|
wvengen
|
e9dcaadb06
|
localeapp roundtrip
|
2014-10-14 18:39:05 +02:00 |
|
wvengen
|
9a7b3378c3
|
Make invalid login message depend on use_nick (closes foodcoops#321)
|
2014-10-09 09:42:13 +02:00 |
|
wvengen
|
575928d8a3
|
fix use_messages heading in config screen (closes foodcoops#319)
|
2014-10-07 01:07:11 +02:00 |
|
Benjamin Meichsner
|
b961037fff
|
Fixed broken login#update_password route.
|
2014-10-05 20:35:28 +02:00 |
|
wvengen
|
668ba1e5d6
|
add webstats_tracking_code to configuration screen (closes foodcoops#311)
|
2014-09-22 09:36:36 +02:00 |
|
Benjamin Meichsner
|
81d22e6077
|
Allow adding tracking code for webstatistics service. E.g. piwik.
|
2014-09-22 09:15:47 +02:00 |
|
wvengen
|
418a8b5806
|
fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
|
2014-09-15 13:52:35 +02:00 |
|
wvengen
|
03b307d359
|
fix more sensible mailer option defaults
|
2014-09-03 11:43:15 +02:00 |
|
wvengen
|
1a3b690757
|
add custom css to config screen
|
2014-09-02 15:02:26 +02:00 |
|
wvengen
|
cf680d3410
|
add page break to config screen
|
2014-09-02 15:02:26 +02:00 |
|
wvengen
|
68ccc19c70
|
allow to configure currency (closes foodcoops#258)
|
2014-09-02 15:02:25 +02:00 |
|
wvengen
|
3fee071a10
|
specify timezone in configuration (closes foodcoops#282)
|
2014-09-02 14:21:33 +02:00 |
|
wvengen
|
6115979bae
|
allow protected keys to be set/unset + config_db tests
|
2014-09-02 14:21:32 +02:00 |
|
wvengen
|
7b000c39eb
|
add foodcoop configuration screen
|
2014-09-02 14:21:32 +02:00 |
|
wvengen
|
a39c56fdf1
|
update strings from localeapp
|
2014-09-02 14:21:15 +02:00 |
|
wvengen
|
97dc090e4d
|
Merge pull request #306 from wvengen/feature-styling
allow foodcoops to add custom css
|
2014-09-02 13:59:18 +02:00 |
|
wvengen
|
19630e8607
|
allow foodcoops to add custom css
|
2014-09-02 13:35:45 +02:00 |
|
wvengen
|
647b7f0430
|
allow to synchronize all articles of a shared supplier
|
2014-09-02 12:58:31 +02:00 |
|
wvengen
|
d9c61b2db3
|
allow to match category names on import/sync
|
2014-09-02 12:58:31 +02:00 |
|
wvengen
|
63d52db91b
|
more sensible mailer option defaults
Conflicts:
app/mailers/base_mailer.rb
config/app_config.yml.SAMPLE
spec/app_config.yml
|
2014-09-02 12:35:57 +02:00 |
|
wvengen
|
790a6b1972
|
allow to set page break options for each document
|
2014-08-29 12:01:21 +02:00 |
|
wvengen
|
d8f4ac47dd
|
handle ajax errors (closes foodcoops#300)
|
2014-07-02 13:55:05 +02:00 |
|
wvengen
|
94e100b78b
|
localeapp roundtrip
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
cdc746b364
|
update production environment to match 3.3.0 version
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
ae392ad861
|
fix number display
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
873e8d44a2
|
harmonize foodsoft capitalisation
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
6466ea9653
|
revamp footer
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
a43020463d
|
normalize article and category attributes (closes foodcoops#294)
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
e7a476e6b6
|
remove unused season import fields
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
99301a0576
|
make Redis a softer dependency
(closes foodcoops#288)
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
c54e15dc04
|
localeapp roundtrip
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
8c0df3b4e8
|
edit order user-interface update
also closes foodcoops#145
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
ef0888f38d
|
add view for all transactions + csv
|
2014-06-23 17:51:17 +02:00 |
|
wvengen
|
a7ebf78fd4
|
hide insignificant zeroes for percentage
|
2014-05-17 14:20:48 +02:00 |
|
wvengen
|
cf0558b1ff
|
localeapp roundtrip
|
2014-05-13 17:01:27 +02:00 |
|
wvengen
|
9821f111c2
|
add missing locale
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
64bb8e043d
|
enable/disable plugins by config option
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
852f3484ad
|
make settle directly less dangerous
(closes foodcoops#275)
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
ea8e4ee560
|
add pdf configuration options
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
d7938b752c
|
fix simple_navigation ids
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
9743a9f112
|
localeapp roundtrip
|
2014-05-13 17:01:25 +02:00 |
|
Robert Waltemath
|
7556c753d0
|
Extract message system to plugin.
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
fe0b17cdb0
|
cleanup email footer
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
c25d4d3f4f
|
use ruby-units for unit parsing (closes foodcoops/foodsoft#200)
Conflicts:
Gemfile
Gemfile.lock
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
48e9a3e4f5
|
add fax csv
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
03585e272f
|
add configuration for default language
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
3f032e5dd9
|
make apple points optional
a next step would be to move this to a plugin
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
0fa9bebac9
|
show supplier user-interface update
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
0014435663
|
improved shared database import ui
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
9214fff5a1
|
localeapp roundtrip (mostly formatting changes)
|
2014-03-15 17:17:25 +01:00 |
|
wvengen
|
bb9269f755
|
avoid word-wrap when showing currency
|
2014-03-15 16:40:53 +01:00 |
|
wvengen
|
ab514d7eb6
|
use encrypted cookies on new installations
|
2014-02-24 12:46:28 +01:00 |
|
wvengen
|
7841245795
|
migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
Gemfile.lock
|
2014-02-24 12:46:28 +01:00 |
|
wvengen
|
346bf00b67
|
localeapp roundtrip (includes updated German translation)
|
2014-02-19 11:42:25 +01:00 |
|
wvengen
|
e61b3dc248
|
update Dutch translation
|
2014-02-15 12:38:05 +01:00 |
|
wvengen
|
286c96196c
|
localeapp roundtrip
|
2014-02-15 12:37:01 +01:00 |
|
wvengen
|
60826ceedc
|
allow to edit GroupOrderArticle result from orders screen
Conflicts:
app/assets/javascripts/application.js
|
2014-02-10 16:03:08 +01:00 |
|
wvengen
|
f9d2c20aaa
|
cleanup articles sorted in groups
|
2014-02-10 15:58:58 +01:00 |
|
wvengen
|
2de4a2a3a0
|
Merge pull request #256 from wvengen/feature-partial_shared_sync
Small change to allow non-shared articles with shared suppliers
|
2014-02-07 11:24:33 +01:00 |
|
wvengen
|
d92f3f2298
|
deploy: persist changes to session_store iniitalizer [ci skip]
|
2014-02-03 10:53:22 +01:00 |
|
wvengen
|
3f12627aa4
|
Merge pull request #253 from wvengen/feature-cleaner_order_details
cleanup show order and add search
|
2014-01-29 08:44:31 -08:00 |
|
wvengen
|
381d5de0a3
|
Merge pull request #250 from wvengen/feature-deploy
deployment with Capistrano 3 (in progress)
|
2014-01-27 03:08:24 -08:00 |
|
wvengen
|
d08f120b27
|
show message when ignoring articles due to missing order number
|
2014-01-24 22:20:29 +01:00 |
|
wvengen
|
2b0d4b0ad7
|
fix deploy_to, and use stage
|
2014-01-21 09:46:18 +01:00 |
|
wvengen
|
8db516c5f0
|
Merge branch 'master' into feature-cleaner_order_details
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
|
2014-01-20 13:36:46 +01:00 |
|
wvengen
|
c5cc714f9b
|
add Dutch translation texts
|
2014-01-20 13:30:14 +01:00 |
|
wvengen
|
3b2d4dfd08
|
localeapp roundtrip
|
2014-01-20 12:59:57 +01:00 |
|
wvengen
|
9308096e96
|
Merge pull request #252 from wvengen/feature-fix_redirect_with_suburi
fix root redirect when using suburi
|
2014-01-20 03:13:25 -08:00 |
|
wvengen
|
6c0de3dc74
|
Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
Conflicts:
config/locales/de.yml
config/locales/en.yml
|
2014-01-20 12:12:00 +01:00 |
|
wvengen
|
8b4c292ea0
|
Merge pull request #222 from wvengen/feature-receive
New receive screen
|
2014-01-20 03:02:27 -08:00 |
|
wvengen
|
5b6d1a66a6
|
complete show order i18n
Conflicts:
app/helpers/orders_helper.rb
|
2014-01-17 14:25:57 +01:00 |
|
wvengen
|
42d622d1b2
|
cleanup orders and add search
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/views/orders/_articles.html.haml
app/views/orders/show.html.haml
|
2014-01-17 13:41:38 +01:00 |
|
wvengen
|
d496c452e6
|
allow to enable/disable plugins in deploy
|
2014-01-15 21:41:54 +01:00 |
|
wvengen
|
46b36c42bd
|
simplify initial database setup deployment rules
|
2014-01-15 21:40:51 +01:00 |
|
wvengen
|
151f851799
|
do not require authentication for root redirect
|
2014-01-15 16:33:13 +01:00 |
|
wvengen
|
4e68d3b7f5
|
remove dysfunctional deployment hook
|
2014-01-15 15:50:36 +01:00 |
|
wvengen
|
ecb2f2a015
|
fix root redirect when using suburi
|
2014-01-15 15:43:29 +01:00 |
|
wvengen
|
ca234f0b70
|
deployment with Capistrano 3 (affects foodcoops#148)
|
2014-01-15 13:58:24 +01:00 |
|
wvengen
|
bab28d2770
|
i18n update
|
2014-01-13 23:23:37 +01:00 |
|
wvengen
|
8f0e3af2ba
|
Merge pull request #221 from wvengen/feature-fix_float_display
Fix float display
|
2014-01-13 03:21:17 -08:00 |
|
wvengen
|
45e529b008
|
revert i18n attributes pluralisation
until plataformatec/simple_form#974 has a solution
(reverts parts of ce17bf33e0 and 9db8cb72df)
|
2014-01-11 16:30:17 +01:00 |
|
wvengen
|
cb3e2f7ca0
|
Merge branch 'master' into feature-receive
Conflicts:
config/locales/de.yml
|
2014-01-11 15:56:33 +01:00 |
|
Julius
|
9db8cb72df
|
Synchronize German and English locales
|
2014-01-10 20:50:58 +01:00 |
|
wvengen
|
063ec61753
|
localeapp roundtrip
|
2014-01-10 00:00:57 +01:00 |
|
wvengen
|
b30b424540
|
Merge branch 'master' into feature-receive
Conflicts:
app/helpers/finance/order_articles_helper.rb
|
2014-01-09 18:42:29 +01:00 |
|
wvengen
|
2b97ca050a
|
i18n oops
|
2014-01-09 13:22:32 +01:00 |
|
wvengen
|
124341c7d6
|
receive helper and i18n cleanup
|
2014-01-09 13:01:10 +01:00 |
|
wvengen
|
bdb9499535
|
fix broken update password flow
|
2014-01-08 14:09:28 +01:00 |
|
wvengen
|
ce17bf33e0
|
complete and improve receive i18n
|
2014-01-08 13:39:49 +01:00 |
|
wvengen
|
6e60f94484
|
small receive-related i18n updates
|
2014-01-08 12:52:29 +01:00 |
|
Julius
|
563993fffa
|
Complete I18n of current receive screen
|
2014-01-08 00:06:50 +01:00 |
|
Julius
|
d7c771d10a
|
Continue I18n of receive screen
|
2014-01-06 23:48:39 +01:00 |
|
wvengen
|
69a29b8296
|
Merge pull request #245 from fsmanuel/rss_feed + 1
|
2014-01-06 13:55:32 +01:00 |
|
Julius
|
f83f6971e8
|
Rename update_current_price to update_global_price to avoid confusion
|
2014-01-04 21:35:19 +01:00 |
|
Manuel Wiedenmann
|
0d0ff90a64
|
adds an RSS feed for pages/all
|
2014-01-04 20:12:01 +01:00 |
|
Robert Waltemath
|
2f02f89089
|
Allow login through link in message (and remember requested page).
|
2014-01-03 15:27:15 +01:00 |
|
wvengen
|
133429720c
|
old price display tweaks
|
2014-01-03 14:11:50 +01:00 |
|
wvengen
|
4c9e84ecc6
|
change layout of receive unlock
|
2014-01-03 12:40:43 +01:00 |
|