Commit graph

188 commits

Author SHA1 Message Date
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
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
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
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