Marijn Jansen
|
7f97d7d35a
|
Merge branch 'marijn-settings' into 'master'
Settings
See merge request !33
|
2017-01-13 10:53:09 +01:00 |
|
Marijn Jansen
|
807361e654
|
Updated colour for footer.
|
2017-01-13 10:52:05 +01:00 |
|
K. Nobel
|
a0e2c60ddb
|
Merge branch 'master' into kevin-prototype
|
2017-01-13 10:42:39 +01:00 |
|
K. Nobel
|
02149565ce
|
Fixed post width for Chrome
|
2017-01-13 10:39:37 +01:00 |
|
Hendrik
|
83c994468f
|
ready for merge
|
2017-01-13 10:37:06 +01:00 |
|
Hendrik
|
9c73da34fe
|
Merge branch 'master' into hendrik-testing
|
2017-01-13 10:24:16 +01:00 |
|
Hendrik
|
8852a0d918
|
use platform
|
2017-01-13 10:23:31 +01:00 |
|
Hendrik
|
89df0aba52
|
readied for merge
|
2017-01-13 10:20:34 +01:00 |
|
Hendrik
|
58779a3d4d
|
cleaning
|
2017-01-12 15:59:16 +01:00 |
|
Hendrik
|
d14688295f
|
add title, slight css modification
|
2017-01-12 15:55:25 +01:00 |
|
Marijn Jansen
|
984800fd0c
|
End of day.
|
2017-01-12 15:52:14 +01:00 |
|
Marijn Jansen
|
f481c1c611
|
More uniform main css file.
|
2017-01-12 15:41:13 +01:00 |
|
Marijn Jansen
|
489d330d47
|
Merge branch 'master' into marijn-settings
|
2017-01-12 15:21:08 +01:00 |
|
Marijn Jansen
|
d900edfcda
|
Updated buttons
|
2017-01-12 15:20:47 +01:00 |
|
Marijn Jansen
|
c15643128a
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !26
|
2017-01-12 15:02:51 +01:00 |
|
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 |
|
Marijn Jansen
|
2bc11a87e4
|
Added Email settings
|
2017-01-12 14:49:11 +01:00 |
|
Lars van Hijfte
|
fd171d01f3
|
Merge branch 'master' into lars-search
|
2017-01-12 14:37:01 +01:00 |
|
Hendrik
|
1b97b1fad3
|
slightly modified css
|
2017-01-12 14:32:56 +01:00 |
|
Lars van Hijfte
|
0e44fb34c0
|
removed padding in input search
|
2017-01-12 14:32:39 +01:00 |
|
Marijn Jansen
|
10558a6877
|
Merge branch 'master' into marijn-settings
|
2017-01-12 14:21:28 +01:00 |
|
Marijn Jansen
|
eeedbe5c05
|
More fields
|
2017-01-12 14:19:08 +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
|
b82ac7ec59
|
More settings
|
2017-01-12 12:12:54 +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 |
|
Marijn Jansen
|
06c24ec096
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-settings
|
2017-01-12 11:36:26 +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 |
|
Marijn Jansen
|
319a406d6f
|
Added settings page.
|
2017-01-12 11:00:44 +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 |
|