Commit graph

84 commits

Author SHA1 Message Date
tl3ilaxu
fab824fad3 Merge branch 'master' of https://github.com/ZeusWPI/Tap into interface 2016-02-11 16:27:20 +01:00
benji
3a602b55dc Use bootstrap switch for the private/public button 2016-02-09 00:12:54 +01:00
Felix Van der Jeugt
6dc80bbaeb Merge branch 'master' into fix/side-bar-layout 2016-02-05 19:52:37 +01:00
Felix Van der Jeugt
63539e01f7 put settings in side bar 2016-02-04 23:28:13 +01:00
benji
d723c46c2a Little design fix 2016-02-04 19:03:02 +01:00
tl3ilaxu
da166cf7eb Make code not horrible 2016-02-04 14:24:02 +01:00
benji
e91e3213d7 Prepare some things for production phase 2015-12-31 17:30:57 +01:00
benji
5b922ceab5 Add way to see changes in quickpay 2015-10-28 16:57:11 +01:00
benji
bd27ac3cca Add styling to stockentry 2015-09-26 12:13:43 +02:00
benji
19dec68c59 add workflow for adding products/stock through barcodes 2015-09-25 14:24:32 +02:00
benji
046b2c382c Merge branch 'master' into barcode 2015-09-21 19:07:03 +02:00
benji
571fce83fd Add warning for testfase 2015-09-21 12:25:27 +02:00
benji
6403835872 Use barcode to create new order 2015-09-20 21:21:18 +02:00
benji
c0fe8833fa Remove unpermitted parameters and javascript error in orders 2015-09-02 14:35:29 +02:00
benji
0862b275fc Create actionmodel stock/stockentry and change form 2015-09-01 23:13:20 +02:00
benji
43190104ec Add user avatar to user#show 2015-09-01 16:51:21 +02:00
benji
7014201510 Change some styling 2015-09-01 14:52:20 +02:00
benji
b5017bff9a Remove debt from tab and refactor some code 2015-08-31 14:33:15 +02:00
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