 Lars van Hijfte
|
b95aa49c32
|
Styled chat page
Change the chat tap so it has the same style as the rest of the page
|
2017-01-12 14:59:29 +01:00 |
|
|
Lars van Hijfte
|
fd171d01f3
|
Merge branch 'master' into lars-search
|
2017-01-12 14:37:01 +01:00 |
|
|
Lars van Hijfte
|
0e44fb34c0
|
removed padding in input search
|
2017-01-12 14:32:39 +01:00 |
|
 Marijn Jansen
|
6c9841483a
|
Merge branch 'joey-testing' into 'master'
Datepicker added
See merge request !23
|
2017-01-12 13:11:01 +01:00 |
|
 Joey Lai
|
5c96744507
|
Datepicker added
|
2017-01-12 13:03:46 +01:00 |
|
|
Lars van Hijfte
|
2434ffc675
|
Added filter on the search page.
|
2017-01-12 12:20:47 +01:00 |
|
|
Lars van Hijfte
|
39b849d7ee
|
Added default padding to the input fields
|
2017-01-12 12:19:07 +01:00 |
|
|
Marijn Jansen
|
d2fd6c899d
|
Merge branch 'marijn-chat' into 'master'
Almost final chat
See merge request !22
|
2017-01-12 12:15:45 +01:00 |
|
|
Lars van Hijfte
|
fabfb416e8
|
Changed input default style
This makes a clean overall style for the buttons, selects and input fields.
Now it looks more the same in all the browsers.
|
2017-01-12 12:14:09 +01:00 |
|
|
Marijn Jansen
|
65768d385a
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !21
|
2017-01-12 12:02:29 +01:00 |
|
 Hendrik
|
96c114cc10
|
added ban status
|
2017-01-12 11:59:48 +01:00 |
|
|
Hendrik
|
cfa119fef0
|
added check all box
|
2017-01-12 11:54:56 +01:00 |
|
 Kevin Nobel
|
fffc418f4c
|
Changed style of windows, we now use the platform class.
|
2017-01-12 11:38:56 +01:00 |
|
|
Kevin Nobel
|
18b29d9ec5
|
Merge branch 'master' into kevin-prototype
|
2017-01-12 11:33:02 +01:00 |
|
|
Kevin Nobel
|
687b08f440
|
Made friends and groups box responsive
|
2017-01-12 11:29:17 +01:00 |
|
|
Kevin Nobel
|
559fe9bb98
|
Made grid layout responsive
|
2017-01-12 11:20:44 +01:00 |
|
|
Lars van Hijfte
|
3505090eb9
|
Initial search page and added class platform
|
2017-01-12 11:20:27 +01:00 |
|
|
Hendrik
|
72d3a5ad8a
|
added adminpanel main layout/concept
|
2017-01-12 11:16:57 +01:00 |
|
|
Lars van Hijfte
|
fae353fee3
|
Fixed the data-title hover bug
|
2017-01-11 16:06:49 +01:00 |
|
|
Marijn Jansen
|
655c2ccbeb
|
Small Ajustments
|
2017-01-11 16:02:02 +01:00 |
|
|
Marijn Jansen
|
9db9118613
|
Merge branch 'joey-testing' into 'master'
Joey testing
See merge request !13
|
2017-01-11 15:55:05 +01:00 |
|
|
Marijn Jansen
|
c2900507ad
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !12
|
2017-01-11 15:53:21 +01:00 |
|
|
Kevin Nobel
|
93df059ae6
|
Merge branch 'master' into kevin-prototype
|
2017-01-11 15:47:29 +01:00 |
|
|
Joey Lai
|
392a60baff
|
Added style for index
|
2017-01-11 15:42:58 +01:00 |
|
|
Kevin Nobel
|
5be19ce91d
|
Added group view
|
2017-01-11 15:42:32 +01:00 |
|
|
Marijn Jansen
|
1f6b92ea7b
|
Merge branch 'marijn-chat' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat
|
2017-01-11 15:32:22 +01:00 |
|
|
Marijn Jansen
|
544db8b608
|
Merge branch 'marijn-chat' into 'lars-chat'
# Conflicts:
# website/views/chat-view.php
|
2017-01-11 15:31:49 +01:00 |
|
|
Lars van Hijfte
|
0f562bd39c
|
Fixed chat size.
It is all fixed, litteraly.
|
2017-01-11 15:29:47 +01:00 |
|
|
Marijn Jansen
|
92b9f747eb
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat
|
2017-01-11 15:26:46 +01:00 |
|
|
Marijn Jansen
|
1e6e454de4
|
Small changes
|
2017-01-11 15:26:01 +01:00 |
|
|
Kevin Nobel
|
b4c7bfb1ef
|
We now use inline-flex for the post grid instead of float left.
|
2017-01-11 15:11:42 +01:00 |
|
|
Kevin Nobel
|
b8e61e641a
|
Fixed tooltip bug (only worked with hyperlinks before
|
2017-01-11 15:09:24 +01:00 |
|
|
Marijn Jansen
|
38079cbcaf
|
Added Friend list in chat.
|
2017-01-11 14:38:07 +01:00 |
|
|
Marijn Jansen
|
916589dac7
|
Merge branch 'master' into marijn-chat
|
2017-01-11 14:04:53 +01:00 |
|
|
Kevin Nobel
|
69d1ee9cd8
|
Merge branch 'master' into kevin-prototype
|
2017-01-11 14:04:51 +01:00 |
|
|
Marijn Jansen
|
eecdcad538
|
"before merge"
|
2017-01-11 14:04:04 +01:00 |
|
|
Kevin Nobel
|
cd93dcb719
|
Small changes to profile page, added friend request button
|
2017-01-11 14:00:10 +01:00 |
|
|
Lars van Hijfte
|
24e0673caa
|
Added extra functions to the header.
A text button was added to go directly to the DM's and if you click your profile picture it pups up some links to go to.
|
2017-01-11 13:49:54 +01:00 |
|
|
Lars van Hijfte
|
8761c89f75
|
Added a footer.
This also sets the default height of the page to 100% so that the footer is always on the bottom
|
2017-01-11 13:07:52 +01:00 |
|
|
Lars van Hijfte
|
fc0b801d7d
|
Added groups to the menu.
It also now has an animation to hide and show more or less items in the menu.
|
2017-01-11 13:06:09 +01:00 |
|
|
Kevin Nobel
|
019a89c865
|
Merge branch 'master' into kevin-prototype
|
2017-01-11 11:30:04 +01:00 |
|
|
Kevin Nobel
|
ee7a91a6aa
|
Commit before merge
|
2017-01-11 11:26:42 +01:00 |
|
|
Marijn Jansen
|
5b4d773d93
|
Merge branch 'master' into marijn-chat
|
2017-01-11 11:15:03 +01:00 |
|
|
Marijn Jansen
|
17d1f96a02
|
Merge with current master
|
2017-01-11 11:14:07 +01:00 |
|
|
Lars van Hijfte
|
c354bdb330
|
fixed merge
|
2017-01-11 11:13:04 +01:00 |
|
|
Lars van Hijfte
|
e90ecda436
|
Added a menu
It contains a list of friends and a "more" button.
This also offsets the content to the right.
|
2017-01-11 11:10:32 +01:00 |
|
|
Marijn Jansen
|
b973e666da
|
Fixed spacing on the chat page.
|
2017-01-10 20:58:56 +01:00 |
|
|
Marijn Jansen
|
81e4d1e874
|
Fixed for merge
|
2017-01-10 17:12:16 +01:00 |
|
|
Kevin Nobel
|
40ce3d57b3
|
Added profile view. (WIP)
|
2017-01-10 17:09:11 +01:00 |
|
|
Marijn Jansen
|
cf240ca656
|
Almost a chatpage!
|
2017-01-10 17:08:40 +01:00 |
|