 Lars van Hijfte
|
794b5ab294
|
Added fancy text to posts and comments
|
2017-01-31 13:54:31 +01:00 |
|
 Marijn Jansen
|
2a37b9c64d
|
Merge branch 'kevin-prototype' into 'master'
Fixed posts on group pages.
See merge request !156
|
2017-01-31 13:54:30 +01:00 |
|
|
Marijn Jansen
|
dfdf72daf4
|
Merge branch 'marijn-postPicture' into 'master'
Fixed and spilt Avatar upload and Alerts
See merge request !157
|
2017-01-31 13:38:30 +01:00 |
|
|
Marijn Jansen
|
1c9c88e030
|
Fixed and spilt Avatar upload and Alerts
|
2017-01-31 13:36:32 +01:00 |
|
 Hendrik
|
eb12b6ba7d
|
fixed pageselector in admin
|
2017-01-31 13:11:23 +01:00 |
|
 K. Nobel
|
c14a2770bd
|
Fixed posting functions for groups.
|
2017-01-31 12:52:50 +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 |
|
|
Lars van Hijfte
|
d5d9d5857a
|
Rip website?
|
2017-01-31 11:50:05 +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
|
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 |
|
|
K. Nobel
|
3140242b4f
|
Removed old query for posts.
|
2017-01-30 16:24:07 +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
|
1acad8e765
|
modified masonry and posts, masonry is now reusable on group pages.
|
2017-01-30 15:28:54 +01:00 |
|
|
Lars van Hijfte
|
54ddb78453
|
Chat receive messages is now better
|
2017-01-30 13:59:02 +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 |
|
|
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 |
|
|
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 |
|
 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 |
|
|
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 |
|
|
Lars van Hijfte
|
f32e0ca382
|
Merge branch 'master' into lars
|
2017-01-26 21:57:13 +01:00 |
|
|
Lars van Hijfte
|
d89e672990
|
Also fixed unread chat
|
2017-01-26 21:54:47 +01:00 |
|
|
Lars van Hijfte
|
032e25b044
|
You can now only chat with friends
|
2017-01-26 21:50:47 +01:00 |
|
|
Marijn Jansen
|
7073995534
|
Stop before Genius Bar visit
|
2017-01-26 17:03:11 +01:00 |
|
|
Lars van Hijfte
|
637a26ba33
|
Merge branch 'joey-testing' into 'master'
Modal for register
See merge request !134
|
2017-01-26 16:18:35 +01:00 |
|
|
Joey Lai
|
dbdb12cca0
|
Modal for register
|
2017-01-26 16:17:58 +01:00 |
|
|
Lars van Hijfte
|
70b7734e8b
|
Merge branch 'lars' into 'master'
Added direct button on the profile to chat with someone
See merge request !133
|
2017-01-26 16:14:09 +01:00 |
|
|
Lars van Hijfte
|
c1fc022658
|
Merge branch 'joey-testing' into 'master'
Fixed date and other extras
See merge request !132
|
2017-01-26 16:13:43 +01:00 |
|
|
Lars van Hijfte
|
5c1208460f
|
Added direct button on the profile to chat with someone
|
2017-01-26 16:12:50 +01:00 |
|
|
K. Nobel
|
59fc65e27a
|
Made small changes to posts, added amount of comments and niet slechts
|
2017-01-26 16:09:18 +01:00 |
|
|
Hendrik
|
0c324b9095
|
Merge branch 'master' into hendrik-testing
|
2017-01-26 15:33:08 +01:00 |
|
|
Joey Lai
|
96f70e1a11
|
Fixed date and other extras
|
2017-01-26 14:50:41 +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 |
|
|
Hendrik
|
1a53d01747
|
add authentication
|
2017-01-26 13:29:56 +01:00 |
|