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 |
|
Marijn Jansen
|
429fba997f
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !51
|
2017-01-17 12:49:29 +01:00 |
|
Lars van Hijfte
|
10d3e177ae
|
Begin with the connection between php and mysql.
It has a template that loads all the friends of userID 666.
It uses a connect.php and a friendship.php
|
2017-01-17 12:48:01 +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 |
|
Marijn Jansen
|
6bce05c228
|
New button
|
2017-01-17 12:25:04 +01:00 |
|
Marijn Jansen
|
31d50356de
|
Added "Niet slecht." button.
|
2017-01-17 12:10:36 +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
|
ff2927755d
|
Merge branch 'master' into lars-algemeen
|
2017-01-16 13:11:29 +01:00 |
|
Lars van Hijfte
|
bb0f32ffd9
|
Made some pages html valid with a validator
|
2017-01-16 13:10:34 +01:00 |
|
Marijn Jansen
|
019f0f71bb
|
Made an index
|
2017-01-13 16:09:56 +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
|
96dd0864ee
|
Fixed login new filetree
|
2017-01-13 15:47:35 +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 |
|