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

490d39ba47 Merge branch 'joey-testing' into 'master' master Lars van Hijfte 2017-02-03 21:20:25 +01:00
1193078e8f Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-02-03 21:19:50 +01:00
a6690a8930 Readme.md technischrapporrt Marijn Jansen 2017-02-03 19:05:45 +01:00
bcb01e3296 Merge branch 'master' into kevin-prototype kevin-prototype K. Nobel 2017-02-03 13:22:59 +01:00
7cc6450e6a Added comments to javascript code. K. Nobel 2017-02-03 13:19:00 +01:00
f566c6eec4 comments hendrik-testing Hendrik 2017-02-03 12:43:24 +01:00
4643dfcddb Fixed comments and links joey-testing Joey Lai 2017-02-03 12:42:30 +01:00
833bfd3292 Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-03 12:42:15 +01:00
1ac6a7da87 Changed admin checkbox buttons lars Lars van Hijfte 2017-02-03 12:40:33 +01:00
52ce787241 Merge remote-tracking branch 'origin/hendrik-testing' into lars Lars van Hijfte 2017-02-03 12:34:19 +01:00
fb5f76c499 ? Lars van Hijfte 2017-02-03 12:32:57 +01:00
f3aebddfea commentses Hendrik 2017-02-03 12:21:37 +01:00
3aae884bb5 Added comments Lars van Hijfte 2017-02-03 12:12:16 +01:00
b07d0712aa Merge branch 'marijn-groups' into hendrik-testing Hendrik 2017-02-03 12:08:42 +01:00
05d6bf8aa6 Added fbModal button Joey Lai 2017-02-03 11:47:16 +01:00
1e60941a3f Merge branch 'marijn-favicon' into 'master' Marijn Jansen 2017-02-03 11:42:40 +01:00
e3f4fa0b3c Favicon marijn-favicon Marijn Jansen 2017-02-03 11:42:16 +01:00
1fd984cc02 Merge branch 'marijn-groups' into lars Lars van Hijfte 2017-02-03 11:31:58 +01:00
6d5de98c1d comments marijn-groups Marijn Jansen 2017-02-03 11:31:18 +01:00
16f83d93ce Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-03 11:21:12 +01:00
306fd3090f Merge branch 'hendrik-testing' into 'master' Lars van Hijfte 2017-02-03 11:20:24 +01:00
771567660c removed session id lol Hendrik 2017-02-03 11:19:06 +01:00
4eae09dfc7 Merge branch 'master' into lars Lars van Hijfte 2017-02-03 11:19:02 +01:00
53e1d7fef3 Fixed admin layout Lars van Hijfte 2017-02-03 11:18:32 +01:00
c29be662bc Session logout now works Lars van Hijfte 2017-02-03 11:18:17 +01:00
000d1f4072 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-02-03 11:16:48 +01:00
d260bf04bc Merge branch 'hendrik-testing' into 'master' Lars van Hijfte 2017-02-03 11:16:36 +01:00
a0ef234b79 Merge branch 'master' into hendrik-testing Hendrik 2017-02-03 11:15:01 +01:00
da061de226 validated adminpanel, added shown friends limit in profile. Hendrik 2017-02-03 11:14:03 +01:00
f18088d8d2 Merge branch 'marijn-groups' into 'master' Marijn Jansen 2017-02-03 11:13:46 +01:00
ac2ce3d07b Merge branch 'master' into marijn-groups Marijn Jansen 2017-02-03 11:13:20 +01:00
ba6f86e70e fixed login Joey Lai 2017-02-03 11:12:30 +01:00
c69b5d8ed3 Comments Marijn Jansen 2017-02-03 11:12:02 +01:00
5de3a84683 Merge branch 'marijn-groups' into 'master' Marijn Jansen 2017-02-03 10:59:35 +01:00
b8d6136a9d Added deadmin! Marijn Jansen 2017-02-03 10:59:10 +01:00
1862369013 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-02-03 10:54:47 +01:00
8d70804155 Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing Joey Lai 2017-02-03 10:52:35 +01:00
0ac12f5110 Merge branch 'master' into joey-testing Joey Lai 2017-02-03 10:48:14 +01:00
5e8fa6791f Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-02-03 10:45:33 +01:00
28e9269b52 Delete groups Marijn Jansen 2017-02-03 10:44:50 +01:00
bb352c7a7a merge Hendrik 2017-02-03 10:41:29 +01:00
fe190975d5 Merge branch 'master' into 'joey-testing' Lars van Hijfte 2017-02-03 10:41:05 +01:00
0f202088a1 Merge branch 'master' into hendrik-testing Hendrik 2017-02-03 10:40:44 +01:00
87b0ab5892 Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-03 10:40:16 +01:00
c8dbdfe70e Fixed url Joey Lai 2017-02-03 10:34:44 +01:00
8949d14a5e Merge branch 'revert-50e94fb8' into 'master' Lars van Hijfte 2017-02-03 10:34:39 +01:00
ecd24ef442 Revert "Merge branch 'joey-testing' into 'master'" revert-50e94fb8 Lars van Hijfte 2017-02-03 10:34:07 +01:00
50e94fb8ed Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-02-03 10:33:47 +01:00
fde736b8c5 misc Hendrik 2017-02-03 10:33:44 +01:00
127162b938 Fixed url Joey Lai 2017-02-03 10:32:54 +01:00
02349dbe28 Changed description Lars van Hijfte 2017-02-03 10:30:44 +01:00
da01729b61 Merge branch 'master' into lars Lars van Hijfte 2017-02-03 10:15:10 +01:00
820ffb4a62 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-02-03 10:13:43 +01:00
1a3efe9669 Fixed W3Validation and url GETs Joey Lai 2017-02-03 10:12:37 +01:00
6d739a4480 Chat is now only loading the last 100 messages Lars van Hijfte 2017-02-03 00:24:38 +01:00
ab21226925 Merge branch 'master' into lars Lars van Hijfte 2017-02-03 00:14:03 +01:00
7e4107ac8b Added fancy buttons in profile Lars van Hijfte 2017-02-03 00:13:23 +01:00
de96ae8263 Merge branch 'marijn-groups' into 'master' Marijn Jansen 2017-02-02 21:14:59 +01:00
74e91ed7cb Add mods/admin to a group. Marijn Jansen 2017-02-02 21:14:25 +01:00
e9468b0ec8 Merge branch 'master' into lars Lars van Hijfte 2017-02-02 21:04:32 +01:00
839fb247b4 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-02-02 21:03:03 +01:00
bf298f4b43 Merge branch 'marijn-groups' into 'master' Marijn Jansen 2017-02-02 19:44:28 +01:00
74145d5d1c Updated buttons on groups Marijn Jansen 2017-02-02 19:43:57 +01:00
1486e71207 Added url get Joey Lai 2017-02-02 19:34:58 +01:00
b206d243b9 Validator fixes Lars van Hijfte 2017-02-02 18:17:58 +01:00
4f731e12fe Merge branch 'master' into lars Lars van Hijfte 2017-02-02 17:45:10 +01:00
f8c9454b85 empty SessionID sends the user to login page Lars van Hijfte 2017-02-02 17:43:32 +01:00
93b908fb13 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-02-02 16:47:06 +01:00
6fd5401c86 Merge branch 'marijn-groups' into 'master' Marijn Jansen 2017-02-02 16:19:03 +01:00
9165f8fa1b Check if file had been uploaded. Marijn Jansen 2017-02-02 16:18:15 +01:00
380d8fa83a Group Shit Marijn Jansen 2017-02-02 16:01:45 +01:00
afb45d6709 add closing of modal on escape key and clicking outside Hendrik 2017-02-02 15:51:27 +01:00
1c53eab2fa Fixed user group list on profile page. K. Nobel 2017-02-02 15:50:12 +01:00
28254d98e4 Merge branch 'master' into kevin-prototype K. Nobel 2017-02-02 15:38:39 +01:00
8a3cfebf55 Redirect to 404 from profile and group K. Nobel 2017-02-02 15:34:45 +01:00
b1941f0191 Merge branch 'hendrik-testing' into 'master' Lars van Hijfte 2017-02-02 15:27:39 +01:00
a27a4881c3 Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-02 15:27:27 +01:00
cfa7c870f0 fix profile error color Hendrik 2017-02-02 15:13:35 +01:00
e60578dc43 add unvalidated option and fixed text Hendrik 2017-02-02 15:11:41 +01:00
9426f4d6ac add name field check in settings Hendrik 2017-02-02 15:00:01 +01:00
7f48cae019 Added uderline in link posts Lars van Hijfte 2017-02-02 14:57:50 +01:00
33399639b1 Added support for iframe "niet slecht" Lars van Hijfte 2017-02-02 14:51:37 +01:00
52e40242e6 Added "add group" under group menu Lars van Hijfte 2017-02-02 14:50:51 +01:00
8a6acbc52a Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-02 14:27:49 +01:00
6fc2f71517 Added meta data in the login page Lars van Hijfte 2017-02-02 14:27:23 +01:00
1672ce6086 Changed offline status to 5 minutes after inactive Lars van Hijfte 2017-02-02 14:23:36 +01:00
188741ddf5 BUG FIX: link in fancy text now opens in new tab Lars van Hijfte 2017-02-02 14:22:13 +01:00
4a7a91ecd9 Fixed bug (not showing profile when on own profile) K. Nobel 2017-02-02 14:20:17 +01:00
1c1283243c Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-02 14:16:56 +01:00
417124a1fe BUG FIX: added 0 in chat time if needed Lars van Hijfte 2017-02-02 14:13:20 +01:00
d24ed89096 BUG FIX: mobile support fix Lars van Hijfte 2017-02-02 14:04:59 +01:00
a92b0fe892 Merge branch 'hendrik-post' into 'master' Lars van Hijfte 2017-02-02 13:58:17 +01:00
5c1b2d1b21 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-02-02 13:57:44 +01:00
3abaeba52c Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-02-02 13:57:25 +01:00
93e63111de cleaned fix hendrik-post Hendrik 2017-02-02 13:54:52 +01:00
feba1d9786 fix reload after posting post Hendrik 2017-02-02 13:47:41 +01:00
6ed19d9060 Merge branch 'master' into hendrik-post Hendrik 2017-02-02 13:43:31 +01:00
d4d16661df added alert box when emptpy posting Hendrik 2017-02-02 13:42:59 +01:00
044ed6a9d3 Added noscript Joey Lai 2017-02-02 13:19:39 +01:00
328ce69144 Merge branch 'master' into kevin-prototype K. Nobel 2017-02-02 13:15:29 +01:00

1 2 3 4 5 ...