Commit Graph

115 Commits

Author SHA1 Message Date
Joey Lai afcd048260 Almost finished login/register page 2017-01-18 12:35:41 +01:00
Marijn Jansen 51378bf386 Merge branch 'joey-testing' into 'master'
Splitted login and register pages

See merge request !54
2017-01-18 09:21:10 +01:00
Joey Lai 9b4743d25a Splitted login and register pages 2017-01-18 09:19:38 +01:00
Marijn Jansen 11f2297d5a Setting loadin, settings update, db is now global 2017-01-17 16:47:49 +01:00
Hendrik 7c6a3cc252 Merge branch 'master' into hendrik-testing 2017-01-17 12:56:09 +01:00
Hendrik f00b3d9a23 add page selector in adminpanel 2017-01-17 12:55:15 +01:00
Hendrik b60d118ac6 added form complete on search in adminpanel 2017-01-17 12:40:41 +01:00
Marijn Jansen ffa37f49ff Merge branch 'kevin-prototype' into 'master'
Added masonry grid to profile and group pages.

See merge request !50
2017-01-17 12:27:05 +01:00
K. Nobel 0ef81a376a Added masonry grid to profile and group pages. 2017-01-17 12:25:09 +01:00
Hendrik 3a9b851009 Merge branch 'master' into hendrik-testing 2017-01-17 10:58:17 +01:00
Marijn Jansen 88ea5c027c Merge branch 'lars-algemeen' into 'master'
Lars algemeen

See merge request !49
2017-01-16 14:43:33 +01:00
Lars van Hijfte bb0f32ffd9 Made some pages html valid with a validator 2017-01-16 13:10:34 +01:00
Lars van Hijfte 4bc2bcedd1 Fixed bugs
Bug 1: If you clicked "En nog 2 anderen..." in the menu it send you tot he top of the page
Bug 2: Span didnt close in the footer
2017-01-13 15:47:59 +01:00
Marijn Jansen 60fabf30e4 Merge branch 'joey-testing' 2017-01-13 15:44:00 +01:00
Marijn Jansen 1cffad77d6 rename html folder to public 2017-01-13 14:44:45 +01:00