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 |
|
wvengen
|
8d8a64d613
|
Bundle update
|
2015-03-20 17:16:50 +01:00 |
|
wvengen
|
097a7ffbe8
|
Merge pull request #359 from foodcoop1040/reply_private
Reply private to private messages
|
2015-03-20 16:42:38 +01:00 |
|
wvengen
|
15ac566ece
|
Add help page for Foodsoft variables
|
2015-03-20 16:32:58 +01:00 |
|
wvengen
|
a6f02a24d4
|
Improve wiki edit documentation
|
2015-03-20 15:50:49 +01:00 |
|
Patrick Gansterer
|
700eed27b8
|
Add last user login and activity
|
2015-03-03 14:55:30 +01:00 |
|
Patrick Gansterer
|
ac1f6ab258
|
Reply private to private messages
|
2015-03-03 13:34:16 +01:00 |
|
wvengen
|
c59ee3a6a7
|
Show wikipage on login screen when present
|
2015-02-28 14:50:25 +01:00 |
|
wvengen
|
1447b38bb3
|
Use foodsoft expansion variables in footer
|
2015-02-28 14:50:25 +01:00 |
|
wvengen
|
9df483cf4e
|
Add foodsoft expansion variables for wiki
|
2015-02-28 14:50:25 +01:00 |
|
wvengen
|
be128243fc
|
Cleanup wiki plugin a bit
|
2015-02-28 14:50:25 +01:00 |
|
wvengen
|
b42672c06c
|
Add forgotten migration
|
2015-02-27 17:59:30 +01:00 |
|
Patrick Gansterer
|
55e8ff481c
|
Add reply_to and group_id to messages schema
|
2015-02-27 17:30:26 +01:00 |
|
wvengen
|
3a3119f274
|
Regenerate schema
|
2015-02-27 17:28:50 +01:00 |
|
Patrick Gansterer
|
124f77f2ab
|
Add messaging to order (closes #327)
|
2015-02-19 00:53:57 +01:00 |
|
wvengen
|
1b48882c0e
|
Refactor orders index
|
2015-02-18 23:46:50 +01:00 |
|
wvengen
|
27fe8a4d42
|
Merge pull request #347 from foodcoop1040/suppliers_with_articles
Show only suppliers with articles in the dropdown-menu for new orders
|
2015-02-18 23:42:37 +01:00 |
|
wvengen
|
26c364bf4b
|
Merge pull request #354 from foodcoop1040/recipients
Show recipients of messages
|
2015-02-18 23:28:29 +01:00 |
|
wvengen
|
1ac24781f4
|
Merge pull request #348 from foodcoop1040/copy_order
Add possibility to copy an order
|
2015-02-18 23:27:12 +01:00 |
|