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

449b500636 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-23 13:26:10 +01:00
af11297fad Merge branch 'marijn-button' into 'master' Marijn Jansen 2017-01-23 13:25:07 +01:00
46b47d5f8d Merge branch 'master' into marijn-button marijn-button Marijn Jansen 2017-01-23 13:24:35 +01:00
21ff896d65 Fixed css and confirmation for logged in already Joey Lai 2017-01-23 13:24:13 +01:00
86b7e17137 new button! Marijn Jansen 2017-01-23 13:24:12 +01:00
76eb2dee7c Merge branch 'lars-algemeen' into 'master' Lars van Hijfte 2017-01-23 13:17:57 +01:00
1ec8de71f0 Changed menu view Lars van Hijfte 2017-01-23 13:17:01 +01:00
a165878aa8 Merge branch 'master' into lars-algemeen Lars van Hijfte 2017-01-23 11:34:09 +01:00
93b6835ea4 Changed style and added friendrequests Lars van Hijfte 2017-01-23 11:33:27 +01:00
8ba7583e85 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-22 11:24:02 +01:00
2a44057233 Changed binParam for bindValue Marijn Jansen 2017-01-22 11:23:13 +01:00
71202ab857 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-20 16:26:19 +01:00
95aaba7e7e Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing Joey Lai 2017-01-20 16:25:38 +01:00
e33210ce5e Merge branch 'master' into joey-testing Joey Lai 2017-01-20 16:24:59 +01:00
9edf065c81 Merge branch 'lars-algemeen' into 'master' Lars van Hijfte 2017-01-20 16:22:52 +01:00
bf78b80a30 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-20 16:22:18 +01:00
3ae00f52bf Merge branch 'master' into lars-algemeen Lars van Hijfte 2017-01-20 16:21:54 +01:00
ac96200d16 Kind of works now: Profile update Marijn Jansen 2017-01-20 16:20:34 +01:00
a08e5a346a Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-01-20 16:20:29 +01:00
3039839656 Merge branch 'hendrik-search' into 'master' Lars van Hijfte 2017-01-20 16:20:03 +01:00
e456591db6 Merge branch 'master' into joey-testing Joey Lai 2017-01-20 16:18:57 +01:00
581f6e18f0 Merge branch 'master' into hendrik-search Hendrik 2017-01-20 16:18:53 +01:00
a87b5e709b Merge branch 'master' into kevin-prototype K. Nobel 2017-01-20 16:18:36 +01:00
18185020c3 Added improvements to profile page. K. Nobel 2017-01-20 16:18:12 +01:00
9152ae4f75 add searching users, searching groups, remembering search options Hendrik 2017-01-20 16:18:09 +01:00
173ef3e50c Added a notification bar Lars van Hijfte 2017-01-20 16:17:56 +01:00
6ff70440e6 history back -> profile.php Joey Lai 2017-01-20 16:14:32 +01:00
82fc1e5266 Merge branch 'master' into 'joey-testing' Joey Lai 2017-01-20 16:06:16 +01:00
e17a55e82d Fixed redirect to profile page after going back 1 page Joey Lai 2017-01-20 16:01:08 +01:00
7e3648d36c Merge branch 'marijn-settings' Marijn Jansen 2017-01-20 15:42:00 +01:00
587d0e6ac3 fixed crosssitescripting on settings pagw Marijn Jansen 2017-01-20 15:41:13 +01:00
696f4ebc1e Merge branch 'hendrik-testing' into 'master' Lars van Hijfte 2017-01-20 15:40:43 +01:00
b1348a3d0e Merge branch 'master' into hendrik-testing Hendrik 2017-01-20 15:39:44 +01:00
b1e01699eb Merge branch 'master' into marijn-settings Marijn Jansen 2017-01-20 15:36:10 +01:00
064fe93ba7 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-20 15:35:15 +01:00
e7d63c2f57 Changed how name is displayed on profile page. K. Nobel 2017-01-20 15:34:01 +01:00
15a3640eea Added arrow button for going to login.php Joey Lai 2017-01-20 15:25:37 +01:00
0eb292d654 Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-20 15:06:03 +01:00
cda439be8d Merge branch 'master' into kevin-prototype K. Nobel 2017-01-20 15:04:47 +01:00
e547712b2a Changed links to absolute path. K. Nobel 2017-01-20 15:02:05 +01:00
59d4740ad5 Alpha 0.0.1 profile picture upload shizzle! Marijn Jansen 2017-01-20 14:55:47 +01:00
3bd2b3c02e Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-01-20 14:49:05 +01:00
ca28724274 Fixed script tags and @import. Has to be absolute path in order to work with the .htaccess file. K. Nobel 2017-01-20 14:48:00 +01:00
4218860936 remove testinput Hendrik 2017-01-20 14:43:04 +01:00
0956dce303 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-01-20 14:41:11 +01:00
ada54561c7 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-20 14:40:36 +01:00
6478ce920f Fixed .htaccess K. Nobel 2017-01-20 14:40:21 +01:00
c9bdbcf3b5 Merge branch 'hendrik-testing' into 'master' Lars van Hijfte 2017-01-20 14:36:58 +01:00
c88f3b6423 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-01-20 14:36:37 +01:00
adb7f2f37d Fixed .htaccess K. Nobel 2017-01-20 14:31:49 +01:00
ea3f1c9693 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-20 14:29:55 +01:00
0e5f7dc9fb Fixed no friends text and no groups text. K. Nobel 2017-01-20 14:10:32 +01:00
f9c55323ad Made friends and groups clickable. K. Nobel 2017-01-20 14:09:04 +01:00
b7620fe4db Moved .htaccess K. Nobel 2017-01-20 14:05:20 +01:00
756589b323 Merge branch 'lars-algemeen' into 'master' Lars van Hijfte 2017-01-20 13:33:35 +01:00
61c148e127 Made chat xss prove Lars van Hijfte 2017-01-20 13:30:40 +01:00
14d96e89ad Merge branch 'master' into hendrik-testing Hendrik 2017-01-20 13:15:06 +01:00
6418b2b679 move js to /js Hendrik 2017-01-20 13:14:28 +01:00
dbb497cce5 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-20 13:08:07 +01:00
bfdf9e989b Fixed profile page, now shows current user when no username is given in get variable. K. Nobel 2017-01-20 13:07:47 +01:00
0f02859124 fix queries for global and prepared Hendrik 2017-01-20 12:58:34 +01:00
28578adb11 Merge branch 'lars-algemeen' into 'master' Lars van Hijfte 2017-01-20 12:54:24 +01:00
6c41e825fe Removed absolute path Lars van Hijfte 2017-01-20 12:53:23 +01:00
a2846c392c Merge branch 'master' into lars-algemeen Lars van Hijfte 2017-01-20 12:48:22 +01:00
cc9ec9d54a Merge branch 'master' into joey-testing Joey Lai 2017-01-20 12:33:39 +01:00
eb1fc15401 script on right lines Joey Lai 2017-01-20 12:32:39 +01:00
daff2f41fa minor fix Hendrik 2017-01-20 12:29:34 +01:00
1db998c1bd Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-20 12:27:58 +01:00
b6f6c44cea Merge branch 'master' into lars-algemeen Lars van Hijfte 2017-01-20 12:26:22 +01:00
50cec9beed Added things to the menu. Lars van Hijfte 2017-01-20 12:25:18 +01:00
1cfcba80fc Merge branch 'master' into kevin-prototype K. Nobel 2017-01-20 12:18:47 +01:00
c93579913d Merge branch 'master' into hendrik-testing Hendrik 2017-01-20 12:14:17 +01:00
142bae139b Profile will now show the current users page when a username is not given in a get request. K. Nobel 2017-01-20 12:14:05 +01:00
3152839dae add javascript for userlist tablehead checkall box, fix pageselector css Hendrik 2017-01-20 12:06:23 +01:00
3752f3cd33 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-20 12:02:12 +01:00
44bbbfeaae fixed ; Joey Lai 2017-01-20 12:01:27 +01:00
d962d12023 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-20 11:59:14 +01:00
66e4fa189c added echo Joey Lai 2017-01-20 11:58:33 +01:00
eeba421e3c Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-20 11:58:14 +01:00
dfc04be8b6 added script to window.onload Joey Lai 2017-01-20 11:56:30 +01:00
f388993f63 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-20 11:54:02 +01:00
db2fb1b353 added checked already logged in function Joey Lai 2017-01-20 11:51:50 +01:00
afb7424117 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-20 11:26:27 +01:00
2a086844c3 fixed spelling Joey Lai 2017-01-20 11:25:38 +01:00
4713defff5 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-20 11:23:40 +01:00
5e31590403 Fixed include checkinput.php Joey Lai 2017-01-20 11:19:54 +01:00
0389d05e51 Merge branch 'master' into joey-testing Joey Lai 2017-01-20 10:48:19 +01:00
7df182676a Added comments to checkinput.php Joey Lai 2017-01-20 10:45:53 +01:00
e0d02d283d add page functionality for groups Hendrik 2017-01-19 16:42:45 +01:00
1640d38baa add user page functionality Hendrik 2017-01-19 16:29:38 +01:00
2f1bbd0a8e Merge branch 'master' into kevin-prototype K. Nobel 2017-01-19 16:07:14 +01:00
56b17675fa Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB K. Nobel 2017-01-19 16:04:07 +01:00
7792ceaeeb Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-19 15:59:00 +01:00
64ea5d3f68 Functions with validating Joey Lai 2017-01-19 15:55:28 +01:00
f535bb10ca added .htaccess K. Nobel 2017-01-19 15:50:57 +01:00
64bf448808 Merge branch 'lars-algemeen' into 'master' Lars van Hijfte 2017-01-19 14:56:41 +01:00
f5fa36c09c added 404 image Lars van Hijfte 2017-01-19 14:55:58 +01:00
1be1f393ff Merge branch 'master' into lars-chat Lars van Hijfte 2017-01-19 14:54:42 +01:00
a71cb8adb6 Fixed some extra things Lars van Hijfte 2017-01-19 14:53:12 +01:00
cd1a2855de Merge branch 'marijn-settings' into 'master' Lars van Hijfte 2017-01-19 13:56:39 +01:00

... 3 4 5 6 7 ...