 Lars van Hijfte
|
487e0a0523
|
Merge branch 'lars' into 'master'
Lars
See merge request !180
|
2017-02-02 12:46:42 +01:00 |
|
|
Lars van Hijfte
|
1dfc14e6f0
|
Added meta data
|
2017-02-02 12:44:03 +01:00 |
|
 Marijn Jansen
|
04df02862f
|
More Awesome Fonts :D
|
2017-02-02 10:52:42 +01:00 |
|
|
Lars van Hijfte
|
60b55b3f04
|
Added comments
Also hiding the mail/age if said so by the user
|
2017-02-02 10:29:49 +01:00 |
|
|
Marijn Jansen
|
e299ef59e8
|
Added show profile into settings
|
2017-02-02 10:28:12 +01:00 |
|
|
Lars van Hijfte
|
0546b8689d
|
BUG FIX: name size
|
2017-02-01 14:51:27 +01:00 |
|
|
Marijn Jansen
|
b497538652
|
Double session_start fixed :D
|
2017-02-01 14:45:58 +01:00 |
|
|
Marijn Jansen
|
96f421d088
|
Merge branch 'master' into 'marijn-postdelete'
# Conflicts:
# website/public/js/masonry.js
|
2017-02-01 14:41:45 +01:00 |
|
|
Marijn Jansen
|
dbfe10f84b
|
Delete Posts!
|
2017-02-01 14:34:02 +01:00 |
|
|
Lars van Hijfte
|
fb6b392a42
|
Merge branch 'hendrik-post' into 'master'
Hendrik post
See merge request !172
|
2017-02-01 14:19:54 +01:00 |
|
 Hendrik
|
7f31575bfc
|
Merge branch 'master' into hendrik-post
|
2017-02-01 14:13:55 +01:00 |
|
|
Marijn Jansen
|
d87d0b7295
|
Backend for delete post
|
2017-02-01 14:13:22 +01:00 |
|
|
Hendrik
|
9b89058484
|
add infinite scroll on profile
|
2017-02-01 14:05:04 +01:00 |
|
|
Marijn Jansen
|
a643ee19b9
|
Merge branch 'master' into marijn-postdelete
|
2017-02-01 12:56:09 +01:00 |
|
 Joey Lai
|
700e27e5e3
|
Fixed redirect link and removes test echo's
|
2017-02-01 12:45:26 +01:00 |
|
|
Lars van Hijfte
|
152d72d3d8
|
Merge branch 'joey-testing' into 'master'
Joey testing
See merge request !164
|
2017-02-01 12:29:29 +01:00 |
|
 K. Nobel
|
3ca7536cc2
|
Merge branch 'master' into kevin-prototype
|
2017-02-01 12:27:07 +01:00 |
|
|
K. Nobel
|
69b0b24176
|
Fixed group add/leave buttons
|
2017-02-01 12:26:05 +01:00 |
|
|
Joey Lai
|
2b893fc283
|
Facebook ID instead of Facebook email
|
2017-02-01 12:25:13 +01:00 |
|
|
Lars van Hijfte
|
7fdf9ad329
|
switch laptop (:
|
2017-02-01 12:20:40 +01:00 |
|
|
Lars van Hijfte
|
028c2373c1
|
Merge branch 'hendrik-testing' into 'master'
fixsquared
See merge request !163
|
2017-01-31 16:23:41 +01:00 |
|
|
Hendrik
|
fb9d070d6a
|
fixsquared
|
2017-01-31 16:23:13 +01:00 |
|
|
Lars van Hijfte
|
e3ad9c4590
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !162
|
2017-01-31 16:20:36 +01:00 |
|
|
Marijn Jansen
|
3397253010
|
Merge branch 'marijn-settings' into 'master'
1337 bday
See merge request !161
|
2017-01-31 16:20:08 +01:00 |
|
|
Hendrik
|
52a4822477
|
post-merge fix
|
2017-01-31 16:20:02 +01:00 |
|
|
Marijn Jansen
|
c0a64e9ffd
|
1337 bday
|
2017-01-31 16:19:15 +01:00 |
|
|
Hendrik
|
64a3b13adf
|
Merge branch 'master' into hendrik-testing
|
2017-01-31 16:17:42 +01:00 |
|
|
Hendrik
|
b16dc1d4b7
|
add bancomment change
|
2017-01-31 16:15:48 +01:00 |
|
|
Joey Lai
|
8e98001217
|
Facebook login implemented
|
2017-01-31 16:12:22 +01:00 |
|
|
Lars van Hijfte
|
b41a365b60
|
Age instead of birthday
|
2017-01-31 16:11:20 +01:00 |
|
|
Lars van Hijfte
|
6a7bb4670b
|
Merge branch 'lars' into 'master'
Lars
See merge request !159
|
2017-01-31 16:03:05 +01:00 |
|
|
Lars van Hijfte
|
d6c2fab617
|
Post is now mobile friendly
|
2017-01-31 15:32:19 +01:00 |
|
|
Hendrik
|
93200d27c2
|
Merge branch 'master' into hendrik-search
|
2017-01-31 15:32:09 +01:00 |
|
|
Hendrik
|
78e96d5a74
|
add pageselector on search
|
2017-01-31 15:30:48 +01:00 |
|
|
Lars van Hijfte
|
646e6dde48
|
Added max value in text area
|
2017-01-31 15:16:40 +01:00 |
|
|
Lars van Hijfte
|
44408ee429
|
Frozen user cant comment or niet slecht on postst
|
2017-01-31 14:34:51 +01:00 |
|
|
Lars van Hijfte
|
9ca212570d
|
Merge branch 'master' into lars
|
2017-01-31 14:27:50 +01:00 |
|
|
Lars van Hijfte
|
164eb2dde6
|
Frozen users cant chat with other people
|
2017-01-31 14:26:34 +01:00 |
|
|
Hendrik
|
eb12b6ba7d
|
fixed pageselector in admin
|
2017-01-31 13:11:23 +01:00 |
|
|
K. Nobel
|
6b13db9c4f
|
Fixed posting on group pages.
|
2017-01-31 12:53:45 +01:00 |
|
|
Lars van Hijfte
|
f26097f55f
|
Fixed online status
|
2017-01-31 12:25:28 +01:00 |
|
|
Hendrik
|
582d347bcb
|
Merge branch 'master' into hendrik-testing
|
2017-01-31 12:05:05 +01:00 |
|
|
Lars van Hijfte
|
d5d9d5857a
|
Rip website?
|
2017-01-31 11:50:05 +01:00 |
|
|
Lars van Hijfte
|
c7d47cf446
|
Merge branch 'lars' into 'master'
Lars
See merge request !154
|
2017-01-31 10:33:20 +01:00 |
|
|
Lars van Hijfte
|
4dc3b4f651
|
Mobile friendly
|
2017-01-31 10:31:57 +01:00 |
|
|
Marijn Jansen
|
3579fe0cd5
|
Merge branch 'marijn-settings' into 'master'
Marijn settings
See merge request !153
|
2017-01-31 10:24:34 +01:00 |
|
|
Marijn Jansen
|
a6b6d6d747
|
Style changes
|
2017-01-31 10:23:47 +01:00 |
|
|
Marijn Jansen
|
6983aa06a2
|
Finishing touches
|
2017-01-30 23:03:50 +01:00 |
|
|
Marijn Jansen
|
8dfa31696c
|
autocomplete suggestions at password
|
2017-01-30 22:49:43 +01:00 |
|
|
Marijn Jansen
|
ce53b6e9e4
|
Checkbox for showBday and showEmail
|
2017-01-30 22:42:47 +01:00 |
|