Lars van Hijfte
|
50cec9beed
|
Added things to the menu.
Extra item for a random friend,
If you have no groups, it has a message.
|
2017-01-20 12:25:18 +01:00 |
|
Lars van Hijfte
|
e71054c654
|
Merge branch 'joey-testing' into 'master'
Fixed login/register and added logout.php
See merge request !68
|
2017-01-19 13:37:56 +01:00 |
|
Joey Lai
|
049dee6381
|
Fixed login/register and added logout.php
|
2017-01-19 13:11:24 +01:00 |
|
Lars van Hijfte
|
b71cf36798
|
Fixed chat
It now has a userID again,
displays which user you are chatting withhover over user changes different background
|
2017-01-19 11:08:55 +01:00 |
|
Hendrik
|
38e5b28ff5
|
Merge branch 'master' into hendrik-testing
|
2017-01-18 16:02:02 +01:00 |
|
Lars van Hijfte
|
32ff271b5e
|
Merge branch 'lars-chat' into 'master'
Lars chat
See merge request !59
|
2017-01-18 15:55:41 +01:00 |
|
Marijn Jansen
|
b95705df29
|
Merge branch 'joey-testing' into 'master'
Fixed login link
See merge request !58
|
2017-01-18 15:54:36 +01:00 |
|
Lars van Hijfte
|
df9f782809
|
Friends in the menu now redirects to the users profile.
|
2017-01-18 15:54:13 +01:00 |
|
Joey Lai
|
455705e286
|
Fixed login link
|
2017-01-18 15:53:10 +01:00 |
|
Lars van Hijfte
|
7469a10f13
|
Fixed Chat!
|
2017-01-18 15:37:49 +01:00 |
|
Hendrik
|
71dc7bae2c
|
add group search, add user individual actions
|
2017-01-18 15:19:07 +01:00 |
|
Lars van Hijfte
|
cd954a8c4c
|
Merge branch 'master' into lars-chat
|
2017-01-18 15:10:17 +01:00 |
|
Lars van Hijfte
|
95fd3c0040
|
chat is done?
|
2017-01-18 15:09:52 +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 |
|
Hendrik
|
b5ceb1b5e0
|
add pagetype selector, add search filter
|
2017-01-18 14:20:32 +01:00 |
|
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 |
|