 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 |
|
|
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 |
|
|
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 |
|
 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 |
|
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
Lars van Hijfte
|
cbff973b63
|
Save manu state with cookie
|
2017-01-27 11:15:33 +01:00 |
|
|
Hendrik
|
c2d8521cdd
|
Merge branch 'master' into hendrik-testing
|
2017-01-27 10:48:18 +01:00 |
|
|
Lars van Hijfte
|
f1bfc89e6a
|
Custom scrollbar
|
2017-01-26 22:33:32 +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 |
|
|
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 |
|
|
Joey Lai
|
96f70e1a11
|
Fixed date and other extras
|
2017-01-26 14:50:41 +01:00 |
|
|
K. Nobel
|
e75df42bd8
|
Merge branch 'master' into kevin-prototype
|
2017-01-26 14:32:00 +01:00 |
|
|
K. Nobel
|
b66c108f4e
|
Fixed post titles for htmlchars.
|
2017-01-26 14:31:45 +01:00 |
|
|
Lars van Hijfte
|
a60a9b6594
|
Merge branch 'master' into lars
|
2017-01-26 14:12:27 +01:00 |
|
|
Lars van Hijfte
|
feb64002f5
|
Live search
|
2017-01-26 14:12:04 +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 |
|