Marijn Jansen
|
120e02f4d1
|
Merge branch 'marijn-css' into 'master'
Item-box from profile.css to main.css
See merge request !43
|
2017-01-13 12:28:01 +01:00 |
|
Marijn Jansen
|
5bb7fbf7a9
|
Item-box from profile.css to main.css
|
2017-01-13 12:26:38 +01:00 |
|
Marijn Jansen
|
1db9826de5
|
Fixed Indent
|
2017-01-13 12:14:44 +01:00 |
|
Lars van Hijfte
|
fe11b79380
|
Merge branch 'master' into lars-chat
|
2017-01-13 12:05:17 +01:00 |
|
Marijn Jansen
|
b0e3d43e13
|
Merge branch 'joey-testing' into 'master'
FIXED identation
See merge request !38
|
2017-01-13 12:04:55 +01:00 |
|
Marijn Jansen
|
faddbf0939
|
Merge branch 'marijn-csscleanup' into 'master'
Marijn csscleanup
See merge request !39
|
2017-01-13 12:04:36 +01:00 |
|
Marijn Jansen
|
9db7c6776c
|
Moved <head>-tag to the page files, not all css files will be loaded for each page.
|
2017-01-13 12:03:46 +01:00 |
|
Lars van Hijfte
|
8c1bacf894
|
Styled and rearranged chat-view
|
2017-01-13 12:01:12 +01:00 |
|
Joey Lai
|
d61694b543
|
FIXED identation
|
2017-01-13 11:49:55 +01:00 |
|
Marijn Jansen
|
3cd0772224
|
Cleanup in main.css
|
2017-01-13 11:48:26 +01:00 |
|
Marijn Jansen
|
f9fc79ad31
|
Merge branch 'joey-testing' into 'master'
FIXED things
See merge request !37
|
2017-01-13 11:39:47 +01:00 |
|
Joey Lai
|
e07281bbff
|
FIXED things
|
2017-01-13 11:38:55 +01:00 |
|
Marijn Jansen
|
621fb2868d
|
Merge branch 'lars-search' into 'master'
Lars search
See merge request !36
|
2017-01-13 11:20:20 +01:00 |
|
Marijn Jansen
|
e9a41becf0
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !35
|
2017-01-13 11:20:09 +01:00 |
|
Lars van Hijfte
|
51b444a186
|
Merge branch 'master' into lars-chat
|
2017-01-13 11:11:44 +01:00 |
|
Lars van Hijfte
|
057275d513
|
Restyled the search page
Split users and groups
added a search button
made some boxes required
|
2017-01-13 11:09:09 +01:00 |
|
Marijn Jansen
|
83de4e4f8a
|
fixed Add friend picture on profile page
|
2017-01-13 10:57:06 +01:00 |
|
Marijn Jansen
|
661c3c3bce
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !32
|
2017-01-13 10:53:26 +01:00 |
|
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 |
|
Hendrik
|
acb19c2354
|
Merge branch 'master' into hendrik-testing
|
2017-01-13 10:50:54 +01:00 |
|
Hendrik
|
c3bf3fadc7
|
ready for merge
|
2017-01-13 10:50:15 +01:00 |
|
Hendrik
|
863fde55e9
|
minor fixes
|
2017-01-13 10:46:09 +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 |
|
Marijn Jansen
|
3c039d71cc
|
Merge branch 'joey-testing' into 'master'
Joey testing
See merge request !29
|
2017-01-13 10:39:18 +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 |
|
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 |
|