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 |
|
Lars van Hijfte
|
33a1c0502a
|
Added footer include
|
2017-01-11 13:04:23 +01:00 |
|
Kevin Nobel
|
019a89c865
|
Merge branch 'master' into kevin-prototype
|
2017-01-11 11:30:04 +01:00 |
|
Kevin Nobel
|
ee7a91a6aa
|
Commit before merge
|
2017-01-11 11:26:42 +01:00 |
|
Marijn Jansen
|
5b4d773d93
|
Merge branch 'master' into marijn-chat
|
2017-01-11 11:15:03 +01:00 |
|
Marijn Jansen
|
17d1f96a02
|
Merge with current master
|
2017-01-11 11:14:07 +01:00 |
|
Lars van Hijfte
|
c354bdb330
|
fixed merge
|
2017-01-11 11:13:04 +01:00 |
|
Lars van Hijfte
|
e90ecda436
|
Added a menu
It contains a list of friends and a "more" button.
This also offsets the content to the right.
|
2017-01-11 11:10:32 +01:00 |
|
Marijn Jansen
|
8d0f2d40b7
|
Merge branch 'marijn-chat' into 'master'
Marijn chat
See merge request !7
|
2017-01-11 10:56:50 +01:00 |
|
Marijn Jansen
|
8b74917b21
|
New Logo
|
2017-01-11 10:56:03 +01:00 |
|
Marijn Jansen
|
b973e666da
|
Fixed spacing on the chat page.
|
2017-01-10 20:58:56 +01:00 |
|
Marijn Jansen
|
81e4d1e874
|
Fixed for merge
|
2017-01-10 17:12:16 +01:00 |
|
Kevin Nobel
|
40ce3d57b3
|
Added profile view. (WIP)
|
2017-01-10 17:09:11 +01:00 |
|
Marijn Jansen
|
cf240ca656
|
Almost a chatpage!
|
2017-01-10 17:08:40 +01:00 |
|
Marijn Jansen
|
ac369b5705
|
Almost a chatpage!
|
2017-01-10 17:06:52 +01:00 |
|
Marijn Jansen
|
8a6293cb8d
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !6
|
2017-01-10 16:54:47 +01:00 |
|
Lars van Hijfte
|
b6d2ad92d0
|
removed ftpconfig
|
2017-01-10 16:53:57 +01:00 |
|
Lars van Hijfte
|
3e594e6a65
|
added atom ftpconfig
|
2017-01-10 16:50:20 +01:00 |
|
Lars van Hijfte
|
f8d66720bd
|
Added a header
Logo, searchbar without functionality and a profile picture. Also gave the content a margin downward because of the header.
|
2017-01-10 16:43:16 +01:00 |
|
Marijn Jansen
|
9f7832ed6a
|
Merge branch 'marijn-chat' into 'master'
Added logo.png
See merge request !5
|
2017-01-10 15:20:10 +01:00 |
|
Marijn Jansen
|
199a77219d
|
Added logo.png
|
2017-01-10 15:19:50 +01:00 |
|
Marijn Jansen
|
a20e938ab7
|
Merge branch 'lars-algemeen' into 'master'
Fixed the css import
See merge request !4
|
2017-01-10 15:17:28 +01:00 |
|
Kevin Nobel
|
58d40dd9b4
|
Merge branch 'master' into kevin-prototype
|
2017-01-10 15:16:04 +01:00 |
|
Lars van Hijfte
|
aebb9faefa
|
Fixed the css import
|
2017-01-10 15:15:37 +01:00 |
|
Kevin Nobel
|
5b4c93b3c3
|
Removed .idea folder
|
2017-01-10 15:15:12 +01:00 |
|
Marijn Jansen
|
3b88155d4f
|
Merge branch 'marijn-chat' into 'master'
Merge css files
See merge request !3
|
2017-01-10 15:09:57 +01:00 |
|
Marijn Jansen
|
9c0d1b19f0
|
Merges css files
|
2017-01-10 15:09:14 +01:00 |
|
Marijn Jansen
|
9c88ecd5ae
|
Merge branch 'master' into marijn-chat
|
2017-01-10 14:54:26 +01:00 |
|
Marijn Jansen
|
a727fd8c5f
|
Merge branch 'kevin-prototype' into 'master'
Added default.css
See merge request !2
|
2017-01-10 14:51:06 +01:00 |
|
Kevin Nobel
|
3cbfaf8d30
|
Added default.css
|
2017-01-10 14:49:40 +01:00 |
|
Marijn Jansen
|
c71afda5f1
|
Merge branch 'master' into marijn-chat
|
2017-01-10 14:44:27 +01:00 |
|
Marijn Jansen
|
eeb3867b85
|
Merge branch 'lars-algemeen' into 'master'
Project Structure
See merge request !1
|
2017-01-10 14:40:46 +01:00 |
|
Lars van Hijfte
|
fd884f33ef
|
Changed a view name
|
2017-01-10 14:37:21 +01:00 |
|
Lars van Hijfte
|
4da39d5bab
|
This inserts the map structure we will use for the project.
|
2017-01-10 14:35:56 +01:00 |
|
Marijn Jansen
|
5a3f4e4b09
|
.idea added
|
2017-01-10 14:18:17 +01:00 |
|
Hendrik
|
df0895aebf
|
minor text fixes
|
2017-01-10 14:05:36 +01:00 |
|