Commit graph

134 commits

Author SHA1 Message Date
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
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
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
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
c642bf69c9 Remove footer for koelkast 2015-02-19 17:25:55 +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
Tleilaxu
df87f5f4e6 Used bootstrap button size classes 2015-02-19 15:30:13 +01:00
benji
78a0ae15bf re-add pictures 2015-02-17 15:35:15 +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
b37573a4be Several small fixes 2015-02-12 14:39:58 +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
benji
39e96305b6 Add stock form 2015-02-08 10:11:23 +01:00
benji
ca3045fbbf Add undo button for quickpay/dagschotel 2015-02-04 19:03:50 +01:00
benji
4b05623a96 fix price bug for products 2015-02-04 17:05:02 +01:00
benji
6b05067dc6 tis kapot 2015-02-04 16:10:47 +01:00
benji
9e72274629 add stock to products and some clean up 2015-01-15 00:39:34 +01:00
benji
49dc9201b6 Some changes to user profile page and other fixes 2015-01-13 13:06:42 +01:00
benji
aa97b51ca6 Small changes to user show page, remove lots of sql queries 2015-01-09 19:15:48 +01:00
benji
f595b0dba9 Add controller action to define root based on user role 2015-01-06 20:33:11 +01:00
Benjamin Cousaert
26f66f8bff Add cancancan to admins 2014-12-15 19:43:02 +01:00
Benjamin Cousaert
ef5abb6324 Merge branch 'feature/17/products-tabs' 2014-12-15 19:08:54 +01:00