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 |
|
wvengen
|
c30ec67548
|
Allow synchronising units when uploading
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
4d1e102f47
|
Checkbox to remove articles not in upload
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
6ce1b7f928
|
Handle errors in upload and sync form
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
18cc105c1e
|
Add tests for upload
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
d5a7f6a074
|
Move file import logic to model
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
0d92007274
|
Improve upload form
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
16e9210035
|
Fix title of new upload screen
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
26e7012ef0
|
Fix import options and add tests
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
610cd8fce4
|
Test rounded at cents
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
07ba6f0535
|
Import multiple spreadsheet formats. Make upload work like sync.
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
08c8d25a9d
|
New message form and checkbox papercuts
|
2015-04-11 02:32:30 +02:00 |
|
wvengen
|
f47e0b5b2a
|
Give a bit more space to token inputs
|
2015-04-11 02:18:55 +02:00 |
|
wvengen
|
7be903c209
|
Fix simple-navigation version to be sure
|
2015-04-11 02:13:28 +02:00 |
|
wvengen
|
6bbbe5f6e2
|
Fix message send to all members javascript
|
2015-04-11 02:10:37 +02:00 |
|
wvengen
|
3d964b7bcf
|
Bundle update
|
2015-04-11 01:44:23 +02:00 |
|
wvengen
|
379dc86ffa
|
Make order_pdf more generally useful
|
2015-04-10 21:30:04 +02:00 |
|
wvengen
|
bc1eb3bc44
|
Show receive button in grey when already received
|
2015-04-10 21:25:09 +02:00 |
|
wvengen
|
7974d2ec81
|
Use svg badges where possible [ci skip]
|
2015-04-10 19:03:48 +02:00 |
|
wvengen
|
507651f5ba
|
Move small close button to helper.
Workaround for show order deface override nuking attributes of the close button.
|
2015-04-10 18:58:51 +02:00 |
|
wvengen
|
cf0fcccfc3
|
Fix typo
|
2015-04-10 18:46:12 +02:00 |
|
wvengen
|
4239843b3e
|
Merge foodcoop1040:order_message into master
Conflicts:
plugins/messages/app/models/message.rb
|
2015-04-10 18:30:54 +02:00 |
|
wvengen
|
497488ef0e
|
Improve associations
|
2015-04-10 18:30:12 +02:00 |
|
wvengen
|
de794a48b0
|
Reorder roles and add icons
|
2015-04-04 10:56:42 +02:00 |
|
wvengen
|
07311aa032
|
Merge pull request #357 from foodcoop1040/user_activity
Add last user login and activity
|
2015-04-03 16:01:18 +02:00 |
|