 Lars van Hijfte
|
f8c9454b85
|
empty SessionID sends the user to login page
If the session is empty, it now sends you to the login page with a safed url so it can revert you back to the right page after login
|
2017-02-02 17:43:32 +01:00 |
|
 Hendrik
|
6ed19d9060
|
Merge branch 'master' into hendrik-post
|
2017-02-02 13:43:31 +01:00 |
|
|
Hendrik
|
d4d16661df
|
added alert box when emptpy posting
|
2017-02-02 13:42:59 +01:00 |
|
|
Lars van Hijfte
|
d03d58ce37
|
Merge branch 'hendrik-search' into 'master'
Hendrik search
See merge request !177
|
2017-02-02 12:47:05 +01:00 |
|
|
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
|
60b55b3f04
|
Added comments
Also hiding the mail/age if said so by the user
|
2017-02-02 10:29:49 +01:00 |
|
|
Hendrik
|
d9c68d5f5f
|
Merge branch 'master' into hendrik-search
|
2017-02-02 10:27:21 +01:00 |
|
|
Hendrik
|
d027333bd7
|
fix filter and pagenumber interaction in search
|
2017-02-02 01:06:31 +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 |
|
|
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 |
|
|
Lars van Hijfte
|
dc69fb493c
|
BUG FIX: Added session start, so posts load again
|
2017-02-01 12:34:27 +01:00 |
|
|
Lars van Hijfte
|
8e81cec843
|
Merge branch 'lars' into 'master'
Lars
See merge request !165
|
2017-02-01 12:30:08 +01:00 |
|
 K. Nobel
|
3ca7536cc2
|
Merge branch 'master' into kevin-prototype
|
2017-02-01 12:27:07 +01:00 |
|
|
K. Nobel
|
58bb89f9b4
|
Added queries and functions for adding group members.
|
2017-02-01 12:19:59 +01:00 |
|
|
Lars van Hijfte
|
e414a1633e
|
API filter per user level
|
2017-02-01 11:38:43 +01:00 |
|
|
Hendrik
|
fb9d070d6a
|
fixsquared
|
2017-01-31 16:23:13 +01:00 |
|
|
Hendrik
|
52a4822477
|
post-merge fix
|
2017-01-31 16:20:02 +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 |
|
|
Lars van Hijfte
|
6a7bb4670b
|
Merge branch 'lars' into 'master'
Lars
See merge request !159
|
2017-01-31 16:03:05 +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
|
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 |
|
|
Lars van Hijfte
|
794b5ab294
|
Added fancy text to posts and comments
|
2017-01-31 13:54:31 +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 |
|
|
K. Nobel
|
c14a2770bd
|
Fixed posting functions for groups.
|
2017-01-31 12:52:50 +01:00 |
|
|
Hendrik
|
a0e77491a2
|
Merge branch 'master' into hendrik-testing
|
2017-01-30 16:34:40 +01:00 |
|
|
Hendrik
|
e464f5bca2
|
cleaned admin.js, add admin/owner check (frontend), fix submit ajax
|
2017-01-30 16:32:57 +01:00 |
|
|
K. Nobel
|
1acad8e765
|
modified masonry and posts, masonry is now reusable on group pages.
|
2017-01-30 15:28:54 +01:00 |
|
|
Marijn Jansen
|
b24fed57d9
|
Changed db connect and database query structure so PhpStorm can detect it.
|
2017-01-29 14:01:25 +01:00 |
|
|
Hendrik
|
3f960cc091
|
Merge branch 'master' into hendrik-testing
|
2017-01-27 16:15:42 +01:00 |
|
|
Hendrik
|
b12eaced4a
|
improve adminpanel w/ ajax, enum fixes, misc fixes
|
2017-01-27 16:14:54 +01:00 |
|
|
Marijn Jansen
|
3b542e0878
|
"Niet slecht."-button!
|
2017-01-27 12:20:50 +01:00 |
|
|
Marijn Jansen
|
7073995534
|
Stop before Genius Bar visit
|
2017-01-26 17:03:11 +01:00 |
|
|
Marijn Jansen
|
cdfbcc0168
|
Merge branch 'master' into marijn-nietslecht
|
2017-01-26 15:24:55 +01:00 |
|
|
Marijn Jansen
|
bf87d20985
|
Queries for niet slecht
|
2017-01-26 15:14:51 +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 |
|
|
Hendrik
|
91aca6baa7
|
change comments to use ajax
|
2017-01-26 12:21:01 +01:00 |
|
|
Hendrik
|
328f0665f3
|
add basic post functionality
|
2017-01-26 11:35:18 +01:00 |
|
|
Lars van Hijfte
|
8fb8df075f
|
Added comments
|
2017-01-26 11:31:15 +01:00 |
|
|
Lars van Hijfte
|
95ee91748f
|
Chat messages and groups are now live.
|
2017-01-26 10:26:40 +01:00 |
|
|
Lars van Hijfte
|
2ece9e1c63
|
Merge branch 'master' into lars
|
2017-01-25 16:21:34 +01:00 |
|