Marijn Jansen
|
eeedbe5c05
|
More fields
|
2017-01-12 14:19:08 +01:00 |
|
Marijn Jansen
|
b82ac7ec59
|
More settings
|
2017-01-12 12:12:54 +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 |
|
Marijn Jansen
|
f377491dde
|
Merge branch 'lars-search' into 'master'
Lars search
See merge request !19
|
2017-01-12 11:30:28 +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 |
|
Lars van Hijfte
|
3505090eb9
|
Initial search page and added class platform
|
2017-01-12 11:20:27 +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 |
|
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
|
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 |
|
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 |
|
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
|
5a33d975fa
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !9
|
2017-01-11 14:06:23 +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 |
|
Marijn Jansen
|
4be13bb66c
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !8
|
2017-01-11 13:54:21 +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
|
87e7bf18d4
|
Fixed username in connection
|
2017-01-11 13:39:49 +01:00 |
|
Lars van Hijfte
|
458b6e11ff
|
Added font awesome
|
2017-01-11 13:38:40 +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 |
|
Lars van Hijfte
|
7aaa6a80f1
|
Added footer include
|
2017-01-11 13:05:01 +01:00 |
|