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 |
|
Marijn Jansen
|
903badfe6a
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !20
|
2017-01-12 11:40:22 +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 |
|
Marijn Jansen
|
f377491dde
|
Merge branch 'lars-search' into 'master'
Lars search
See merge request !19
|
2017-01-12 11:30:28 +01:00 |
|
Kevin Nobel
|
687b08f440
|
Made friends and groups box responsive
|
2017-01-12 11:29:17 +01:00 |
|
Marijn Jansen
|
f9115dd9a3
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !18
|
2017-01-12 11:26:08 +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 |
|
Kevin Nobel
|
a353cfb156
|
Retry gitignore: changed .idea/* to /.idea/*
|
2017-01-12 11:14:45 +01:00 |
|
Kevin Nobel
|
3558d80a57
|
Added .idea/* to .gitignore
|
2017-01-12 11:12:47 +01:00 |
|
Lars van Hijfte
|
21f9f887d9
|
Merge branch 'master' into lars-algemeen
|
2017-01-12 10:46:48 +01:00 |
|
Marijn Jansen
|
e765be40aa
|
Merge remote-tracking branch 'origin/master'
|
2017-01-12 10:45:35 +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
|
1858a0964e
|
Added some .idea files to the gitignore.
|
2017-01-12 10:44:30 +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 |
|
Marijn Jansen
|
87e9d38527
|
Merge branch 'lars-algemeen' into 'master'
Fixed the data-title hover bug
See merge request !14
|
2017-01-11 16:07:56 +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 |
|
Kevin Nobel
|
41e172f353
|
Added professional images of cats.
|
2017-01-11 15:56:31 +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
|
1ecf8196de
|
fixed style link
|
2017-01-11 15:46:39 +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 |
|
Joey Lai
|
e36caf46ce
|
Added Login page
|
2017-01-11 15:41:27 +01:00 |
|
Marijn Jansen
|
6b9a322d4e
|
Merge branch 'marijn-chat' into 'master'
Marijn chat
See merge request !11
|
2017-01-11 15:37:16 +01:00 |
|
Marijn Jansen
|
a2f51aa05e
|
Updated Header links
|
2017-01-11 15:36:55 +01:00 |
|
Marijn Jansen
|
49e64cfb55
|
Fixed double chat field
|
2017-01-11 15:33:22 +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
|
06d6b8e26e
|
Merge branch 'lars-chat' into 'marijn-chat'
Fixed chat size.
It is all fixed, litteraly.
See merge request !10
|
2017-01-11 15:32:10 +01:00 |
|