Commit graph

460 commits

Author SHA1 Message Date
benji
a0a5785115 Merge pull request #28 from ZeusWPI/keep_cancelled_orders
Do some extra shit
2015-03-10 11:45:43 +01:00
benji
01c777baa1 Do some extra shit 2015-03-10 11:37:48 +01:00
benji
a5dbe99d27 Add tests for ordering and quickpay 2015-03-10 08:52:16 +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
88c780b14e Final test 2015-03-04 19:59:07 +01:00
benji
41e8c113ed Stock validator test 2015-03-04 18:18:47 +01:00
benji
41140e0784 Add test for g_order_items in order 2015-03-04 17:14:44 +01:00
benji
51ba90d70a Add test for stock changes 2015-03-04 10:25:03 +01:00
benji
5857d37527 Merge pull request #26 from ZeusWPI/21/buttons
Fixed pixel
2015-03-04 09:59:32 +01:00
benji
ee0239447e Add simplecov config to exclude config files from coveralls 2015-03-04 09:50:55 +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
d72f691442 Finish user tests 2015-03-03 18:16:05 +01:00
benji
95987e48fe Add tests for orders and products 2015-03-03 17:41:53 +01:00
Donvittorio
df2d56eb3a Updated Coveralls badge 2015-03-03 16:56:33 +01:00
benji
d79474b18c Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-03-03 16:40:17 +01:00
benji
0bca2c8c23 gitignore 2015-03-03 16:40:06 +01:00
Donvittorio
110c5bab87 whitespace in shizzle 2015-03-03 16:37:03 +01:00
Donvittorio
cb6054168d Updated README.md with more cool badges 2015-03-03 16:36:35 +01:00
benji
9d17168fe0 Travis config 2015-03-03 16:26:14 +01:00
benji
15a4396282 notifications to right channel on slack 2015-03-03 16:24:33 +01:00
benji
476750a556 Add travis config file 2015-03-03 16:21:16 +01:00
benji
8d65e10105 Add travis 2015-03-03 16:19:56 +01:00
benji
fd679dc78b Add coveralls 2015-03-03 16:03:59 +01:00
benji
f844625b55 Add first test - yeah 2015-03-03 15:56:23 +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
Tleilaxu
b9e5c63a9a Merge branch 'master' of github.com:ZeusWPI/Tab into 21/buttons
Conflicts:
	app/assets/stylesheets/orders.css.scss
2015-02-19 18:13:35 +01:00
benji
d8cf9e443e Clarify schuld in orders/new 2015-02-19 18:12:57 +01:00
Tleilaxu
0b35bb1f06 Fixed css 2015-02-19 18:08:50 +01:00
benji
7c1dee80ee fix some css 2015-02-19 18:07:34 +01:00
benji
40336da8c6 Add some extra test users 2015-02-19 17:40:29 +01:00
benji
c642bf69c9 Remove footer for koelkast 2015-02-19 17:25:55 +01:00
benji
f2626ef16f Merge pull request #24 from ZeusWPI/21/buttons
21/buttons
2015-02-19 17:18:51 +01:00
Tleilaxu
b455d17231 Merge branch 'master' of github.com:ZeusWPI/Tab into 21/buttons 2015-02-19 17:13:46 +01:00
Tleilaxu
b6283e8c32 Fixed pixel, added style to logo 2015-02-19 17:04:01 +01:00
benji
66a8dc4f68 Merge pull request #23 from ZeusWPI/profile_page_style
Styling on profile pages
2015-02-19 15:44:49 +01:00
Caroline De Brouwer
f9e2c7e104 Styling on profile pages 2015-02-19 15:41:12 +01:00
benji
e037594d0e Merge pull request #22 from ZeusWPI/21/buttons
Bigger order buttons on mobile devices
2015-02-19 15:34:31 +01:00
Tleilaxu
df87f5f4e6 Used bootstrap button size classes 2015-02-19 15:30:13 +01:00
Tleilaxu
08c37fd80b Bigger order buttons on mobile devices 2015-02-18 21:16:27 +01:00
benji
78a0ae15bf re-add pictures 2015-02-17 15:35:15 +01:00