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 |
|
wvengen
|
71c2b1717a
|
continue development after release
|
2015-05-15 14:29:37 +02:00 |
|
wvengen
|
b7ab08771e
|
Bumped new version: 4.4.0
|
2015-05-15 14:29:04 +02:00 |
|
wvengen
|
13768285e4
|
localeapp roundtrip
|
2015-05-15 14:26:08 +02:00 |
|
wvengen
|
1a62ce55e3
|
Fix task form
|
2015-05-08 20:54:48 +02:00 |
|
wvengen
|
a34c462c59
|
Bundle update
|
2015-05-08 20:20:51 +02:00 |
|
wvengen
|
ec03d579d0
|
Merge branch 'feature/edit-recurring-task'
Conflicts:
config/locales/en.yml
|
2015-05-08 20:10:23 +02:00 |
|
wvengen
|
b3196e0a12
|
Use tokeninput as dependency
|
2015-05-08 17:56:08 +02:00 |
|
wvengen
|
a00e7c94be
|
Rework user-interface for editing recurring tasks
|
2015-05-08 17:39:20 +02:00 |
|
wvengen
|
c388b4e410
|
Merge branch 'dockerization'
|
2015-05-08 13:06:15 +02:00 |
|
wvengen
|
5e2ff4158e
|
Make mailcatcher & redis work with both Docker and local development
|
2015-05-08 13:05:48 +02:00 |
|
Benjamin Meichsner
|
6c2fefa2bf
|
Merge pull request #1 from wvengen/feature/docker
Docker improvements
|
2015-05-04 14:42:18 +02:00 |
|
Alexander Kirk
|
75967bad22
|
Add color marking to items in group orders that have missing items
|
2015-05-04 06:16:14 +02:00 |
|
wvengen
|
f049da7573
|
Bundle update
|
2015-05-02 15:28:21 +02:00 |
|
wvengen
|
beee5a1245
|
Localeapp roundtrip
|
2015-05-02 15:27:06 +02:00 |
|
wvengen
|
ca1abefeb6
|
Update Docker docs
|
2015-05-02 14:34:13 +02:00 |
|
wvengen
|
c0ae816c77
|
Improve testing script
|
2015-05-02 14:34:13 +02:00 |
|
wvengen
|
27050f8b02
|
Make rake setup task work with Docker
|
2015-05-02 14:34:13 +02:00 |
|
Robert
|
a8a434ef7b
|
Move due date according to delta
|
2015-05-01 21:31:06 +02:00 |
|
Robert
|
fd51b07e21
|
Allow editing recurring task groups, basic functionality for #152
|
2015-05-01 21:14:16 +02:00 |
|
Benjamin Meichsner
|
f9cdd7f8ba
|
Added docker-compose.yml
|
2015-04-26 15:23:45 +02:00 |
|
Benjamin Meichsner
|
83dd18eaa7
|
Added Dockersupport. See README_DOCKER.md for further instructions.
|
2015-04-26 15:20:05 +02:00 |
|
wvengen
|
d953ee6242
|
Silence Prawn PDF UTF-8 warning
|
2015-04-25 18:18:11 +02:00 |
|
wvengen
|
aa7a2a31ae
|
Bundle update & restructure tests (RSpec 3)
|
2015-04-25 17:14:37 +02:00 |
|
wvengen
|
7b2bcedb16
|
Merge pull request #363 from BanzaiMan/patch-1
Run Travis CI builds on containers, and make use of cache
|
2015-04-24 09:30:26 +02:00 |
|
Hiro Asari
|
9a5cf6a18b
|
Run on containers, and make use of cache
|
2015-04-23 18:53:22 -04:00 |
|
wvengen
|
dd799cf642
|
Allow to sort receive on unit
|
2015-04-22 20:08:24 +02:00 |
|
wvengen
|
17cbc57850
|
Don't error when deleting supplier/group with already existing deleted name (closes foodcoops/foodsoft#197)
|
2015-04-17 20:09:40 +02:00 |
|
wvengen
|
b028431bf0
|
Merge pull request #361 from foodcoops/feature/spreadsheets
Let upload provide same functionality as shared database sync
|
2015-04-17 19:18:44 +02:00 |
|
wvengen
|
5d47171b76
|
Improve upload error handling
|
2015-04-17 18:44:38 +02:00 |
|
wvengen
|
c08c29b0e7
|
Don't show deleted ordergroups (closes foodcoops/foodsoft#362)
|
2015-04-17 18:27:50 +02:00 |
|
wvengen
|
a016f0d7dc
|
Small improvement to heroku deploy script
|
2015-04-11 02:57:03 +02:00 |
|