Commit Graph

631 Commits

Author SHA1 Message Date
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
Lars van Hijfte
f67dd019c4 Inputs are now mobile friendly 2017-01-31 12:47:24 +01:00
Lars van Hijfte
f26097f55f Fixed online status 2017-01-31 12:25:28 +01:00
K. Nobel
2e71942fdf Merge branch 'master' into kevin-prototype 2017-01-31 12:06:58 +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
K. Nobel
dee483e946 Masonry will now only refresh when the width of the screen changes. 2017-01-31 10:54:15 +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
bc7cbb0fb7 Merge branch 'marijn-settings' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-settings 2017-01-30 21:49:17 +01:00
Marijn Jansen
422e2d1308 Date picker in bday 2017-01-30 21:48:18 +01:00
K. Nobel
6e6bbf8d92 Merge branch 'master' into kevin-prototype 2017-01-30 20:19:24 +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
3140242b4f Removed old query for posts. 2017-01-30 16:24:07 +01:00
Lars van Hijfte
0b6ca72dfc Fixed chat date not showing 2017-01-30 16:00:16 +01:00
Lars van Hijfte
6831994ede Merge branch 'lars' into 'master'
Lars

See merge request !152
2017-01-30 15:41:32 +01:00
Lars van Hijfte
b0a8ceafc3 Added youtube links 2017-01-30 15:40:31 +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
K. Nobel
aa12e29948 Fixed posts on profile page. 2017-01-30 15:29:42 +01:00
K. Nobel
1acad8e765 modified masonry and posts, masonry is now reusable on group pages. 2017-01-30 15:28:54 +01:00
Lars van Hijfte
44ff3a4cab added time to chat messages 2017-01-30 15:08:07 +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
c840b28495 Merge branch 'marijn-404' into 'master'
Resize

See merge request !149
2017-01-30 14:34:08 +01:00
Marijn Jansen
f1b5a7fe95 Resize 2017-01-30 14:33:38 +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
877637fcc9 Added video and links in the chat 2017-01-29 18:29:27 +01:00
Lars van Hijfte
89c8c35b4a Changed profile look a bit more 2017-01-29 17:24:39 +01:00
Marijn Jansen
c1a7ccc076 Found some extra statemensts 2017-01-29 14:08:45 +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
Marijn Jansen
da30b9101c Added age calculation 2017-01-29 13:09:22 +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