Joey Lai
|
64ea5d3f68
|
Functions with validating
|
2017-01-19 15:55:28 +01:00 |
|
K. Nobel
|
f535bb10ca
|
added .htaccess
|
2017-01-19 15:50:57 +01:00 |
|
Lars van Hijfte
|
64bf448808
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !70
|
2017-01-19 14:56:41 +01:00 |
|
Lars van Hijfte
|
f5fa36c09c
|
added 404 image
|
2017-01-19 14:55:58 +01:00 |
|
Lars van Hijfte
|
1be1f393ff
|
Merge branch 'master' into lars-chat
|
2017-01-19 14:54:42 +01:00 |
|
Lars van Hijfte
|
a71cb8adb6
|
Fixed some extra things
|
2017-01-19 14:53:12 +01:00 |
|
Lars van Hijfte
|
cd1a2855de
|
Merge branch 'marijn-settings' into 'master'
Marijn settings
See merge request !69
|
2017-01-19 13:56:39 +01:00 |
|
Marijn Jansen
|
dd0c9b35e9
|
No autologin
|
2017-01-19 13:53:49 +01:00 |
|
Marijn Jansen
|
d27538a164
|
Email change implemented!
|
2017-01-19 13:44:47 +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 |
|
Hendrik
|
4c9223cba2
|
add user and group batch change
|
2017-01-19 12:57:10 +01:00 |
|
K. Nobel
|
84719529bb
|
Fixed queries and profile page.
|
2017-01-19 12:01:39 +01:00 |
|
Lars van Hijfte
|
2bdcca3ad9
|
Merge branch 'lars-chat' into 'master'
Made $db global
See merge request !67
|
2017-01-19 11:58:39 +01:00 |
|
Lars van Hijfte
|
186cdf1445
|
Made $db global
|
2017-01-19 11:57:54 +01:00 |
|
K. Nobel
|
b37d06e2cc
|
Updated queries
|
2017-01-19 11:55:23 +01:00 |
|
Lars van Hijfte
|
54b1b0dcc0
|
Merge branch 'lars-chat' into 'master'
Fixed chat
See merge request !66
|
2017-01-19 11:17:02 +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
|
c4d78e54bc
|
fixed form with get, fix accompanying css
|
2017-01-19 11:08:45 +01:00 |
|
Marijn Jansen
|
ff19b5e1b9
|
Settings messages now uses a Class (:
|
2017-01-19 11:01:29 +01:00 |
|
Marijn Jansen
|
08e0447d4c
|
Ignore .idea folder
|
2017-01-19 11:00:55 +01:00 |
|
Marijn Jansen
|
5f7b934d2b
|
Merge branch 'marijn-header' into 'master'
Session Start doubble fixes
See merge request !65
|
2017-01-18 16:42:13 +01:00 |
|
Marijn Jansen
|
1fb6c90fa6
|
Session Start doubble fixes
|
2017-01-18 16:41:45 +01:00 |
|
Marijn Jansen
|
f5a6b401a8
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !62
|
2017-01-18 16:23:36 +01:00 |
|
Marijn Jansen
|
4d20e32ac7
|
Merge branch 'marijn-header' into 'master'
Added personal Header
See merge request !64
|
2017-01-18 16:23:22 +01:00 |
|
Lars van Hijfte
|
28061671d8
|
Merge branch 'lars-chat' into 'master'
added this file because it is needed
See merge request !63
|
2017-01-18 16:22:39 +01:00 |
|
Kevin Nobel
|
99bffc6f47
|
Merge branch 'master' into 'kevin-prototype'
# Conflicts:
# website/queries/friendship.php
# website/queries/user.php
|
2017-01-18 16:22:29 +01:00 |
|
Marijn Jansen
|
e4ec666e03
|
Added personal Header
|
2017-01-18 16:22:27 +01:00 |
|
Lars van Hijfte
|
380b256d29
|
added this file because it is needed
|
2017-01-18 16:20:33 +01:00 |
|
K. Nobel
|
880db2d325
|
Merge branch 'master' into kevin-prototype
|
2017-01-18 16:20:15 +01:00 |
|
Lars van Hijfte
|
fddeba821d
|
Merge branch 'lars-chat' into 'master'
fixed menu more friends bug
See merge request !61
|
2017-01-18 16:13:36 +01:00 |
|
Lars van Hijfte
|
d06ad5a44d
|
fixed menu more friends bug
|
2017-01-18 16:12:38 +01:00 |
|
Marijn Jansen
|
7390898721
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !60
|
2017-01-18 16:08:49 +01:00 |
|
K. Nobel
|
3ee5488a88
|
Improved profile page, profile now takes data from the DB!
|
2017-01-18 16:02:11 +01:00 |
|
Hendrik
|
38e5b28ff5
|
Merge branch 'master' into hendrik-testing
|
2017-01-18 16:02:02 +01:00 |
|
K. Nobel
|
e86a6a6d6f
|
Changed queries include
|
2017-01-18 16:01:26 +01:00 |
|
Hendrik
|
e7e3ae9c8b
|
add changing single group status
|
2017-01-18 15:57:39 +01:00 |
|
K. Nobel
|
62d77fc616
|
Added query needed to get userID
|
2017-01-18 15:56:59 +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 |
|
Marijn Jansen
|
097ccf49b3
|
New Button
|
2017-01-18 15:27:51 +01:00 |
|
Hendrik
|
71dc7bae2c
|
add group search, add user individual actions
|
2017-01-18 15:19:07 +01:00 |
|
Marijn Jansen
|
34c4b11efb
|
"Deze finctie werkt nog niet"
|
2017-01-18 15:18:08 +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
|
0e194ca084
|
Merge branch 'marijn-settings'
|
2017-01-18 15:09:21 +01:00 |
|
Marijn Jansen
|
37ad2e0ea4
|
New placeholder for date
|
2017-01-18 15:08:48 +01:00 |
|