Commit Graph

17 Commits

Author SHA1 Message Date
Lars van Hijfte
02349dbe28 Changed description 2017-02-03 10:30:44 +01:00
Lars van Hijfte
8a6acbc52a Merge branch 'lars' into 'master'
Lars

See merge request !187
2017-02-02 14:27:49 +01:00
Lars van Hijfte
6fc2f71517 Added meta data in the login page 2017-02-02 14:27:23 +01:00
Joey Lai
90ac38acdd Fixed restrictions with registering 2017-02-02 10:43:34 +01:00
Joey Lai
cc08ebec3c Modal added for resetting password 2017-01-25 15:47:31 +01:00
Joey Lai
981e34c950 redesigned code 2017-01-25 11:19:01 +01:00
Joey Lai
7a19fea5f9 Redesigned register functions 2017-01-24 15:08:24 +01:00
Joey Lai
21ff896d65 Fixed css and confirmation for logged in already 2017-01-23 13:24:13 +01:00
Joey Lai
95aaba7e7e Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing 2017-01-20 16:25:38 +01:00
Joey Lai
e456591db6 Merge branch 'master' into joey-testing 2017-01-20 16:18:57 +01:00
Joey Lai
6ff70440e6 history back -> profile.php 2017-01-20 16:14:32 +01:00
Joey Lai
82fc1e5266 Merge branch 'master' into 'joey-testing'
# Conflicts:
#   website/views/login_head.php
2017-01-20 16:06:16 +01:00
Joey Lai
e17a55e82d Fixed redirect to profile page after going back 1 page 2017-01-20 16:01:08 +01:00
K. Nobel
e547712b2a Changed links to absolute path. 2017-01-20 15:02:05 +01:00
Joey Lai
049dee6381 Fixed login/register and added logout.php 2017-01-19 13:11:24 +01:00
Joey Lai
9b4743d25a Splitted login and register pages 2017-01-18 09:19:38 +01:00
Joey Lai
bd36258548 fixed php 2017-01-13 15:38:23 +01:00