 Hendrik
|
89df0aba52
|
readied for merge
|
2017-01-13 10:20:34 +01:00 |
|
 Joey Lai
|
042ec212b2
|
Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing
|
2017-01-13 10:14:07 +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 |
|
 Lars van Hijfte
|
bf640b2690
|
Merge branch 'master' into lars-search
|
2017-01-12 15:42:46 +01:00 |
|
|
Lars van Hijfte
|
d2ab86c0a2
|
Prepared for uniform css inputs
|
2017-01-12 15:41:46 +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 |
|
|
Lars van Hijfte
|
0b67cfe28a
|
Merge branch 'master' into lars-algemeen
|
2017-01-12 15:13:38 +01:00 |
|
|
Lars van Hijfte
|
2905a9efee
|
Changed background color header
|
2017-01-12 15:13:09 +01:00 |
|
|
Marijn Jansen
|
e9c883529b
|
Merge branch 'master' into 'joey-testing'
# Conflicts:
# website/login.php
|
2017-01-12 15:04:07 +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 |
|
|
Joey Lai
|
36192c6bf4
|
fixed spelling and grammar
|
2017-01-12 14:44:59 +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 |
|
|
Joey Lai
|
4cb9a83d62
|
fixed identation
|
2017-01-12 14:18:49 +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 |
|
|
Lars van Hijfte
|
9f3f0d1f96
|
Real initial search commit
|
2017-01-12 11:22:30 +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
|
21f9f887d9
|
Merge branch 'master' into lars-algemeen
|
2017-01-12 10:46:48 +01:00 |
|
|
Lars van Hijfte
|
1912e11f76
|
Added href to the links.
Zoek -> search.php
Instellingen -> settings.php
Uitloggen -> login.php
|
2017-01-12 10:44:58 +01:00 |
|
|
Marijn Jansen
|
4da0549d85
|
Merge branch 'joey-testing' into 'master'
email matching
See merge request !17
|
2017-01-12 10:39:20 +01:00 |
|
|
Joey Lai
|
93e35704e1
|
email matching
|
2017-01-12 10:33:48 +01:00 |
|
|
Marijn Jansen
|
0b5ef0f327
|
Merge branch 'joey-testing' into 'master'
changes
See merge request !16
|
2017-01-12 10:11:35 +01:00 |
|
|
Joey Lai
|
35aa7b240a
|
changes
|
2017-01-12 10:10:09 +01:00 |
|
|
Marijn Jansen
|
c696fe6afb
|
Merge branch 'joey-testing' into 'master'
submit links fixed
See merge request !15
|
2017-01-11 16:16:56 +01:00 |
|
|
Joey Lai
|
05beb054d2
|
submit links fixed
|
2017-01-11 16:13:42 +01:00 |
|