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

dd0c9b35e9 No autologin Marijn Jansen 2017-01-19 13:53:49 +01:00
d27538a164 Email change implemented! Marijn Jansen 2017-01-19 13:44:47 +01:00
e71054c654 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-19 13:37:56 +01:00
049dee6381 Fixed login/register and added logout.php Joey Lai 2017-01-19 13:11:24 +01:00
4c9223cba2 add user and group batch change Hendrik 2017-01-19 12:57:10 +01:00
84719529bb Fixed queries and profile page. K. Nobel 2017-01-19 12:01:39 +01:00
2bdcca3ad9 Merge branch 'lars-chat' into 'master' Lars van Hijfte 2017-01-19 11:58:39 +01:00
186cdf1445 Made $db global Lars van Hijfte 2017-01-19 11:57:54 +01:00
b37d06e2cc Updated queries K. Nobel 2017-01-19 11:55:23 +01:00
54b1b0dcc0 Merge branch 'lars-chat' into 'master' Lars van Hijfte 2017-01-19 11:17:02 +01:00
b71cf36798 Fixed chat Lars van Hijfte 2017-01-19 11:08:55 +01:00
c4d78e54bc fixed form with get, fix accompanying css Hendrik 2017-01-19 11:08:45 +01:00
ff19b5e1b9 Settings messages now uses a Class (: Marijn Jansen 2017-01-19 11:01:29 +01:00
08e0447d4c Ignore .idea folder Marijn Jansen 2017-01-19 11:00:55 +01:00
5f7b934d2b Merge branch 'marijn-header' into 'master' Marijn Jansen 2017-01-18 16:42:13 +01:00
1fb6c90fa6 Session Start doubble fixes Marijn Jansen 2017-01-18 16:41:45 +01:00
f5a6b401a8 Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-18 16:23:36 +01:00
4d20e32ac7 Merge branch 'marijn-header' into 'master' Marijn Jansen 2017-01-18 16:23:22 +01:00
28061671d8 Merge branch 'lars-chat' into 'master' Lars van Hijfte 2017-01-18 16:22:39 +01:00
99bffc6f47 Merge branch 'master' into 'kevin-prototype' Kevin Nobel 2017-01-18 16:22:29 +01:00
e4ec666e03 Added personal Header Marijn Jansen 2017-01-18 16:22:27 +01:00
380b256d29 added this file because it is needed Lars van Hijfte 2017-01-18 16:20:33 +01:00
880db2d325 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-18 16:20:15 +01:00
fddeba821d Merge branch 'lars-chat' into 'master' Lars van Hijfte 2017-01-18 16:13:36 +01:00
d06ad5a44d fixed menu more friends bug Lars van Hijfte 2017-01-18 16:12:38 +01:00
7390898721 Merge branch 'hendrik-testing' into 'master' Marijn Jansen 2017-01-18 16:08:49 +01:00
3ee5488a88 Improved profile page, profile now takes data from the DB! K. Nobel 2017-01-18 16:02:11 +01:00
38e5b28ff5 Merge branch 'master' into hendrik-testing Hendrik 2017-01-18 16:02:02 +01:00
e86a6a6d6f Changed queries include K. Nobel 2017-01-18 16:01:26 +01:00
e7e3ae9c8b add changing single group status Hendrik 2017-01-18 15:57:39 +01:00
62d77fc616 Added query needed to get userID K. Nobel 2017-01-18 15:56:59 +01:00
32ff271b5e Merge branch 'lars-chat' into 'master' Lars van Hijfte 2017-01-18 15:55:41 +01:00
b95705df29 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-18 15:54:36 +01:00
df9f782809 Friends in the menu now redirects to the users profile. Lars van Hijfte 2017-01-18 15:54:13 +01:00
455705e286 Fixed login link Joey Lai 2017-01-18 15:53:10 +01:00
7469a10f13 Fixed Chat! Lars van Hijfte 2017-01-18 15:37:49 +01:00
097ccf49b3 New Button Marijn Jansen 2017-01-18 15:27:51 +01:00
71dc7bae2c add group search, add user individual actions Hendrik 2017-01-18 15:19:07 +01:00
34c4b11efb "Deze finctie werkt nog niet" Marijn Jansen 2017-01-18 15:18:08 +01:00
cd954a8c4c Merge branch 'master' into lars-chat Lars van Hijfte 2017-01-18 15:10:17 +01:00
95fd3c0040 chat is done? Lars van Hijfte 2017-01-18 15:09:52 +01:00
0e194ca084 Merge branch 'marijn-settings' Marijn Jansen 2017-01-18 15:09:21 +01:00
37ad2e0ea4 New placeholder for date Marijn Jansen 2017-01-18 15:08:48 +01:00
e7ceb254ce No standard marijn user Marijn Jansen 2017-01-18 14:57:16 +01:00
853b083c04 Merge branch 'marijn-projectplan-planning' into 'master' Marijn Jansen 2017-01-18 14:55:21 +01:00
bd3ffafdef Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-18 14:52:37 +01:00
ab8c12c9d8 Merge branch 'master' into 'marijn-settings' Marijn Jansen 2017-01-18 14:52:32 +01:00
714760871c Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-18 14:51:52 +01:00
e73fcd420c settings succes mesages Marijn Jansen 2017-01-18 14:51:03 +01:00
4fe142eb51 Projectplan added to gitignore Marijn Jansen 2017-01-18 14:50:11 +01:00
0808d46d9e Added salting and no similar username Joey Lai 2017-01-18 14:46:32 +01:00
19f525d168 Live chatting now shows up in the chat-history Lars van Hijfte 2017-01-18 14:34:15 +01:00
bdf5c221a7 Added queries related to users. K. Nobel 2017-01-18 14:23:36 +01:00
e80ce3b793 Improved selectAllFriends query K. Nobel 2017-01-18 14:22:03 +01:00
b5ceb1b5e0 add pagetype selector, add search filter Hendrik 2017-01-18 14:20:32 +01:00
d627c8a837 Projectplan Marijn Jansen 2017-01-18 13:46:50 +01:00
b201d82878 Projectplan now has the "Planning" Marijn Jansen 2017-01-18 13:14:43 +01:00
ed0d0990ad Removed LaTeX pdf frop git Marijn Jansen 2017-01-18 13:14:06 +01:00
afcd048260 Almost finished login/register page Joey Lai 2017-01-18 12:35:41 +01:00
eb2a343d5f added live sending messages from user 2 to user 2 Lars van Hijfte 2017-01-18 12:08:53 +01:00
dde463df6c Added password change Marijn Jansen 2017-01-18 10:43:54 +01:00
51378bf386 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-18 09:21:10 +01:00
9b4743d25a Splitted login and register pages Joey Lai 2017-01-18 09:19:38 +01:00
683fec805c Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-17 16:50:19 +01:00
176851b486 Added SQL Dialect Marijn Jansen 2017-01-17 16:48:57 +01:00
11f2297d5a Setting loadin, settings update, db is now global Marijn Jansen 2017-01-17 16:47:49 +01:00
8ce6cd1aa2 add rudimentary search Hendrik 2017-01-17 16:23:44 +01:00
d1d07ce37d Merge remote-tracking branch 'origin/lars-algemeen' into hendrik-testing Hendrik 2017-01-17 15:15:14 +01:00
0966b3528e Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-17 15:13:49 +01:00
146fc7108b add usersearch query Hendrik 2017-01-17 15:13:32 +01:00
877072f9e3 add sql usersearch base in adminpanel Hendrik 2017-01-17 15:12:56 +01:00
a8fcbecc2e Fixed things Lars van Hijfte 2017-01-17 15:02:54 +01:00
5812eb9b49 Added group_page functions for the admin page Lars van Hijfte 2017-01-17 14:44:20 +01:00
faebda3368 Added default profile picture Lars van Hijfte 2017-01-17 14:24:08 +01:00
6385324b13 The menu now backend supported Lars van Hijfte 2017-01-17 14:16:17 +01:00
e3e72b8ef6 fixed connect.php location in head Hendrik 2017-01-17 14:02:33 +01:00
1edf051dc2 Merge branch 'master' into marijn-settings Marijn Jansen 2017-01-17 13:43:41 +01:00
be26e89dbf Added profile picture part in settings Marijn Jansen 2017-01-17 13:43:00 +01:00
bb637853ef Merge branch 'master' into kevin-prototype K. Nobel 2017-01-17 13:12:43 +01:00
7c6a3cc252 Merge branch 'master' into hendrik-testing Hendrik 2017-01-17 12:56:09 +01:00
f00b3d9a23 add page selector in adminpanel Hendrik 2017-01-17 12:55:15 +01:00
429fba997f Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-17 12:49:29 +01:00
10d3e177ae Begin with the connection between php and mysql. Lars van Hijfte 2017-01-17 12:48:01 +01:00
b60d118ac6 added form complete on search in adminpanel Hendrik 2017-01-17 12:40:41 +01:00
ffa37f49ff Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-17 12:27:05 +01:00
3901b32e6e Merge branch 'master' into kevin-prototype K. Nobel 2017-01-17 12:25:44 +01:00
0ef81a376a Added masonry grid to profile and group pages. K. Nobel 2017-01-17 12:25:09 +01:00
6bce05c228 New button Marijn Jansen 2017-01-17 12:25:04 +01:00
31d50356de Added "Niet slecht." button. Marijn Jansen 2017-01-17 12:10:36 +01:00
3a9b851009 Merge branch 'master' into hendrik-testing Hendrik 2017-01-17 10:58:17 +01:00
c6bdf349a8 fixed forms for php, user status and page type Hendrik 2017-01-17 10:34:30 +01:00
88ea5c027c Merge branch 'lars-algemeen' into 'master' Marijn Jansen 2017-01-16 14:43:33 +01:00
ff2927755d Merge branch 'master' into lars-algemeen Lars van Hijfte 2017-01-16 13:11:29 +01:00
bb0f32ffd9 Made some pages html valid with a validator Lars van Hijfte 2017-01-16 13:10:34 +01:00
44e20fba75 Merge branch 'marijn-index' into 'master' Marijn Jansen 2017-01-13 16:11:19 +01:00
573bf60344 Merge branch 'master' into marijn-index Marijn Jansen 2017-01-13 16:10:33 +01:00
019f0f71bb Made an index Marijn Jansen 2017-01-13 16:09:56 +01:00
10db23ffee Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-13 16:06:09 +01:00
2ad1b49cfd Added popup Joey Lai 2017-01-13 15:52:46 +01:00
7b376f9a48 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-13 15:48:30 +01:00

... 4 5 6 7 8