Commit graph

66 commits

Author SHA1 Message Date
David Vandorpe 7831520c6f Red border when product is sold out 2015-07-07 22:36:04 +02:00
benji 90e270a03e Avoid long product names of fucking up entire layout 2015-07-01 16:19:36 +02:00
benji f5c970af53 Fix css on order_items 2015-06-30 23:33:11 +02:00
benji 97fdd2e24c Change orderitems from text inputs to number fields 2015-04-04 04:13:30 +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 9f898fa832 fix #45 2015-04-03 22:01:20 +02:00
benji 0bcbc20702 change index of products in table view 2015-03-28 14:36:07 +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 3ecb2b53d8 Add user avatar after user creation 2015-03-20 03:57:00 +01:00
benji eaa076b508 Add oauth 2015-03-19 22:37:16 +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
Tleilaxu 72cfaadfe3 Fixed pixel 2015-03-03 19:45:13 +01:00
benji b8b89aa779 Add order button on user profile page 2015-03-02 16:10:54 +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
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
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
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
Caroline De Brouwer 52b397e250 Stijltjes op producten en al een beetje op profiles 2015-02-12 16:14:11 +01:00
benji 7684f54120 Remove redirects for root and put logic in routes 2015-01-09 12:31:14 +01:00
benji f595b0dba9 Add controller action to define root based on user role 2015-01-06 20:33:11 +01:00
ohsab 16cf3770a7 layout lichtjes aangepast 2014-12-12 22:02:58 +01:00
ohsab b5eab1dce1 enkele layout fixes 2014-12-12 12:50:13 +01:00
Benjamin Cousaert cb94f2dbb8 Add schulden csv voor iepoev 2014-12-10 16:17:55 +01:00
ohsab addf41999a layout users monopoly stijl 2014-12-10 05:13:17 +01:00
Tom Naessens 3eeaaf3835 Clean javascript is clean <3 2014-12-10 00:38:48 +01:00
Tom Naessens dc50fdec88 Fix some styles 2014-12-09 23:19:03 +01:00
Tom Naessens 2eee65ccf8 Merge branch 'master' of github.com:ZeusWPI/Tab
Conflicts:
	app/assets/stylesheets/orders.css.scss
2014-12-09 22:50:43 +01:00
Tom Naessens b7a97f4753 Heights heights heights 2014-12-09 22:49:35 +01:00
ohsab 6c51972248 footer layout 2014-12-09 22:36:24 +01:00
Tom Naessens 07966e550d Fix merge conflict code 2014-12-09 21:28:19 +01:00
ohsab 5d2859ae61 Merge branch 'master' of https://github.com/ZeusWPI/Tab
Conflicts:
	app/assets/stylesheets/application.css.scss
2014-12-09 21:26:19 +01:00
ohsab 3ddead7943 layout 2014-12-09 21:25:34 +01:00
Tom Naessens 2d0885b057 Decent title 2014-12-09 21:03:37 +01:00
Tom Naessens 86fc009c3f Merge branch 'master' of github.com:ZeusWPI/Tab
Conflicts:
	app/assets/stylesheets/application.css.scss
2014-12-09 20:45:53 +01:00
Tom Naessens dc6d0b5d21 Fix the whole devise and admins and everythings 2014-12-09 20:34:50 +01:00
ohsab f247e6c5ff dagschotel button added 2014-12-09 20:26:18 +01:00
ohsab 00dcd98a93 overview view mooi gemaakt 2014-12-09 19:44:48 +01:00