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 |
|
Marijn Jansen
|
587d0e6ac3
|
fixed crosssitescripting on settings pagw
|
2017-01-20 15:41:13 +01:00 |
|
Hendrik
|
b1348a3d0e
|
Merge branch 'master' into hendrik-testing
|
2017-01-20 15:39:44 +01:00 |
|
Marijn Jansen
|
b1e01699eb
|
Merge branch 'master' into marijn-settings
|
2017-01-20 15:36:10 +01:00 |
|
Marijn Jansen
|
064fe93ba7
|
Merge branch 'joey-testing' into 'master'
Joey testing
See merge request !86
|
2017-01-20 15:35:15 +01:00 |
|
K. Nobel
|
e7d63c2f57
|
Changed how name is displayed on profile page.
|
2017-01-20 15:34:01 +01:00 |
|
Joey Lai
|
15a3640eea
|
Added arrow button for going to login.php
|
2017-01-20 15:25:37 +01:00 |
|
K. Nobel
|
e547712b2a
|
Changed links to absolute path.
|
2017-01-20 15:02:05 +01:00 |
|
Marijn Jansen
|
59d4740ad5
|
Alpha 0.0.1 profile picture upload shizzle!
|
2017-01-20 14:55:47 +01:00 |
|
K. Nobel
|
ca28724274
|
Fixed script tags and @import. Has to be absolute path in order to work with the .htaccess file.
|
2017-01-20 14:48:00 +01:00 |
|
Hendrik
|
4218860936
|
remove testinput
|
2017-01-20 14:43:04 +01:00 |
|
Lars van Hijfte
|
c9bdbcf3b5
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !81
|
2017-01-20 14:36:58 +01:00 |
|
K. Nobel
|
0e5f7dc9fb
|
Fixed no friends text and no groups text.
|
2017-01-20 14:10:32 +01:00 |
|
K. Nobel
|
f9c55323ad
|
Made friends and groups clickable.
|
2017-01-20 14:09:04 +01:00 |
|
Hendrik
|
14d96e89ad
|
Merge branch 'master' into hendrik-testing
|
2017-01-20 13:15:06 +01:00 |
|
Hendrik
|
6418b2b679
|
move js to /js
|
2017-01-20 13:14:28 +01:00 |
|
Hendrik
|
0f02859124
|
fix queries for global and prepared
|
2017-01-20 12:58:34 +01:00 |
|