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 |
|
Marijn Jansen
|
422e2d1308
|
Date picker in bday
|
2017-01-30 21:48:18 +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 |
|
Lars van Hijfte
|
6831994ede
|
Merge branch 'lars' into 'master'
Lars
See merge request !152
|
2017-01-30 15:41:32 +01:00 |
|
K. Nobel
|
54b56da445
|
Merge branch 'master' into kevin-prototype
|
2017-01-30 15:37:57 +01:00 |
|
K. Nobel
|
183a98a339
|
Fixed link to groups on profile page.
|
2017-01-30 15:34:32 +01:00 |
|
K. Nobel
|
941296802f
|
Added posts to group page.
|
2017-01-30 15:30:08 +01:00 |
|
Marijn Jansen
|
dd017d8885
|
Merge branch 'marijn-404' into 'master'
Redirect to index
See merge request !150
|
2017-01-30 14:35:51 +01:00 |
|
Marijn Jansen
|
282875c6a2
|
Redirect to index
|
2017-01-30 14:35:25 +01:00 |
|
Marijn Jansen
|
e8c76bef5b
|
Merge branch 'marijn-nietslecht' into 'master'
Marijn nietslecht
See merge request !147
|
2017-01-30 14:31:17 +01:00 |
|
Marijn Jansen
|
20b951cad2
|
404 page
|
2017-01-30 14:30:36 +01:00 |
|
Lars van Hijfte
|
792f346b12
|
Added admin-panel button
|
2017-01-30 14:16:11 +01:00 |
|
Lars van Hijfte
|
54ddb78453
|
Chat receive messages is now better
|
2017-01-30 13:59:02 +01:00 |
|
Marijn Jansen
|
9a36dea592
|
Removed a comma
|
2017-01-30 13:22:44 +01:00 |
|
Marijn Jansen
|
578ad34020
|
Picture at nietslecht-button
|
2017-01-30 13:21:12 +01:00 |
|
Lars van Hijfte
|
c8450f3cb3
|
Changed profile buttons
|
2017-01-30 12:44:15 +01:00 |
|
Lars van Hijfte
|
89c8c35b4a
|
Changed profile look a bit more
|
2017-01-29 17:24:39 +01:00 |
|
Hendrik
|
3f960cc091
|
Merge branch 'master' into hendrik-testing
|
2017-01-27 16:15:42 +01:00 |
|
Joey Lai
|
08f668859c
|
begin with facebook login
|
2017-01-27 16:15:23 +01:00 |
|
Hendrik
|
b12eaced4a
|
improve adminpanel w/ ajax, enum fixes, misc fixes
|
2017-01-27 16:14:54 +01:00 |
|
Lars van Hijfte
|
16b1f93968
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !143
|
2017-01-27 16:13:32 +01:00 |
|
K. Nobel
|
8da1469ca9
|
Started with group page.
|
2017-01-27 16:05:45 +01:00 |
|
Marijn Jansen
|
7e2c20e244
|
Added showEmail and showBday to the settings page
|
2017-01-27 15:40:07 +01:00 |
|
Marijn Jansen
|
2651e0fb2b
|
Merge branch 'joey-testing' into 'master'
Made different files for login and register
See merge request !138
|
2017-01-27 14:04:39 +01:00 |
|
Joey Lai
|
5e9629eddd
|
Fixed bugs
|
2017-01-27 14:03:11 +01:00 |
|
Marijn Jansen
|
ce6a751630
|
Niet slecht inverted
|
2017-01-27 12:30:28 +01:00 |
|
Joey Lai
|
609f350cd3
|
Made different files for login and register
|
2017-01-27 12:27:40 +01:00 |
|
Marijn Jansen
|
3b542e0878
|
"Niet slecht."-button!
|
2017-01-27 12:20:50 +01:00 |
|
Marijn Jansen
|
82c2eaccb3
|
Merge branch 'master' into marijn-nietslecht
|
2017-01-27 11:23:42 +01:00 |
|
Hendrik
|
c2d8521cdd
|
Merge branch 'master' into hendrik-testing
|
2017-01-27 10:48:18 +01:00 |
|