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
|
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
|
825dee8e02
|
Add delayed job to post requests to tab
|
2015-09-12 11:17:58 +02:00 |
|
Tom Naessens
|
0f5bfa0432
|
Annnd another substitute
|
2015-09-08 13:35:56 +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
|
084e542dd5
|
Add tests for products_controller
|
2015-09-07 14:26:07 +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
|
c0fe8833fa
|
Remove unpermitted parameters and javascript error in orders
|
2015-09-02 14:35:29 +02:00 |
|
benji
|
4e88be6562
|
Clean up the validation code of stock
|
2015-09-02 12:57:41 +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
|
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
|
10d52c806d
|
Use actual value for products count instead of fix number
|
2015-09-01 16:21:43 +02:00 |
|
benji
|
7014201510
|
Change some styling
|
2015-09-01 14:52:20 +02:00 |
|
benji
|
c668cc1ab9
|
cancancan fix
|
2015-08-31 15:35:59 +02:00 |
|
benji
|
da278491b1
|
Fix authorization for orders using cancancan
|
2015-08-31 15:10:13 +02:00 |
|
benji
|
b5017bff9a
|
Remove debt from tab and refactor some code
|
2015-08-31 14:33:15 +02:00 |
|
benji
|
cc9e4ed6b3
|
Merge master
|
2015-08-25 16:05:13 +02:00 |
|
benji
|
b7f40f8832
|
Add possibility to remove products from the offer without breaking stuff
|
2015-08-25 15:53:27 +02:00 |
|
benji
|
5d39abafd5
|
Merge pull request #53 from VandorpeDavid/calories
Calories
|
2015-08-24 16:16:27 +02:00 |
|
benji
|
652c598722
|
Merge pull request #55 from VandorpeDavid/out_of_order
Red border when product is sold out
|
2015-08-24 16:02:29 +02:00 |
|
David Vandorpe
|
595d8ed282
|
Forgot to commit helper
|
2015-07-08 17:43:20 +02:00 |
|
David Vandorpe
|
ee86411d58
|
Using helper to generate kcal tag
As suggested by Benji
|
2015-07-08 17:38:51 +02:00 |
|
David Vandorpe
|
d397ae7d34
|
Use of .zero? instead of == 0
|
2015-07-08 17:06:02 +02:00 |
|
David Vandorpe
|
24f9531192
|
Senpai Silox Styling Suggestions
|
2015-07-08 13:37:19 +02:00 |
|
David Vandorpe
|
91945b6983
|
Senpai Silox Styling Suggestions
|
2015-07-08 13:31:32 +02:00 |
|
David Vandorpe
|
7831520c6f
|
Red border when product is sold out
|
2015-07-07 22:36:04 +02:00 |
|
David Vandorpe
|
33b797b5d9
|
Enforce stock max en 0 min for amount of products in orders
Fixes #48
|
2015-07-07 21:47:20 +02:00 |
|
David Vandorpe
|
a8055d6f09
|
Adding calories to several views
|
2015-07-07 20:20:34 +02:00 |
|
David Vandorpe
|
849d9ce04b
|
Product calories: DB migration + Model update + attribute permit
|
2015-07-07 20:11:37 +02:00 |
|
benji
|
5a5fbdf1c9
|
Fix #38
|
2015-07-01 23:51:26 +02:00 |
|
benji
|
dc73128508
|
Fix #49
|
2015-07-01 16:56:09 +02:00 |
|
benji
|
90e270a03e
|
Avoid long product names of fucking up entire layout
|
2015-07-01 16:19:36 +02:00 |
|
benji
|
bf52027229
|
Add image_tag of avatar on user edit page
|
2015-07-01 11:16:08 +02:00 |
|
benji
|
f5c970af53
|
Fix css on order_items
|
2015-06-30 23:33:11 +02:00 |
|
benji
|
2f71e95a81
|
Add private option to users
|
2015-06-30 22:30:34 +02:00 |
|
benji
|
97fdd2e24c
|
Change orderitems from text inputs to number fields
|
2015-04-04 04:13:30 +02:00 |
|
benji
|
ec36ac619f
|
use english locale
|
2015-04-04 03:38:29 +02:00 |
|
benji
|
eda0d86e74
|
Fix #47
|
2015-04-04 03:26:25 +02:00 |
|
benji
|
8e5ccfed7a
|
urgh
|
2015-04-04 02:50:26 +02:00 |
|
benji
|
d8f77442ab
|
comma and empty token in development
|
2015-04-04 01:51:11 +02:00 |
|
benji
|
0105c30a36
|
secrets
|
2015-04-04 01:47:02 +02:00 |
|
benji
|
be9c967db2
|
Add slack notification
|
2015-04-04 01:44:28 +02:00 |
|
benji
|
9ec9f043ed
|
Merge pull request #46 from ZeusWPI/products_list
Products list
|
2015-04-03 23:56:48 +02:00 |
|
benji
|
99c49db848
|
change products to table view
|
2015-04-03 23:56:13 +02:00 |
|
benji
|
bd67675472
|
add #42
|
2015-04-03 22:19:47 +02:00 |
|
benji
|
9f898fa832
|
fix #45
|
2015-04-03 22:01:20 +02:00 |
|
benji
|
f4cc8a9a27
|
Fix #43
|
2015-04-03 21:27:03 +02:00 |
|
benji
|
0bcbc20702
|
change index of products in table view
|
2015-03-28 14:36:07 +01:00 |
|
benji
|
4e651882e9
|
Add seeds for don
|
2015-03-26 12:45:45 +01:00 |
|
benji
|
e4e717084b
|
put back database_authenticatable to users, fix empty avatar form bug
|
2015-03-25 17:49:37 +01:00 |
|
benji
|
efd4dcbb2c
|
Replace multistep registration by default avatar from identicon
|
2015-03-23 11:54:15 +01:00 |
|
benji
|
33ffcfdb9b
|
remove database_authenticatable from user and fix paths
|
2015-03-21 17:58:49 +01:00 |
|
benji
|
a97a64b6db
|
Fix user_avatar url
|
2015-03-21 13:00:24 +01:00 |
|
benji
|
6cbf3df70e
|
No root path when session present
|
2015-03-20 04:54:44 +01:00 |
|
benji
|
67285d8107
|
Add logout button for sessions
|
2015-03-20 04:20:39 +01:00 |
|
benji
|
3ecb2b53d8
|
Add user avatar after user creation
|
2015-03-20 03:57:00 +01:00 |
|
benji
|
7a5b1f20dd
|
tests and travis succeeding
|
2015-03-20 02:33:37 +01:00 |
|
benji
|
6ca2ecebc2
|
Change devise to handle oauth
|
2015-03-20 02:21:56 +01:00 |
|
benji
|
eaa076b508
|
Add oauth
|
2015-03-19 22:37:16 +01:00 |
|
benji
|
bbf6adef38
|
remove text field for search
|
2015-03-19 18:46:41 +01:00 |
|
benji
|
46fd14a0a5
|
tests working
|
2015-03-19 18:04:58 +01:00 |
|
benji
|
a4245c1331
|
Change users to table, fix seeds and remove name and lastname from users
|
2015-03-19 17:38:59 +01:00 |
|
benji
|
6ec27acaf8
|
Refactor dagschotel and make test succeed again
|
2015-03-19 16:22:55 +01:00 |
|
benji
|
191517bda7
|
Lot of styles, and some other stuff
|
2015-03-19 14:59:37 +01:00 |
|
benji
|
0c06c4bedb
|
Change some css and refactor some controller actions
|
2015-03-12 13:25:11 +01:00 |
|
benji
|
3a11861bb0
|
Fix html validator on numberfield
|
2015-03-10 12:14:54 +01:00 |
|
benji
|
01c777baa1
|
Do some extra shit
|
2015-03-10 11:37:48 +01:00 |
|
benji
|
35fc8ecc77
|
Add test for placing order
|
2015-03-09 13:17:41 +01:00 |
|
benji
|
ec597ff1aa
|
Merge branch 'master' of https://github.com/ZeusWPI/Tab
|
2015-03-05 10:17:04 +01:00 |
|
benji
|
c99fc4e492
|
Remove complexity from formbuilder
|
2015-03-05 10:16:58 +01:00 |
|
benji
|
bb36147721
|
Merge pull request #27 from ZeusWPI/test_coverage
Test coverage
|
2015-03-04 20:17:08 +01:00 |
|
benji
|
ea93a4c456
|
Remove ugly constraint
|
2015-03-03 20:11:50 +01:00 |
|
Tleilaxu
|
72cfaadfe3
|
Fixed pixel
|
2015-03-03 19:45:13 +01:00 |
|
benji
|
0bca2c8c23
|
gitignore
|
2015-03-03 16:40:06 +01:00 |
|
benji
|
7d367a154d
|
Only show button on own user page
|
2015-03-02 16:11:44 +01:00 |
|
benji
|
b8b89aa779
|
Add order button on user profile page
|
2015-03-02 16:10:54 +01:00 |
|
benji
|
35876715f6
|
Add contextmenu for keyboard
|
2015-02-20 15:05:11 +01:00 |
|
benji
|
cec6a43ca1
|
Extra css on start page
|
2015-02-20 13:34:48 +01:00 |
|
benji
|
1c6be64e5c
|
Merge branch 'master' of https://github.com/ZeusWPI/Tab
|
2015-02-20 09:21:24 +01:00 |
|
benji
|
82be0ceca4
|
Add more users on overview screen
|
2015-02-20 09:21:18 +01:00 |
|
benji
|
c2d5db70df
|
Merge pull request #25 from ZeusWPI/21/buttons
21/buttons
|
2015-02-19 18:14:35 +01:00 |
|