Commit graph

348 commits

Author SHA1 Message Date
benji
442c694122 Fix some small bugs 2015-09-17 15:32:39 +02:00
benji
ef75909298 Change erb to haml 2015-09-17 14:05:33 +02:00
benji
5e666d8cb8 Fix failing tests 2015-09-14 20:55:49 +02:00
benji
b55ba47209 Refactor 2015-09-14 20:26:16 +02:00
benji
de1436f5c7 Allow destroying of orders 2015-09-14 17:52:25 +02:00
benji
251d3b69b7 Move tab api to seperate job 2015-09-14 17:29:00 +02:00
benji
02b27233cd Save transaction id 2015-09-14 11:20:52 +02:00
benji
891e596fda replace tab api key to secrets 2015-09-12 11:47:00 +02:00
benji
052989e819 Remove bin from linked dirs 2015-09-12 11:33:54 +02:00
benji
5ba36e431f Merge branch 'rspec' 2015-09-12 11:30:59 +02:00
benji
48aaaa354d Merge branch 'master' into rspec 2015-09-12 11:30:09 +02:00
benji
c24d7ad956 Implement tab api cancelled 2015-09-12 11:28:50 +02:00
benji
fc5fa70980 Add capistrano support for delayed job 2015-09-12 11:27:33 +02:00
benji
825dee8e02 Add delayed job to post requests to tab 2015-09-12 11:17:58 +02:00
Tom Naessens
4b297496c3 Add URL in readme 2015-09-09 14:27:09 +02:00
Tom Naessens
f027735015 Use new travis infrastructure 2015-09-09 14:18:17 +02:00
Tom Naessens
f1bbf77f1b Merge branch 'master' of github.com:ZeusWPI/Tap 2015-09-09 14:18:01 +02:00
Tom Naessens
f5185cfe69 Use the .ruby-version for travis tests 2015-09-09 14:13:54 +02:00
Tom Naessens
d74b1510a8 Update README.md 2015-09-09 14:09:25 +02:00
Tom Naessens
0f5bfa0432 Annnd another substitute 2015-09-08 13:35:56 +02:00
Tom Naessens
957fc54d1a Forgot a sub 2015-09-08 13:34:36 +02:00
Tom Naessens
81691282f8 Merge branch 'master' of github.com:ZeusWPI/Tap 2015-09-08 13:30:24 +02:00
Tom Naessens
8ac363911e s/tab/tap/g 2015-09-08 13:30:18 +02:00
benji
28774b3175 Add tests for user controller 2015-09-07 21:15:16 +02:00
benji
fee873126a fix (?) bug on travis 2015-09-07 14:39:45 +02:00
benji
084e542dd5 Add tests for products_controller 2015-09-07 14:26:07 +02:00
Donvittorio
d9166b8280 Update README.md 2015-09-07 13:36:10 +02:00
benji
003e0bc88b Add tests for ability 2015-09-04 18:13:58 +02:00
benji
c6ce9886de Fix typo and change travis config and ruby version 2015-09-04 17:28:15 +02:00
benji
ebbc8ce471 Finish tests for models 2015-09-04 17:17:33 +02:00
benji
b1dbe76746 Add order price test 2015-09-04 16:47:49 +02:00
benji
3c4ada0704 Remove slack support from Tap 2015-09-04 14:14:49 +02:00
benji
43fd368bc7 Add tests for order_items 2015-09-04 13:23:51 +02:00
benji
168b723dce Add tests for product validations 2015-09-03 23:12:20 +02:00
benji
bb76b36d86 Add tests for cancelling orders 2015-09-03 10:08:17 +02:00
benji
ae28317b07 Remove minitest and add rspec with factories 2015-09-02 20:33:35 +02:00
Tom Naessens
d9cc0ee30e Merge branch 'master' of github.com:ZeusWPI/Tap 2015-09-02 14:58:30 +02:00
Tom Naessens
90f4baa546 Fix order/new button group wrapping (closes #65) 2015-09-02 14:58:23 +02:00
benji
3f43dd8cd5 Merge branch 'master' of https://github.com/ZeusWPI/Tap 2015-09-02 14:35:36 +02:00
benji
c0fe8833fa Remove unpermitted parameters and javascript error in orders 2015-09-02 14:35:29 +02:00
Tom Naessens
060d4b6a0c Fix asset pipeline stuff 2015-09-02 14:05:25 +02:00
benji
4e88be6562 Clean up the validation code of stock 2015-09-02 12:57:41 +02:00
benji
ea360dc028 Merge pull request #63 from ZeusWPI/active_model_for_stock_form
Active model for stock form
2015-09-01 23:39:48 +02:00
benji
9850a63781 Remove fixtures for activemodel 2015-09-01 23:22:28 +02:00
benji
0862b275fc Create actionmodel stock/stockentry and change form 2015-09-01 23:13:20 +02:00
benji
b7c292275b Remove schulden for admins as this has been moved to a seperate application 2015-09-01 18:15:27 +02:00
benji
28ec934e0a Merge pull request #61 from ZeusWPI/user_edit_styling
Do some styling
2015-09-01 17:40:42 +02:00
benji
7b345f28a8 Do some styling 2015-09-01 17:40:18 +02:00
benji
43190104ec Add user avatar to user#show 2015-09-01 16:51:21 +02:00
benji
db6f29b0e5 Merge pull request #60 from ZeusWPI/user_show_styling
User show styling
2015-09-01 16:27:26 +02:00