K. Nobel
|
95570c49d4
|
Merge branch 'master' into kevin-prototype
|
2017-01-25 15:08:34 +01:00 |
|
K. Nobel
|
9ff256429d
|
Changed friendship buttons. We now use AJAX, changed button style and added FA icons.
|
2017-01-25 15:06:37 +01:00 |
|
Marijn Jansen
|
93ddefa42f
|
Merge branch 'joey-testing' into 'master'
redesigned code
See merge request !115
|
2017-01-25 11:20:15 +01:00 |
|
Joey Lai
|
981e34c950
|
redesigned code
|
2017-01-25 11:19:01 +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 |
|
K. Nobel
|
ec56dbe578
|
Merge branch 'master' into kevin-prototype
|
2017-01-24 17:00:10 +01:00 |
|
K. Nobel
|
de03d8799a
|
Fixed placeholder for new post.
|
2017-01-24 16:58:51 +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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
Hendrik
|
2ff23ae668
|
Merge branch 'master' into hendrik-search
|
2017-01-23 16:06:03 +01:00 |
|
Hendrik
|
e6f5044a9a
|
add page functionality
|
2017-01-23 16:04:59 +01:00 |
|
Marijn Jansen
|
449b500636
|
Merge branch 'joey-testing' into 'master'
Fixed css and confirmation for logged in already
See merge request !96
|
2017-01-23 13:26:10 +01:00 |
|
Joey Lai
|
21ff896d65
|
Fixed css and confirmation for logged in already
|
2017-01-23 13:24:13 +01:00 |
|
Lars van Hijfte
|
1ec8de71f0
|
Changed menu view
|
2017-01-23 13:17:01 +01:00 |
|
Lars van Hijfte
|
93b6835ea4
|
Changed style and added friendrequests
|
2017-01-23 11:33:27 +01:00 |
|
Joey Lai
|
95aaba7e7e
|
Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing
|
2017-01-20 16:25:38 +01:00 |
|
Joey Lai
|
e33210ce5e
|
Merge branch 'master' into joey-testing
|
2017-01-20 16:24:59 +01:00 |
|
Lars van Hijfte
|
3ae00f52bf
|
Merge branch 'master' into lars-algemeen
|
2017-01-20 16:21:54 +01:00 |
|
Lars van Hijfte
|
a08e5a346a
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !89
|
2017-01-20 16:20:29 +01:00 |
|
Joey Lai
|
e456591db6
|
Merge branch 'master' into joey-testing
|
2017-01-20 16:18:57 +01:00 |
|
Hendrik
|
581f6e18f0
|
Merge branch 'master' into hendrik-search
|
2017-01-20 16:18:53 +01:00 |
|
K. Nobel
|
a87b5e709b
|
Merge branch 'master' into kevin-prototype
|
2017-01-20 16:18:36 +01:00 |
|
K. Nobel
|
18185020c3
|
Added improvements to profile page.
|
2017-01-20 16:18:12 +01:00 |
|
Hendrik
|
9152ae4f75
|
add searching users, searching groups, remembering search options
|
2017-01-20 16:18:09 +01:00 |
|
Lars van Hijfte
|
173ef3e50c
|
Added a notification bar
|
2017-01-20 16:17:56 +01:00 |
|
Joey Lai
|
6ff70440e6
|
history back -> profile.php
|
2017-01-20 16:14:32 +01:00 |
|
Joey Lai
|
82fc1e5266
|
Merge branch 'master' into 'joey-testing'
# Conflicts:
# website/views/login_head.php
|
2017-01-20 16:06:16 +01:00 |
|
Joey Lai
|
e17a55e82d
|
Fixed redirect to profile page after going back 1 page
|
2017-01-20 16:01:08 +01:00 |
|
Marijn Jansen
|
7e3648d36c
|
Merge branch 'marijn-settings'
|
2017-01-20 15:42:00 +01:00 |
|