Marijn Jansen
|
4ebdd378a6
|
Password change
|
2017-01-25 16:21:17 +01:00 |
|
Lars van Hijfte
|
09dac78eb4
|
Merge branch 'joey-testing' into 'master'
Joey testing
See merge request !123
|
2017-01-25 16:21:02 +01:00 |
|
Lars van Hijfte
|
e1ca3c52ed
|
Merge branch 'hendrik-post' into 'master'
Hendrik post
See merge request !122
|
2017-01-25 16:20:48 +01:00 |
|
Joey Lai
|
4c5ea08614
|
Fixed reset password
|
2017-01-25 16:19:34 +01:00 |
|
Lars van Hijfte
|
9046b397a1
|
Merge branch 'master' into lars
|
2017-01-25 16:19:07 +01:00 |
|
Lars van Hijfte
|
91fae80326
|
Friends and friendrequest are fully ajax. Also added friend-item
|
2017-01-25 16:17:46 +01:00 |
|
Hendrik
|
f06de1e88d
|
Merge branch 'master' into hendrik-post
|
2017-01-25 15:59:40 +01:00 |
|
Joey Lai
|
ded314f4d6
|
Merged marijn
|
2017-01-25 15:53:44 +01:00 |
|
Joey Lai
|
0b035c0583
|
Merge branch 'marijn-settings' into joey-testing
|
2017-01-25 15:48:37 +01:00 |
|
Marijn Jansen
|
1b2a1a5180
|
Almost request password
|
2017-01-25 15:46:20 +01:00 |
|
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
|
c23b8bd8e5
|
Merge branch 'joey-testing' into 'master'
Joey testing
See merge request !119
|
2017-01-25 13:44:11 +01:00 |
|
Joey Lai
|
e840def733
|
FIxed confirmation login
|
2017-01-25 13:43:08 +01:00 |
|
Marijn Jansen
|
13c575179d
|
Merge branch 'joey-testing' into 'master'
Added confirmation login email
See merge request !118
|
2017-01-25 12:49:45 +01:00 |
|
Joey Lai
|
aa48092d27
|
Added confirmation login email
|
2017-01-25 12:48:30 +01:00 |
|
Marijn Jansen
|
727d418c8d
|
Merge branch 'marijn-settings' into 'master'
Email confirm on settings page and emailconfirm fix (:
See merge request !116
|
2017-01-25 12:06:50 +01:00 |
|
Marijn Jansen
|
827be40646
|
Email confirm on settings page and emailconfirm fix (:
|
2017-01-25 12:02:31 +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 |
|
Marijn Jansen
|
d2c7f0787b
|
Spelling mistake
|
2017-01-25 11:19:41 +01:00 |
|
K. Nobel
|
1402a3ea07
|
Fixed query for image tags
|
2017-01-25 11:19:24 +01:00 |
|
Joey Lai
|
981e34c950
|
redesigned code
|
2017-01-25 11:19:01 +01:00 |
|
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 |
|
Lars van Hijfte
|
37d83169c6
|
In notification bar accept or deny
|
2017-01-24 17:31:39 +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
|
b8f662f825
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB
|
2017-01-24 16:59:14 +01:00 |
|
Hendrik
|
b9fc016f7d
|
add post viewing basis, add insert post and comment queries
|
2017-01-24 16:56:04 +01:00 |
|
K. Nobel
|
f9f1e2bf17
|
Changed select posts query.
|
2017-01-24 16:40:30 +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
|
dc11830c80
|
Fixed name length
|
2017-01-24 14:32:43 +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
|
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 |
|
Hendrik
|
f6051ee14f
|
Merge branch 'master' into hendrik-search
|
2017-01-24 11:05:58 +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 |
|
Hendrik
|
119c82e110
|
minor color and text fixes
|
2017-01-23 16:27:54 +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 |
|