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

4bc2bcedd1 Fixed bugs Lars van Hijfte 2017-01-13 15:47:59 +01:00
96dd0864ee Fixed login new filetree Marijn Jansen 2017-01-13 15:47:35 +01:00
60fabf30e4 Merge branch 'joey-testing' Marijn Jansen 2017-01-13 15:44:00 +01:00
bd36258548 fixed php Joey Lai 2017-01-13 15:38:23 +01:00
16e9423851 Merge branch 'marijn-newFileStructure' into 'master' Marijn Jansen 2017-01-13 14:46:54 +01:00
1cffad77d6 rename html folder to public Marijn Jansen 2017-01-13 14:44:45 +01:00
faf5442528 Moves splt private and public files Marijn Jansen 2017-01-13 14:26:38 +01:00
120e02f4d1 Merge branch 'marijn-css' into 'master' Marijn Jansen 2017-01-13 12:28:01 +01:00
5bb7fbf7a9 Item-box from profile.css to main.css Marijn Jansen 2017-01-13 12:26:38 +01:00
c60ba995a0 Merge branch 'marijn-indent' into 'master' Marijn Jansen 2017-01-13 12:15:03 +01:00
1db9826de5 Fixed Indent Marijn Jansen 2017-01-13 12:14:44 +01:00
a49b906217 Merge branch 'lars-chat' into 'master' Marijn Jansen 2017-01-13 12:06:54 +01:00
fe11b79380 Merge branch 'master' into lars-chat Lars van Hijfte 2017-01-13 12:05:17 +01:00
b0e3d43e13 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-13 12:04:55 +01:00
faddbf0939 Merge branch 'marijn-csscleanup' into 'master' Marijn Jansen 2017-01-13 12:04:36 +01:00
9db7c6776c Moved <head>-tag to the page files, not all css files will be loaded for each page. Marijn Jansen 2017-01-13 12:03:46 +01:00
8c1bacf894 Styled and rearranged chat-view Lars van Hijfte 2017-01-13 12:01:12 +01:00
d61694b543 FIXED identation Joey Lai 2017-01-13 11:49:55 +01:00
3cd0772224 Cleanup in main.css Marijn Jansen 2017-01-13 11:48:26 +01:00
f9fc79ad31 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-13 11:39:47 +01:00
e07281bbff FIXED things Joey Lai 2017-01-13 11:38:55 +01:00
621fb2868d Merge branch 'lars-search' into 'master' Marijn Jansen 2017-01-13 11:20:20 +01:00
e9a41becf0 Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-13 11:20:09 +01:00
51b444a186 Merge branch 'master' into lars-chat Lars van Hijfte 2017-01-13 11:11:44 +01:00
057275d513 Restyled the search page Lars van Hijfte 2017-01-13 11:09:09 +01:00
e315c789e4 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-13 10:57:44 +01:00
83de4e4f8a fixed Add friend picture on profile page Marijn Jansen 2017-01-13 10:57:06 +01:00
661c3c3bce Merge branch 'hendrik-testing' into 'master' Marijn Jansen 2017-01-13 10:53:26 +01:00
7f97d7d35a Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-13 10:53:09 +01:00
807361e654 Updated colour for footer. Marijn Jansen 2017-01-13 10:52:05 +01:00
acb19c2354 Merge branch 'master' into hendrik-testing Hendrik 2017-01-13 10:50:54 +01:00
c3bf3fadc7 ready for merge Hendrik 2017-01-13 10:50:15 +01:00
313b6462e2 Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-13 10:47:47 +01:00
863fde55e9 minor fixes Hendrik 2017-01-13 10:46:09 +01:00
a0e2c60ddb Merge branch 'master' into kevin-prototype K. Nobel 2017-01-13 10:42:39 +01:00
02149565ce Fixed post width for Chrome K. Nobel 2017-01-13 10:39:37 +01:00
3c039d71cc Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-13 10:39:18 +01:00
f8c690615c Merge branch 'hendrik-testing' into 'master' Marijn Jansen 2017-01-13 10:38:54 +01:00
83c994468f ready for merge Hendrik 2017-01-13 10:37:06 +01:00
8d569ac706 Merge branch 'master' into marijn-settings Marijn Jansen 2017-01-13 10:30:05 +01:00
9c73da34fe Merge branch 'master' into hendrik-testing Hendrik 2017-01-13 10:24:16 +01:00
8852a0d918 use platform Hendrik 2017-01-13 10:23:31 +01:00
89df0aba52 readied for merge Hendrik 2017-01-13 10:20:34 +01:00
042ec212b2 Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing Joey Lai 2017-01-13 10:14:07 +01:00
58779a3d4d cleaning Hendrik 2017-01-12 15:59:16 +01:00
d14688295f add title, slight css modification Hendrik 2017-01-12 15:55:25 +01:00
984800fd0c End of day. Marijn Jansen 2017-01-12 15:52:14 +01:00
bf640b2690 Merge branch 'master' into lars-search Lars van Hijfte 2017-01-12 15:42:46 +01:00
d2ab86c0a2 Prepared for uniform css inputs Lars van Hijfte 2017-01-12 15:41:46 +01:00
5f8877afd5 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-12 15:41:34 +01:00
f481c1c611 More uniform main css file. Marijn Jansen 2017-01-12 15:41:13 +01:00
489d330d47 Merge branch 'master' into marijn-settings Marijn Jansen 2017-01-12 15:21:08 +01:00
d900edfcda Updated buttons Marijn Jansen 2017-01-12 15:20:47 +01:00
0b67cfe28a Merge branch 'master' into lars-algemeen Lars van Hijfte 2017-01-12 15:13:38 +01:00
2905a9efee Changed background color header Lars van Hijfte 2017-01-12 15:13:09 +01:00
8b0ce920d7 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-12 15:04:26 +01:00
e9c883529b Merge branch 'master' into 'joey-testing' Marijn Jansen 2017-01-12 15:04:07 +01:00
c15643128a Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-12 15:02:51 +01:00
b95aa49c32 Styled chat page Lars van Hijfte 2017-01-12 14:59:29 +01:00
4b900b3721 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-12 14:50:39 +01:00
2bc11a87e4 Added Email settings Marijn Jansen 2017-01-12 14:49:11 +01:00
36192c6bf4 fixed spelling and grammar Joey Lai 2017-01-12 14:44:59 +01:00
fd171d01f3 Merge branch 'master' into lars-search Lars van Hijfte 2017-01-12 14:37:01 +01:00
1b97b1fad3 slightly modified css Hendrik 2017-01-12 14:32:56 +01:00
0e44fb34c0 removed padding in input search Lars van Hijfte 2017-01-12 14:32:39 +01:00
10558a6877 Merge branch 'master' into marijn-settings Marijn Jansen 2017-01-12 14:21:28 +01:00
eeedbe5c05 More fields Marijn Jansen 2017-01-12 14:19:08 +01:00
4cb9a83d62 fixed identation Joey Lai 2017-01-12 14:18:49 +01:00
6c9841483a Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-12 13:11:01 +01:00
5c96744507 Datepicker added Joey Lai 2017-01-12 13:03:46 +01:00
2434ffc675 Added filter on the search page. Lars van Hijfte 2017-01-12 12:20:47 +01:00
39b849d7ee Added default padding to the input fields Lars van Hijfte 2017-01-12 12:19:07 +01:00
d2fd6c899d Merge branch 'marijn-chat' into 'master' Marijn Jansen 2017-01-12 12:15:45 +01:00
fabfb416e8 Changed input default style Lars van Hijfte 2017-01-12 12:14:09 +01:00
b82ac7ec59 More settings Marijn Jansen 2017-01-12 12:12:54 +01:00
65768d385a Merge branch 'hendrik-testing' into 'master' Marijn Jansen 2017-01-12 12:02:29 +01:00
96c114cc10 added ban status Hendrik 2017-01-12 11:59:48 +01:00
cfa119fef0 added check all box Hendrik 2017-01-12 11:54:56 +01:00
903badfe6a Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-12 11:40:22 +01:00
fffc418f4c Changed style of windows, we now use the platform class. Kevin Nobel 2017-01-12 11:38:56 +01:00
06c24ec096 Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-settings Marijn Jansen 2017-01-12 11:36:26 +01:00
18b29d9ec5 Merge branch 'master' into kevin-prototype Kevin Nobel 2017-01-12 11:33:02 +01:00
f377491dde Merge branch 'lars-search' into 'master' Marijn Jansen 2017-01-12 11:30:28 +01:00
687b08f440 Made friends and groups box responsive Kevin Nobel 2017-01-12 11:29:17 +01:00
f9115dd9a3 Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-12 11:26:08 +01:00
9f3f0d1f96 Real initial search commit Lars van Hijfte 2017-01-12 11:22:30 +01:00
559fe9bb98 Made grid layout responsive Kevin Nobel 2017-01-12 11:20:44 +01:00
3505090eb9 Initial search page and added class platform Lars van Hijfte 2017-01-12 11:20:27 +01:00
72d3a5ad8a added adminpanel main layout/concept Hendrik 2017-01-12 11:16:57 +01:00
a353cfb156 Retry gitignore: changed .idea/* to /.idea/* Kevin Nobel 2017-01-12 11:14:45 +01:00
3558d80a57 Added .idea/* to .gitignore Kevin Nobel 2017-01-12 11:12:47 +01:00
319a406d6f Added settings page. Marijn Jansen 2017-01-12 11:00:44 +01:00
21f9f887d9 Merge branch 'master' into lars-algemeen Lars van Hijfte 2017-01-12 10:46:48 +01:00
e765be40aa Merge remote-tracking branch 'origin/master' Marijn Jansen 2017-01-12 10:45:35 +01:00
1912e11f76 Added href to the links. Lars van Hijfte 2017-01-12 10:44:58 +01:00
1858a0964e Added some .idea files to the gitignore. Marijn Jansen 2017-01-12 10:44:30 +01:00
4da0549d85 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-12 10:39:20 +01:00
93e35704e1 email matching Joey Lai 2017-01-12 10:33:48 +01:00
0b5ef0f327 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-12 10:11:35 +01:00
35aa7b240a changes Joey Lai 2017-01-12 10:10:09 +01:00

... 4 5 6 7 8