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

9d675dd897 Fixed default image for group members. K. Nobel 2017-02-02 13:11:05 +01:00
86b02973e4 Fixed visibility on profiles K. Nobel 2017-02-02 13:02:00 +01:00
ab5f243281 Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-02 12:53:13 +01:00
327a6a8f5c BUG FIX: username doesn't cut off in link Lars van Hijfte 2017-02-02 12:52:03 +01:00
d03d58ce37 Merge branch 'hendrik-search' into 'master' Lars van Hijfte 2017-02-02 12:47:05 +01:00
487e0a0523 Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-02 12:46:42 +01:00
1dfc14e6f0 Added meta data Lars van Hijfte 2017-02-02 12:44:03 +01:00
cc9866d3dd Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-02-02 10:54:10 +01:00
04df02862f More Awesome Fonts :D marijn-settings Marijn Jansen 2017-02-02 10:52:42 +01:00
67eb7b991e Merge branch 'master' into joey-testing Joey Lai 2017-02-02 10:44:18 +01:00
90ac38acdd Fixed restrictions with registering Joey Lai 2017-02-02 10:43:34 +01:00
60b55b3f04 Added comments Lars van Hijfte 2017-02-02 10:29:49 +01:00
70b7e12559 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-02-02 10:28:54 +01:00
e299ef59e8 Added show profile into settings Marijn Jansen 2017-02-02 10:28:12 +01:00
d9c68d5f5f Merge branch 'master' into hendrik-search hendrik-search Hendrik 2017-02-02 10:27:21 +01:00
d027333bd7 fix filter and pagenumber interaction in search Hendrik 2017-02-02 01:06:31 +01:00
12d5e00731 Merge branch 'hendrik-testing' into 'master' Lars van Hijfte 2017-02-01 14:52:03 +01:00
0546b8689d BUG FIX: name size Lars van Hijfte 2017-02-01 14:51:27 +01:00
eb8eb5bf03 Merge branch 'marijn-postdelete' into 'master' Marijn Jansen 2017-02-01 14:46:31 +01:00
b497538652 Double session_start fixed :D marijn-postdelete Marijn Jansen 2017-02-01 14:45:58 +01:00
6ad1c0edf5 Merge branch 'marijn-postdelete' into 'master' Marijn Jansen 2017-02-01 14:42:02 +01:00
96f421d088 Merge branch 'master' into 'marijn-postdelete' Marijn Jansen 2017-02-01 14:41:45 +01:00
7955509cb2 Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-01 14:35:01 +01:00
dbfe10f84b Delete Posts! Marijn Jansen 2017-02-01 14:34:02 +01:00
6c43cae1cb Added noposts div to group. K. Nobel 2017-02-01 14:31:18 +01:00
3af38cd088 Merge branch 'master' into kevin-prototype K. Nobel 2017-02-01 14:28:39 +01:00
cfe2928f7b Fixed member list K. Nobel 2017-02-01 14:28:03 +01:00
022893aca2 Merge branch 'master' into hendrik-testing Hendrik 2017-02-01 14:24:27 +01:00
89cff4da8c Merge branch 'master' into lars Lars van Hijfte 2017-02-01 14:20:03 +01:00
fb6b392a42 Merge branch 'hendrik-post' into 'master' Lars van Hijfte 2017-02-01 14:19:54 +01:00
fc07027405 Merge branch 'master' into marijn-postdelete Marijn Jansen 2017-02-01 14:16:52 +01:00
b7a6fae4d9 BUG FIX: Menu loading Lars van Hijfte 2017-02-01 14:14:49 +01:00
7f31575bfc Merge branch 'master' into hendrik-post Hendrik 2017-02-01 14:13:55 +01:00
d87d0b7295 Backend for delete post Marijn Jansen 2017-02-01 14:13:22 +01:00
7566a756f6 Merge branch 'marijn-postdelete' into 'master' Marijn Jansen 2017-02-01 14:13:04 +01:00
f10d9c14a1 Niet slecht small img Marijn Jansen 2017-02-01 14:12:13 +01:00
9b89058484 add infinite scroll on profile Hendrik 2017-02-01 14:05:04 +01:00
61fa0c3781 Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-01 13:10:29 +01:00
2b98480587 BUG FIX: Menu now saves the cookie again Lars van Hijfte 2017-02-01 13:07:06 +01:00
a643ee19b9 Merge branch 'master' into marijn-postdelete Marijn Jansen 2017-02-01 12:56:09 +01:00
fcfa6ed9ba Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-02-01 12:51:12 +01:00
700e27e5e3 Fixed redirect link and removes test echo's Joey Lai 2017-02-01 12:45:26 +01:00
bccb813e92 Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-01 12:36:16 +01:00
dc69fb493c BUG FIX: Added session start, so posts load again Lars van Hijfte 2017-02-01 12:34:27 +01:00
8e81cec843 Merge branch 'lars' into 'master' Lars van Hijfte 2017-02-01 12:30:08 +01:00
fcd58857c0 Merge branch 'safari-chat' into 'master' Lars van Hijfte 2017-02-01 12:29:52 +01:00
152d72d3d8 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-02-01 12:29:29 +01:00
a9c27583e4 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-02-01 12:29:08 +01:00
3ca7536cc2 Merge branch 'master' into kevin-prototype K. Nobel 2017-02-01 12:27:07 +01:00
69b0b24176 Fixed group add/leave buttons K. Nobel 2017-02-01 12:26:05 +01:00
2b893fc283 Facebook ID instead of Facebook email Joey Lai 2017-02-01 12:25:13 +01:00
04365c4f05 Fixed chat in safari safari-chat Marijn Jansen 2017-02-01 12:24:59 +01:00
7fdf9ad329 switch laptop (: Lars van Hijfte 2017-02-01 12:20:40 +01:00
58bb89f9b4 Added queries and functions for adding group members. K. Nobel 2017-02-01 12:19:59 +01:00
77448d98ba masonry only reloads when columncount changes Hendrik 2017-02-01 11:49:57 +01:00
6a9e36cea2 Merge branch 'master' into hendrik-post Hendrik 2017-02-01 11:49:41 +01:00
6aee603a64 Added online status everywhere needed Lars van Hijfte 2017-02-01 11:44:21 +01:00
e414a1633e API filter per user level Lars van Hijfte 2017-02-01 11:38:43 +01:00
3c79d86abd add admin search by role Hendrik 2017-02-01 11:33:34 +01:00
028c2373c1 Merge branch 'hendrik-testing' into 'master' Lars van Hijfte 2017-01-31 16:23:41 +01:00
fb9d070d6a fixsquared Hendrik 2017-01-31 16:23:13 +01:00
e3ad9c4590 Merge branch 'hendrik-testing' into 'master' Lars van Hijfte 2017-01-31 16:20:36 +01:00
3397253010 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-31 16:20:08 +01:00
52a4822477 post-merge fix Hendrik 2017-01-31 16:20:02 +01:00
c0a64e9ffd 1337 bday Marijn Jansen 2017-01-31 16:19:15 +01:00
64a3b13adf Merge branch 'master' into hendrik-testing Hendrik 2017-01-31 16:17:42 +01:00
b16dc1d4b7 add bancomment change Hendrik 2017-01-31 16:15:48 +01:00
8e98001217 Facebook login implemented Joey Lai 2017-01-31 16:12:22 +01:00
83f75e0282 Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-31 16:11:47 +01:00
b41a365b60 Age instead of birthday Lars van Hijfte 2017-01-31 16:11:20 +01:00
eb094858b5 End of day marijn-postPicture Marijn Jansen 2017-01-31 16:11:03 +01:00
6a7bb4670b Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-31 16:03:05 +01:00
7236a8ba35 Merge branch 'hendrik-search' into 'master' Lars van Hijfte 2017-01-31 16:02:29 +01:00
4d40bb6042 checkbox width fix Lars van Hijfte 2017-01-31 15:46:53 +01:00
d6c2fab617 Post is now mobile friendly Lars van Hijfte 2017-01-31 15:32:19 +01:00
93200d27c2 Merge branch 'master' into hendrik-search Hendrik 2017-01-31 15:32:09 +01:00
78e96d5a74 add pageselector on search Hendrik 2017-01-31 15:30:48 +01:00
646e6dde48 Added max value in text area Lars van Hijfte 2017-01-31 15:16:40 +01:00
44408ee429 Frozen user cant comment or niet slecht on postst Lars van Hijfte 2017-01-31 14:34:51 +01:00
9ca212570d Merge branch 'master' into lars Lars van Hijfte 2017-01-31 14:27:50 +01:00
164eb2dde6 Frozen users cant chat with other people Lars van Hijfte 2017-01-31 14:26:34 +01:00
2dd7dd8140 Reload comments bug fix Lars van Hijfte 2017-01-31 13:56:34 +01:00
794b5ab294 Added fancy text to posts and comments Lars van Hijfte 2017-01-31 13:54:31 +01:00
2a37b9c64d Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-31 13:54:30 +01:00
dfdf72daf4 Merge branch 'marijn-postPicture' into 'master' Marijn Jansen 2017-01-31 13:38:30 +01:00
1c9c88e030 Fixed and spilt Avatar upload and Alerts Marijn Jansen 2017-01-31 13:36:32 +01:00
eb12b6ba7d fixed pageselector in admin Hendrik 2017-01-31 13:11:23 +01:00
6b13db9c4f Fixed posting on group pages. K. Nobel 2017-01-31 12:53:45 +01:00
c14a2770bd Fixed posting functions for groups. K. Nobel 2017-01-31 12:52:50 +01:00
e85a685b0f Merge branch 'master' into lars Lars van Hijfte 2017-01-31 12:47:51 +01:00
f67dd019c4 Inputs are now mobile friendly Lars van Hijfte 2017-01-31 12:47:24 +01:00
f26097f55f Fixed online status Lars van Hijfte 2017-01-31 12:25:28 +01:00
2e71942fdf Merge branch 'master' into kevin-prototype K. Nobel 2017-01-31 12:06:58 +01:00
582d347bcb Merge branch 'master' into hendrik-testing Hendrik 2017-01-31 12:05:05 +01:00
03481f5888 Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-31 11:51:52 +01:00
d5d9d5857a Rip website? Lars van Hijfte 2017-01-31 11:50:05 +01:00
dee483e946 Masonry will now only refresh when the width of the screen changes. K. Nobel 2017-01-31 10:54:15 +01:00
c7d47cf446 Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-31 10:33:20 +01:00
4dc3b4f651 Mobile friendly Lars van Hijfte 2017-01-31 10:31:57 +01:00
3579fe0cd5 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-31 10:24:34 +01:00

1 2 3 4 5 ...