Commit graph

2332 commits

Author SHA1 Message Date
wvengen
73bd2c6a8e Bundle update nokogiri (fixes CVEs)
https://github.com/sparklemotion/nokogiri/pull/1378
2015-12-19 11:31:04 +01:00
wvengen
44ee63d156 Bundle update nokogiri 2015-11-26 11:54:26 +01:00
wvengen
227ca0dd84 Merge pull request #387 from foodcoops/feature/boxfills
Add optional boxfill phase to orders (+ bootstrap buttons)
2015-11-20 14:25:41 +01:00
wvengen
6a0147d2e7 Improve article header consistency 2015-11-18 22:44:38 +01:00
wvengen
dcf921dc8d Improve delta-input styling 2015-11-18 22:44:38 +01:00
wvengen
496dd34cc3 Avoid Rails 4.2 deprecation warning 2015-11-14 18:23:33 +01:00
wvengen
6bf693e0ee Fix lingering buglet (would not even run with Array) 2015-11-14 17:07:44 +01:00
wvengen
c6b8b85f1f Update current_orders locales 2015-11-14 16:42:42 +01:00
wvengen
bc0c1f1bbe Localeapp roundtrip 2015-11-14 16:38:35 +01:00
wvengen
8b69ac35a8 Add comment to app config 2015-11-14 16:28:01 +01:00
wvengen
2bb1b8afcc Add link to virtual appliance 2015-11-14 16:26:34 +01:00
wvengen
90b21ecc3a Allow increasing just tolerance in the boxfill phase 2015-11-13 18:10:46 +01:00
wvengen
9d7735849d Disable relevant ordering buttons in boxfill phase 2015-11-13 18:10:46 +01:00
wvengen
adb6089773 Disable +/- buttons on boundaries in ordering 2015-11-13 18:10:46 +01:00
wvengen
945a9e4d4a Use bootstrap buttons for ordering 2015-11-13 18:10:46 +01:00
wvengen
a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen
c1413ff817 Allow clearing default order schedule 2015-10-23 14:53:01 +02:00
wvengen
61a5314b95 Bundle update 2015-09-05 15:09:37 +02:00
wvengen
77ee8ee2f1 Disable error page for development 2015-09-05 15:04:56 +02:00
wvengen
67a885ca9d Merge pull request #380 from MikeiLL/master
Add more concise prompt for database configuration process.
2015-09-05 14:52:42 +02:00
Mike iLL Kilmer
7abaa1ac92 Add more concise prompt for database configuration process. 2015-08-11 21:18:43 -05:00
wvengen
89af99309c Merge pull request #378 from MikeiLL/master
Clarification in Getting Started workflow.
2015-08-11 18:09:09 +02:00
Mike iLL Kilmer
cf1fabe5b6 Slightly clearer, I think. 2015-08-10 12:22:24 -05:00
Mike iLL Kilmer
b7195cd219 Clarify database setup rocess. 2015-08-10 12:20:33 -05:00
wvengen
4a9cf862be Merge pull request #373 from foodcoops/feature/current-orders-plugin
Add current_orders plugin
2015-08-07 19:36:05 +02:00
wvengen
a0fa523d27 Merge pull request #375 from foodcoops/feature/370-error-handling
Render error pages with application layout
2015-08-07 19:35:17 +02:00
wvengen
cb000a0438 Fix current_order PDFs and update article/group PDFs too 2015-07-21 00:13:15 +02:00
wvengen
dc731ee40d Make current_orders plugin configurable 2015-07-21 00:13:15 +02:00
wvengen
466e8c5eeb Port current_orders plugin to current foodsoft 2015-07-21 00:13:15 +02:00
wvengen
5907ff11bb Import current_orders plugin from foodcoop-adam 2015-07-21 00:13:15 +02:00
wvengen
9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen
ae4979a3f0 Lock protected_attributes version to make tests succeed (for now) 2015-07-20 23:55:44 +02:00
wvengen
faa69bfcca Bundle update 2015-07-20 23:04:16 +02:00
wvengen
58df186a2a Make sharedlists optional (and disabled by default) 2015-07-20 22:33:28 +02:00
wvengen
49f2e505d0 Bundle update 2015-06-22 17:20:26 +02:00
wvengen
5697ceac0e Mention OpenSans license 2015-06-12 17:03:22 +02:00
Benjamin Meichsner
342b916ce6 Use OpenSans TTF for better utf-8 compability in prawn documents. 2015-06-12 17:03:22 +02:00
wvengen
6af83bbc77 Merge pull request #372 from aboutsource/hotfix/message-recipients-with-missing-users
Do not fail upon missing users in Message#recipients.
2015-06-12 16:40:43 +02:00
Benjamin Meichsner
af8a035994 Do not fail upon missing users in Message#recipients. 2015-06-07 19:14:47 +02:00
wvengen
b07e855235 Make compatible with Ruby 2.0 2015-06-05 15:35:19 +02:00
wvengen
3d885231f2 Add v4.4.1 to CHANGELOG 2015-06-05 15:04:13 +02:00
wvengen
12dae9cee8 Use inherited_resources rubygem 2015-06-05 14:59:54 +02:00
wvengen
6ded06a8ce Merge pull request #365 from akirk/master
Add color marking to items in group orders that have missing items
2015-06-04 10:02:09 +02:00
wvengen
f5a7c4c90a Bundle update 2015-05-30 19:12:33 +02:00
wvengen
6105e62597 Make docker-compose work again 2015-05-30 19:10:04 +02:00
wvengen
491ca00949 Update roo 2015-05-30 19:09:58 +02:00
wvengen
7f9c99f849 Use main ice_cube gem now feature is merged 2015-05-30 18:31:49 +02:00
Alexander Kirk
d9b3064c2e fix missing units calculation, change missing-none background color 2015-05-19 17:58:29 +02:00
wvengen
b26a0cad12 Merge pull request #366 from aboutsource/fix-rails-server-binding
Fixed binding of rails server in Dockerfile and compose config.
2015-05-18 10:39:26 +02:00
Benjamin Meichsner
cda30a2353 Fixed binding of rails server in Dockerfile and compose config. 2015-05-15 20:23:53 +02:00