Marijn Jansen
|
82c2eaccb3
|
Merge branch 'master' into marijn-nietslecht
|
2017-01-27 11:23:42 +01:00 |
|
Lars van Hijfte
|
f32e0ca382
|
Merge branch 'master' into lars
|
2017-01-26 21:57:13 +01:00 |
|
Lars van Hijfte
|
d89e672990
|
Also fixed unread chat
|
2017-01-26 21:54:47 +01:00 |
|
Lars van Hijfte
|
032e25b044
|
You can now only chat with friends
|
2017-01-26 21:50:47 +01:00 |
|
Marijn Jansen
|
7073995534
|
Stop before Genius Bar visit
|
2017-01-26 17:03:11 +01:00 |
|
Lars van Hijfte
|
637a26ba33
|
Merge branch 'joey-testing' into 'master'
Modal for register
See merge request !134
|
2017-01-26 16:18:35 +01:00 |
|
Joey Lai
|
dbdb12cca0
|
Modal for register
|
2017-01-26 16:17:58 +01:00 |
|
Lars van Hijfte
|
70b7734e8b
|
Merge branch 'lars' into 'master'
Added direct button on the profile to chat with someone
See merge request !133
|
2017-01-26 16:14:09 +01:00 |
|
Lars van Hijfte
|
c1fc022658
|
Merge branch 'joey-testing' into 'master'
Fixed date and other extras
See merge request !132
|
2017-01-26 16:13:43 +01:00 |
|
Lars van Hijfte
|
5c1208460f
|
Added direct button on the profile to chat with someone
|
2017-01-26 16:12:50 +01:00 |
|
Joey Lai
|
96f70e1a11
|
Fixed date and other extras
|
2017-01-26 14:50:41 +01:00 |
|
Lars van Hijfte
|
a60a9b6594
|
Merge branch 'master' into lars
|
2017-01-26 14:12:27 +01:00 |
|
Lars van Hijfte
|
33a640329b
|
Filter on search page
It also works with jquery now
|
2017-01-26 13:53:59 +01:00 |
|
Hendrik
|
51cc736aca
|
Merge branch 'master' into hendrik-post
|
2017-01-26 13:46:24 +01:00 |
|
K. Nobel
|
cf964ec8d6
|
Merge branch 'master' into kevin-prototype
|
2017-01-26 13:24:16 +01:00 |
|
K. Nobel
|
3ebacd6251
|
Fixed masonry grid (posts).
|
2017-01-26 12:20:32 +01:00 |
|
Hendrik
|
328f0665f3
|
add basic post functionality
|
2017-01-26 11:35:18 +01:00 |
|
Lars van Hijfte
|
95ee91748f
|
Chat messages and groups are now live.
|
2017-01-26 10:26:40 +01:00 |
|
Lars van Hijfte
|
30d403ae7b
|
Merge branch 'lars' into 'master'
Lars
See merge request !125
|
2017-01-25 16:21:56 +01:00 |
|
Marijn Jansen
|
2242feda21
|
Merge branch 'marijn-settings' into 'master'
Password change
See merge request !124
|
2017-01-25 16:21:44 +01:00 |
|
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 |
|
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 |
|