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 |
|
Marijn Jansen
|
bb56679885
|
Merge branch 'kevin-prototype' into 'master'
POSTS ON GROUP PAGES
See merge request !151
|
2017-01-30 15:41:05 +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
|
25957c6c78
|
Merge branch 'marijn-404' into 'master'
404 page
See merge request !148
|
2017-01-30 14:31:03 +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 |
|
K. Nobel
|
f3df682af5
|
Merge branch 'master' into kevin-prototype
|
2017-01-30 13:20:53 +01:00 |
|
Lars van Hijfte
|
c8450f3cb3
|
Changed profile buttons
|
2017-01-30 12:44:15 +01:00 |
|
Marijn Jansen
|
b30ef0d0cf
|
Merge branch 'marijn-dbConnect' into 'master'
New database connect style
See merge request !146
|
2017-01-30 12:10:37 +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 |
|
Lars van Hijfte
|
dd2113b234
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !145
|
2017-01-27 16:16:07 +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 |
|
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
|
753c596056
|
Merge branch 'master' into kevin-prototype
|
2017-01-27 16:09:11 +01:00 |
|
K. Nobel
|
8da1469ca9
|
Started with group page.
|
2017-01-27 16:05:45 +01:00 |
|
Lars van Hijfte
|
f7f442ce75
|
Merge branch 'lars' into 'master'
Lars
See merge request !142
|
2017-01-27 16:05:11 +01:00 |
|
Lars van Hijfte
|
c8c81ae730
|
Merge branch 'master' into lars
|
2017-01-27 16:03:54 +01:00 |
|
Lars van Hijfte
|
a57465189a
|
Chat post images
|
2017-01-27 16:03:33 +01:00 |
|
Marijn Jansen
|
dc51ac5964
|
Even more sexy turnary statements!
|
2017-01-27 15:41:59 +01:00 |
|
Marijn Jansen
|
be9fa6d2c1
|
Merge branch 'marijn-settings' into 'master'
Added showEmail and showBday to the settings page
See merge request !141
|
2017-01-27 15:41:02 +01:00 |
|
Marijn Jansen
|
7e2c20e244
|
Added showEmail and showBday to the settings page
|
2017-01-27 15:40:07 +01:00 |
|
Marijn Jansen
|
dd6b41783a
|
Merge branch 'joey-testing' into 'master'
fixed idk
See merge request !140
|
2017-01-27 14:18:27 +01:00 |
|
Joey Lai
|
e9eeeaf110
|
fixed idk
|
2017-01-27 14:17:56 +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
|
d356468554
|
Merge branch 'marijn-nietslecht' into 'master'
Niet slecht inverted
See merge request !139
|
2017-01-27 12:30:56 +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 |
|
Lars van Hijfte
|
07c3b07eb3
|
Merge branch 'lars' into 'master'
Lars
See merge request !137
|
2017-01-27 12:23:04 +01:00 |
|
Lars van Hijfte
|
f27b9ec6b4
|
Chat messages split per day
|
2017-01-27 12:22:26 +01:00 |
|