 Marijn Jansen
|
022620a375
|
Merge branch 'marijn-emailconfirm' into 'master'
Email confirm (:
See merge request !113
|
2017-01-25 11:17:31 +01:00 |
|
|
Marijn Jansen
|
28f31d749b
|
Email confirm (:
|
2017-01-25 11:16:53 +01:00 |
|
|
Marijn Jansen
|
17600adbf1
|
Merge branch 'marijn-emailconfirm' into 'master'
Added emailconfirm.php
See merge request !112
|
2017-01-25 09:33:36 +01:00 |
|
|
Marijn Jansen
|
f7da87596a
|
Added emailconfirm.php
|
2017-01-25 09:30:05 +01:00 |
|
 Lars van Hijfte
|
7efd062f98
|
Merge branch 'lars' into 'master'
Lars
See merge request !111
|
2017-01-24 17:32:43 +01:00 |
|
|
Lars van Hijfte
|
fddbd0ca87
|
Merge branch 'master' into lars
|
2017-01-24 17:32:13 +01:00 |
|
|
Lars van Hijfte
|
37d83169c6
|
In notification bar accept or deny
|
2017-01-24 17:31:39 +01:00 |
|
|
Lars van Hijfte
|
d19038cb1c
|
Merge branch 'lars' into 'master'
Lars
See merge request !110
|
2017-01-24 17:11:09 +01:00 |
|
|
Lars van Hijfte
|
12ed710369
|
Fixed API
|
2017-01-24 17:10:12 +01:00 |
|
|
Lars van Hijfte
|
3de4e1387f
|
Merge branch 'master' into lars
|
2017-01-24 17:07:07 +01:00 |
|
|
Lars van Hijfte
|
7bf8a16cf0
|
Dingen door elkaar
|
2017-01-24 17:06:39 +01:00 |
|
|
Lars van Hijfte
|
cbfce6f698
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !109
|
2017-01-24 17:05:51 +01:00 |
|
 K. Nobel
|
7144d700e4
|
Removed debug echo from profile page.
|
2017-01-24 17:02:49 +01:00 |
|
|
K. Nobel
|
ec56dbe578
|
Merge branch 'master' into kevin-prototype
|
2017-01-24 17:00:10 +01:00 |
|
|
K. Nobel
|
b8f662f825
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB
|
2017-01-24 16:59:14 +01:00 |
|
|
K. Nobel
|
de03d8799a
|
Fixed placeholder for new post.
|
2017-01-24 16:58:51 +01:00 |
|
|
K. Nobel
|
70957015ce
|
Fixed links to friends on profile page.
|
2017-01-24 16:51:34 +01:00 |
|
|
K. Nobel
|
f9f1e2bf17
|
Changed select posts query.
|
2017-01-24 16:40:30 +01:00 |
|
|
Lars van Hijfte
|
4b6fe1d202
|
Merge branch 'lars' into 'master'
Fixed bugs
See merge request !108
|
2017-01-24 15:17:19 +01:00 |
|
|
Lars van Hijfte
|
fd055e8355
|
Fixed bugs
|
2017-01-24 15:16:15 +01:00 |
|
|
Lars van Hijfte
|
0b705df09a
|
Merge branch 'joey-testing' into 'master'
Redesigned register functions
See merge request !107
|
2017-01-24 15:12:01 +01:00 |
|
|
Lars van Hijfte
|
c48227e258
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !106
|
2017-01-24 15:11:29 +01:00 |
|
 Joey Lai
|
7a19fea5f9
|
Redesigned register functions
|
2017-01-24 15:08:24 +01:00 |
|
|
K. Nobel
|
887c773463
|
Merge branch 'master' into kevin-prototype
|
2017-01-24 15:03:24 +01:00 |
|
|
K. Nobel
|
4967ab6ea0
|
Made some small changes for Lars.
|
2017-01-24 15:01:55 +01:00 |
|
|
Marijn Jansen
|
6314494177
|
Merge branch 'marijn-settings' into 'master'
Max file size for gifs.
See merge request !105
|
2017-01-24 14:49:02 +01:00 |
|
|
Marijn Jansen
|
86b97cc186
|
Max file size for gifs.
|
2017-01-24 14:47:38 +01:00 |
|
|
K. Nobel
|
4b3d7967fb
|
Merge branch 'master' into kevin-prototype
|
2017-01-24 14:47:05 +01:00 |
|
|
K. Nobel
|
d44ddf2793
|
Added functionality for add friend buttons.
|
2017-01-24 14:36:27 +01:00 |
|
|
Lars van Hijfte
|
9e89307bf9
|
Merge branch 'lars-chat' into 'master'
Fixed name length
See merge request !104
|
2017-01-24 14:33:11 +01:00 |
|
|
Lars van Hijfte
|
dc11830c80
|
Fixed name length
|
2017-01-24 14:32:43 +01:00 |
|
|
Lars van Hijfte
|
8403ff0a17
|
Merge branch 'lars-chat' into 'master'
Lars chat
See merge request !103
|
2017-01-24 14:30:09 +01:00 |
|
|
Lars van Hijfte
|
dbb23922d8
|
Merge branch 'master' into lars-chat
|
2017-01-24 14:26:48 +01:00 |
|
|
Lars van Hijfte
|
a88483ae47
|
FINALLY FIXED THE UNREAD CHAT MESSAGES!
|
2017-01-24 14:26:15 +01:00 |
|
|
Marijn Jansen
|
ee6b55bd91
|
Merge branch 'marijn-settings' into 'master'
Marijn settings
See merge request !102
|
2017-01-24 14:02:34 +01:00 |
|
|
Marijn Jansen
|
08c3d73377
|
Merge branch 'master' into 'marijn-settings'
# Conflicts:
# website/views/menu.php
|
2017-01-24 14:02:19 +01:00 |
|
|
Marijn Jansen
|
c1359920e0
|
New Standard avatar
|
2017-01-24 14:00:55 +01:00 |
|
|
Marijn Jansen
|
4579b98eb8
|
Checks and resize on profile pictures :)
|
2017-01-24 13:54:08 +01:00 |
|
|
Marijn Jansen
|
62a2b32c95
|
Changed Alerts to Exceptions.
|
2017-01-24 12:12:48 +01:00 |
|
|
Lars van Hijfte
|
96003b1bdc
|
Merge branch 'hendrik-search' into 'master'
Hendrik search
See merge request !100
|
2017-01-24 10:21:17 +01:00 |
|
|
Lars van Hijfte
|
c4a0367fef
|
Merge branch 'lars-chat' into 'master'
Lars chat
See merge request !101
|
2017-01-24 10:19:52 +01:00 |
|
|
Lars van Hijfte
|
c4e4508b53
|
Changed admin layout and fixed for enums
|
2017-01-24 10:19:13 +01:00 |
|
|
Lars van Hijfte
|
d7e84ee138
|
Merge branch 'lars-algemeen' into lars-chat
|
2017-01-23 17:22:38 +01:00 |
|
|
Lars van Hijfte
|
7eec0cfa2a
|
Begin chat change
|
2017-01-23 17:22:22 +01:00 |
|
|
Lars van Hijfte
|
348b66c08c
|
Merge branch 'master' into lars-chat
|
2017-01-23 17:08:43 +01:00 |
|
|
Lars van Hijfte
|
37aa073fc1
|
End of day commit
|
2017-01-23 16:45:16 +01:00 |
|
|
Lars van Hijfte
|
b6d166bdea
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !98
|
2017-01-23 16:27:45 +01:00 |
|
|
Lars van Hijfte
|
8c4c4a59fd
|
Merge branch 'master' into lars-algemeen
|
2017-01-23 16:25:18 +01:00 |
|
|
Lars van Hijfte
|
58ce5f1e75
|
Menu, netjes, notification
|
2017-01-23 16:24:48 +01:00 |
|
|
Marijn Jansen
|
80f7c24641
|
Merge branch 'marijn-settings' into 'master'
Profile picrure old deletion (:
See merge request !97
|
2017-01-23 16:24:28 +01:00 |
|