Marijn Jansen
|
34c4b11efb
|
"Deze finctie werkt nog niet"
|
2017-01-18 15:18:08 +01:00 |
|
Marijn Jansen
|
37ad2e0ea4
|
New placeholder for date
|
2017-01-18 15:08:48 +01:00 |
|
Marijn Jansen
|
ab8c12c9d8
|
Merge branch 'master' into 'marijn-settings'
# Conflicts:
# website/queries/settings.php
|
2017-01-18 14:52:32 +01:00 |
|
Marijn Jansen
|
e73fcd420c
|
settings succes mesages
|
2017-01-18 14:51:03 +01:00 |
|
Joey Lai
|
afcd048260
|
Almost finished login/register page
|
2017-01-18 12:35:41 +01:00 |
|
Marijn Jansen
|
dde463df6c
|
Added password change
|
2017-01-18 10:43:54 +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
|
683fec805c
|
Merge branch 'marijn-settings' into 'master'
Settings work with sql, session is hardcoded to 2 glob db
See merge request !53
|
2017-01-17 16:50:19 +01:00 |
|
Marijn Jansen
|
11f2297d5a
|
Setting loadin, settings update, db is now global
|
2017-01-17 16:47:49 +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 |
|
Lars van Hijfte
|
5812eb9b49
|
Added group_page functions for the admin page
|
2017-01-17 14:44:20 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
Joey Lai
|
2ad1b49cfd
|
Added popup
|
2017-01-13 15:52:46 +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 |
|
Joey Lai
|
bd36258548
|
fixed php
|
2017-01-13 15:38:23 +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 |
|
Lars van Hijfte
|
fe11b79380
|
Merge branch 'master' into lars-chat
|
2017-01-13 12:05:17 +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 |
|
Marijn Jansen
|
621fb2868d
|
Merge branch 'lars-search' into 'master'
Lars search
See merge request !36
|
2017-01-13 11:20:20 +01:00 |
|
Lars van Hijfte
|
51b444a186
|
Merge branch 'master' into lars-chat
|
2017-01-13 11:11:44 +01:00 |
|
Lars van Hijfte
|
057275d513
|
Restyled the search page
Split users and groups
added a search button
made some boxes required
|
2017-01-13 11:09:09 +01:00 |
|
Marijn Jansen
|
83de4e4f8a
|
fixed Add friend picture on profile page
|
2017-01-13 10:57:06 +01:00 |
|
Marijn Jansen
|
661c3c3bce
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !32
|
2017-01-13 10:53:26 +01:00 |
|
Marijn Jansen
|
7f97d7d35a
|
Merge branch 'marijn-settings' into 'master'
Settings
See merge request !33
|
2017-01-13 10:53:09 +01:00 |
|
Hendrik
|
863fde55e9
|
minor fixes
|
2017-01-13 10:46:09 +01:00 |
|
Hendrik
|
9c73da34fe
|
Merge branch 'master' into hendrik-testing
|
2017-01-13 10:24:16 +01:00 |
|
Hendrik
|
89df0aba52
|
readied for merge
|
2017-01-13 10:20:34 +01:00 |
|
Hendrik
|
d14688295f
|
add title, slight css modification
|
2017-01-12 15:55:25 +01:00 |
|
Marijn Jansen
|
984800fd0c
|
End of day.
|
2017-01-12 15:52:14 +01:00 |
|
Lars van Hijfte
|
bf640b2690
|
Merge branch 'master' into lars-search
|
2017-01-12 15:42:46 +01:00 |
|
Lars van Hijfte
|
d2ab86c0a2
|
Prepared for uniform css inputs
|
2017-01-12 15:41:46 +01:00 |
|
Marijn Jansen
|
489d330d47
|
Merge branch 'master' into marijn-settings
|
2017-01-12 15:21:08 +01:00 |
|
Marijn Jansen
|
d900edfcda
|
Updated buttons
|
2017-01-12 15:20:47 +01:00 |
|
Marijn Jansen
|
c15643128a
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !26
|
2017-01-12 15:02:51 +01:00 |
|
Lars van Hijfte
|
b95aa49c32
|
Styled chat page
Change the chat tap so it has the same style as the rest of the page
|
2017-01-12 14:59:29 +01:00 |
|
Marijn Jansen
|
2bc11a87e4
|
Added Email settings
|
2017-01-12 14:49:11 +01:00 |
|
Lars van Hijfte
|
fd171d01f3
|
Merge branch 'master' into lars-search
|
2017-01-12 14:37:01 +01:00 |
|