WebDB

MyHyvesBookPlus/WebDB

Fork 0

Commit Graph

Select branches

Hide Pull Requests

hendrik-post

hendrik-search

hendrik-testing

joey-testing

kevin-prototype

lars

lars-algemeen

lars-chat

marijn-button

marijn-favicon

marijn-groups

marijn-postPicture

marijn-postdelete

marijn-settings

master

revert-50e94fb8

safari-chat

technischrapporrt

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#33

#34

#35

#36

#37

#38

#39

#40

#41

#42

#43

#44

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

c696fe6afb Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-11 16:16:56 +01:00
05beb054d2 submit links fixed Joey Lai 2017-01-11 16:13:42 +01:00
87e9d38527 Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-11 16:07:56 +01:00
fae353fee3 Fixed the data-title hover bug Lars van Hijfte 2017-01-11 16:06:49 +01:00
655c2ccbeb Small Ajustments Marijn Jansen 2017-01-11 16:02:02 +01:00
41e172f353 Added professional images of cats. Kevin Nobel 2017-01-11 15:56:31 +01:00
9db9118613 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-11 15:55:05 +01:00
c2900507ad Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-11 15:53:21 +01:00
93df059ae6 Merge branch 'master' into kevin-prototype Kevin Nobel 2017-01-11 15:47:29 +01:00
1ecf8196de fixed style link Joey Lai 2017-01-11 15:46:39 +01:00
392a60baff Added style for index Joey Lai 2017-01-11 15:42:58 +01:00
5be19ce91d Added group view Kevin Nobel 2017-01-11 15:42:32 +01:00
e36caf46ce Added Login page Joey Lai 2017-01-11 15:41:27 +01:00
6b9a322d4e Merge branch 'marijn-chat' into 'master' Marijn Jansen 2017-01-11 15:37:16 +01:00
a2f51aa05e Updated Header links Marijn Jansen 2017-01-11 15:36:55 +01:00
49e64cfb55 Fixed double chat field Marijn Jansen 2017-01-11 15:33:22 +01:00
1f6b92ea7b Merge branch 'marijn-chat' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat Marijn Jansen 2017-01-11 15:32:22 +01:00
06d6b8e26e Merge branch 'lars-chat' into 'marijn-chat' Marijn Jansen 2017-01-11 15:32:10 +01:00
544db8b608 Merge branch 'marijn-chat' into 'lars-chat' Marijn Jansen 2017-01-11 15:31:49 +01:00
0f562bd39c Fixed chat size. Lars van Hijfte 2017-01-11 15:29:47 +01:00
92b9f747eb Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat Marijn Jansen 2017-01-11 15:26:46 +01:00
1e6e454de4 Small changes Marijn Jansen 2017-01-11 15:26:01 +01:00
b4c7bfb1ef We now use inline-flex for the post grid instead of float left. Kevin Nobel 2017-01-11 15:11:42 +01:00
b8e61e641a Fixed tooltip bug (only worked with hyperlinks before Kevin Nobel 2017-01-11 15:09:24 +01:00
38079cbcaf Added Friend list in chat. Marijn Jansen 2017-01-11 14:38:07 +01:00
5a33d975fa Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-11 14:06:23 +01:00
916589dac7 Merge branch 'master' into marijn-chat Marijn Jansen 2017-01-11 14:04:53 +01:00
69d1ee9cd8 Merge branch 'master' into kevin-prototype Kevin Nobel 2017-01-11 14:04:51 +01:00
eecdcad538 "before merge" Marijn Jansen 2017-01-11 14:04:04 +01:00
cd93dcb719 Small changes to profile page, added friend request button Kevin Nobel 2017-01-11 14:00:10 +01:00
4be13bb66c Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-11 13:54:21 +01:00
24e0673caa Added extra functions to the header. Lars van Hijfte 2017-01-11 13:49:54 +01:00
87e7bf18d4 Fixed username in connection Lars van Hijfte 2017-01-11 13:39:49 +01:00
458b6e11ff Added font awesome Lars van Hijfte 2017-01-11 13:38:40 +01:00
8761c89f75 Added a footer. Lars van Hijfte 2017-01-11 13:07:52 +01:00
fc0b801d7d Added groups to the menu. Lars van Hijfte 2017-01-11 13:06:09 +01:00
7aaa6a80f1 Added footer include Lars van Hijfte 2017-01-11 13:05:01 +01:00
33a1c0502a Added footer include Lars van Hijfte 2017-01-11 13:04:23 +01:00
019a89c865 Merge branch 'master' into kevin-prototype Kevin Nobel 2017-01-11 11:30:04 +01:00
ee7a91a6aa Commit before merge Kevin Nobel 2017-01-11 11:26:42 +01:00
5b4d773d93 Merge branch 'master' into marijn-chat Marijn Jansen 2017-01-11 11:15:03 +01:00
17d1f96a02 Merge with current master Marijn Jansen 2017-01-11 11:14:07 +01:00
c354bdb330 fixed merge Lars van Hijfte 2017-01-11 11:13:04 +01:00
e90ecda436 Added a menu Lars van Hijfte 2017-01-11 11:10:32 +01:00
8d0f2d40b7 Merge branch 'marijn-chat' into 'master' Marijn Jansen 2017-01-11 10:56:50 +01:00
8b74917b21 New Logo Marijn Jansen 2017-01-11 10:56:03 +01:00
b973e666da Fixed spacing on the chat page. Marijn Jansen 2017-01-10 20:58:56 +01:00
81e4d1e874 Fixed for merge Marijn Jansen 2017-01-10 17:12:16 +01:00
40ce3d57b3 Added profile view. (WIP) Kevin Nobel 2017-01-10 17:09:11 +01:00
cf240ca656 Almost a chatpage! Marijn Jansen 2017-01-10 17:08:40 +01:00
ac369b5705 Almost a chatpage! Marijn Jansen 2017-01-10 17:06:52 +01:00
8a6293cb8d Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-10 16:54:47 +01:00
b6d2ad92d0 removed ftpconfig Lars van Hijfte 2017-01-10 16:53:57 +01:00
3e594e6a65 added atom ftpconfig Lars van Hijfte 2017-01-10 16:50:20 +01:00
f8d66720bd Added a header Lars van Hijfte 2017-01-10 16:43:16 +01:00
9f7832ed6a Merge branch 'marijn-chat' into 'master' Marijn Jansen 2017-01-10 15:20:10 +01:00
199a77219d Added logo.png Marijn Jansen 2017-01-10 15:19:50 +01:00
a20e938ab7 Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-10 15:17:28 +01:00
58d40dd9b4 Merge branch 'master' into kevin-prototype Kevin Nobel 2017-01-10 15:16:04 +01:00
aebb9faefa Fixed the css import Lars van Hijfte 2017-01-10 15:15:37 +01:00
5b4c93b3c3 Removed .idea folder Kevin Nobel 2017-01-10 15:15:12 +01:00
3b88155d4f Merge branch 'marijn-chat' into 'master' Marijn Jansen 2017-01-10 15:09:57 +01:00
9c0d1b19f0 Merges css files Marijn Jansen 2017-01-10 15:09:14 +01:00
9c88ecd5ae Merge branch 'master' into marijn-chat Marijn Jansen 2017-01-10 14:54:26 +01:00
a727fd8c5f Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-10 14:51:06 +01:00
3cbfaf8d30 Added default.css Kevin Nobel 2017-01-10 14:49:40 +01:00
c71afda5f1 Merge branch 'master' into marijn-chat Marijn Jansen 2017-01-10 14:44:27 +01:00
eeb3867b85 Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-10 14:40:46 +01:00
fd884f33ef Changed a view name Lars van Hijfte 2017-01-10 14:37:21 +01:00
4da39d5bab This inserts the map structure we will use for the project. Lars van Hijfte 2017-01-10 14:35:56 +01:00
5a3f4e4b09 .idea added Marijn Jansen 2017-01-10 14:18:17 +01:00
df0895aebf minor text fixes Hendrik 2017-01-10 14:05:36 +01:00
a0934f7395 added website Marijn Jansen 2017-01-10 13:47:17 +01:00
fe29289a93 Projectplan af Marijn Jansen 2017-01-10 12:49:53 +01:00
4e09d05be8 Updated Ignore Marijn Jansen 2017-01-10 12:49:38 +01:00
9f613871cf Added Projectplan Marijn Jansen 2017-01-10 10:58:10 +01:00
c9cb9d110d Update .gitignore with TeX Marijn Jansen 2017-01-09 11:14:34 +01:00
56025675ae Add .gitignore (contains macOS, Linux and JetBrains). Marijn Jansen 2016-12-16 15:36:38 +01:00

... 4 5 6 7 8