Lars van Hijfte
|
2ece9e1c63
|
Merge branch 'master' into lars
|
2017-01-25 16:21:34 +01:00 |
|
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 |
|
Hendrik
|
b161596d67
|
polished post viewing
|
2017-01-25 15:59:03 +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 |
|
Joey Lai
|
cc08ebec3c
|
Modal added for resetting password
|
2017-01-25 15:47:31 +01:00 |
|
Marijn Jansen
|
1b2a1a5180
|
Almost request password
|
2017-01-25 15:46:20 +01:00 |
|
K. Nobel
|
977757b2d3
|
Made small improvements to friendship buttons and corresponding API files.
|
2017-01-25 15:42:28 +01:00 |
|
K. Nobel
|
6a43402c66
|
Added comment in getFriendshipStatus for Lars.
|
2017-01-25 15:14:00 +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 |
|
Hendrik
|
db333b6e98
|
add unpolished post viewing
|
2017-01-25 13:28:47 +01:00 |
|
Joey Lai
|
30d1ef40f4
|
fixed js for login
|
2017-01-25 12:55:29 +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
|
7f755bfd2c
|
Merge branch 'marijn-settings' into 'master'
Cleanup at logout.php
See merge request !117
|
2017-01-25 12:30:20 +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
|
185874d23f
|
Cleanup at logout.php
|
2017-01-25 12:06:13 +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 |
|
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
|
37d83169c6
|
In notification bar accept or deny
|
2017-01-24 17:31:39 +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
|
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 |
|
Hendrik
|
b9fc016f7d
|
add post viewing basis, add insert post and comment queries
|
2017-01-24 16:56:04 +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
|
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 |
|