Commit graph

494 commits

Author SHA1 Message Date
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
benji
7bbf93741b Merge conflict 2015-02-12 16:27:30 +01:00
benji
43f44005e2 ago 2015-02-12 16:26:59 +01:00
benji
c99c6c0afa Merge pull request #20 from ZeusWPI/stylez
Stijltjes op producten en al een beetje op profiles
2015-02-12 16:24:42 +01:00
Caroline De Brouwer
1a2b1f45a1 Windoos heeft nutteloze files nodig 2015-02-12 16:23:06 +01:00
Caroline De Brouwer
5b5c454e0e Merge conflict 2015-02-12 16:19:41 +01:00
Caroline De Brouwer
52b397e250 Stijltjes op producten en al een beetje op profiles 2015-02-12 16:14:11 +01:00
benji
3b1a571b0b Euro helper fix negative numbers, and reverse orders of orders on user#show 2015-02-12 15:31:32 +01:00
benji
b37573a4be Several small fixes 2015-02-12 14:39:58 +01:00
benji
f745de8153 remove pictures required 2015-02-10 13:04:35 +01:00
benji
f37bc6acb0 rails 4.2 2015-02-10 09:00:29 +01:00
benji
835f08b60c Fix order bug 2015-02-10 08:33:51 +01:00
benji
7642e35d5d Add db/seeds and fix two minor bugs 2015-02-10 07:15:25 +01:00
benji
d653c6ca84 Put back file I shouldn't have removed 2015-02-09 17:14:33 +01:00
benji
cf8ec8da6e Some clean up 2015-02-09 17:06:24 +01:00
benji
3676068fd9 Add papertrail and paginate orders on user page 2015-02-09 13:23:38 +01:00
benji
b260d90328 Add formatted form builder 2015-02-09 11:58:43 +01:00