 Hendrik
|
d1d07ce37d
|
Merge remote-tracking branch 'origin/lars-algemeen' into hendrik-testing
|
2017-01-17 15:15:14 +01:00 |
|
 Marijn Jansen
|
0966b3528e
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !52
|
2017-01-17 15:13:49 +01:00 |
|
|
Hendrik
|
146fc7108b
|
add usersearch query
|
2017-01-17 15:13:32 +01:00 |
|
|
Hendrik
|
877072f9e3
|
add sql usersearch base in adminpanel
|
2017-01-17 15:12:56 +01:00 |
|
 Lars van Hijfte
|
a8fcbecc2e
|
Fixed things
|
2017-01-17 15:02:54 +01:00 |
|
|
Lars van Hijfte
|
5812eb9b49
|
Added group_page functions for the admin page
|
2017-01-17 14:44:20 +01:00 |
|
|
Lars van Hijfte
|
faebda3368
|
Added default profile picture
|
2017-01-17 14:24:08 +01:00 |
|
|
Lars van Hijfte
|
6385324b13
|
The menu now backend supported
It loads the friends and groups of userID 2 by default (only if there is no session userID set
|
2017-01-17 14:16:17 +01:00 |
|
|
Hendrik
|
e3e72b8ef6
|
fixed connect.php location in head
|
2017-01-17 14:02:33 +01:00 |
|
|
Marijn Jansen
|
1edf051dc2
|
Merge branch 'master' into marijn-settings
|
2017-01-17 13:43:41 +01:00 |
|
|
Marijn Jansen
|
be26e89dbf
|
Added profile picture part in settings
|
2017-01-17 13:43:00 +01:00 |
|
 K. Nobel
|
bb637853ef
|
Merge branch 'master' into kevin-prototype
|
2017-01-17 13:12:43 +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 |
|
|
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
|
3901b32e6e
|
Merge branch 'master' into kevin-prototype
|
2017-01-17 12:25:44 +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 |
|
|
Hendrik
|
c6bdf349a8
|
fixed forms for php, user status and page type
|
2017-01-17 10:34:30 +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
|
44e20fba75
|
Merge branch 'marijn-index' into 'master'
Marijn index
See merge request !48
|
2017-01-13 16:11:19 +01:00 |
|
|
Marijn Jansen
|
573bf60344
|
Merge branch 'master' into marijn-index
|
2017-01-13 16:10:33 +01:00 |
|
|
Marijn Jansen
|
019f0f71bb
|
Made an index
|
2017-01-13 16:09:56 +01:00 |
|
|
Marijn Jansen
|
10db23ffee
|
Merge branch 'joey-testing' into 'master'
Added popup
See merge request !47
|
2017-01-13 16:06:09 +01:00 |
|
 Joey Lai
|
2ad1b49cfd
|
Added popup
|
2017-01-13 15:52:46 +01:00 |
|
|
Marijn Jansen
|
7b376f9a48
|
Merge branch 'joey-testing' into 'master'
Fixed login new filetree
See merge request !46
|
2017-01-13 15:48:30 +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 |
|
|
Joey Lai
|
bd36258548
|
fixed php
|
2017-01-13 15:38:23 +01:00 |
|
|
Marijn Jansen
|
16e9423851
|
Merge branch 'marijn-newFileStructure' into 'master'
Marijn new file structure
See merge request !44
|
2017-01-13 14:46:54 +01:00 |
|
|
Marijn Jansen
|
1cffad77d6
|
rename html folder to public
|
2017-01-13 14:44:45 +01:00 |
|
|
Marijn Jansen
|
faf5442528
|
Moves splt private and public files
|
2017-01-13 14:26:38 +01:00 |
|
|
Marijn Jansen
|
120e02f4d1
|
Merge branch 'marijn-css' into 'master'
Item-box from profile.css to main.css
See merge request !43
|
2017-01-13 12:28:01 +01:00 |
|
|
Marijn Jansen
|
5bb7fbf7a9
|
Item-box from profile.css to main.css
|
2017-01-13 12:26:38 +01:00 |
|
|
Marijn Jansen
|
c60ba995a0
|
Merge branch 'marijn-indent' into 'master'
Fixed Indent
See merge request !42
|
2017-01-13 12:15:03 +01:00 |
|
|
Marijn Jansen
|
1db9826de5
|
Fixed Indent
|
2017-01-13 12:14:44 +01:00 |
|
|
Marijn Jansen
|
a49b906217
|
Merge branch 'lars-chat' into 'master'
Lars chat
See merge request !40
|
2017-01-13 12:06:54 +01:00 |
|
|
Lars van Hijfte
|
fe11b79380
|
Merge branch 'master' into lars-chat
|
2017-01-13 12:05:17 +01:00 |
|
|
Marijn Jansen
|
b0e3d43e13
|
Merge branch 'joey-testing' into 'master'
FIXED identation
See merge request !38
|
2017-01-13 12:04:55 +01:00 |
|
|
Marijn Jansen
|
faddbf0939
|
Merge branch 'marijn-csscleanup' into 'master'
Marijn csscleanup
See merge request !39
|
2017-01-13 12:04:36 +01:00 |
|
|
Marijn Jansen
|
9db7c6776c
|
Moved <head>-tag to the page files, not all css files will be loaded for each page.
|
2017-01-13 12:03:46 +01:00 |
|
|
Lars van Hijfte
|
8c1bacf894
|
Styled and rearranged chat-view
|
2017-01-13 12:01:12 +01:00 |
|