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

Mono Color

• 78e85c2939 Merge branch 'marijn-messagePage' into 'master' Marijn Jansen 2017-01-26 12:06:38 +01:00
• 44f86a4fbb Email confirm and password change now use messagepage function. Marijn Jansen 2017-01-26 12:05:28 +01:00
• 7b7f0b2c64 Added menu button Lars van Hijfte 2017-01-26 11:48:06 +01:00
• 328f0665f3 add basic post functionality Hendrik 2017-01-26 11:35:18 +01:00
• 8fb8df075f Added comments Lars van Hijfte 2017-01-26 11:31:15 +01:00
• 6a882bf78d Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-26 10:27:45 +01:00
• 95ee91748f Chat messages and groups are now live. Lars van Hijfte 2017-01-26 10:26:40 +01:00
• 30d403ae7b Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-25 16:21:56 +01:00
• 2242feda21 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-25 16:21:44 +01:00
• 2ece9e1c63 Merge branch 'master' into lars Lars van Hijfte 2017-01-25 16:21:34 +01:00
• 4ebdd378a6 Password change Marijn Jansen 2017-01-25 16:21:17 +01:00
• 09dac78eb4 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-25 16:21:02 +01:00
• e1ca3c52ed Merge branch 'hendrik-post' into 'master' Lars van Hijfte 2017-01-25 16:20:48 +01:00
• f7bf80d789 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-01-25 16:20:30 +01:00
• 4c5ea08614 Fixed reset password Joey Lai 2017-01-25 16:19:34 +01:00
• 9046b397a1 Merge branch 'master' into lars Lars van Hijfte 2017-01-25 16:19:07 +01:00
• 91fae80326 Friends and friendrequest are fully ajax. Also added friend-item Lars van Hijfte 2017-01-25 16:17:46 +01:00
• f06de1e88d Merge branch 'master' into hendrik-post Hendrik 2017-01-25 15:59:40 +01:00
• b161596d67 polished post viewing Hendrik 2017-01-25 15:59:03 +01:00
• ded314f4d6 Merged marijn Joey Lai 2017-01-25 15:53:44 +01:00
• 0b035c0583 Merge branch 'marijn-settings' into joey-testing Joey Lai 2017-01-25 15:48:37 +01:00
• cc08ebec3c Modal added for resetting password Joey Lai 2017-01-25 15:47:31 +01:00
• 1b2a1a5180 Almost request password Marijn Jansen 2017-01-25 15:46:20 +01:00
• 977757b2d3 Made small improvements to friendship buttons and corresponding API files. K. Nobel 2017-01-25 15:42:28 +01:00
• 6a43402c66 Added comment in getFriendshipStatus for Lars. K. Nobel 2017-01-25 15:14:00 +01:00
• 95570c49d4 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-25 15:08:34 +01:00
• 9ff256429d Changed friendship buttons. We now use AJAX, changed button style and added FA icons. K. Nobel 2017-01-25 15:06:37 +01:00
• c23b8bd8e5 Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-25 13:44:11 +01:00
• e840def733 FIxed confirmation login Joey Lai 2017-01-25 13:43:08 +01:00
• db333b6e98 add unpolished post viewing Hendrik 2017-01-25 13:28:47 +01:00
• 30d1ef40f4 fixed js for login Joey Lai 2017-01-25 12:55:29 +01:00
• 13c575179d Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-25 12:49:45 +01:00
• aa48092d27 Added confirmation login email Joey Lai 2017-01-25 12:48:30 +01:00
• 7f755bfd2c Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-25 12:30:20 +01:00
• 727d418c8d Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-25 12:06:50 +01:00
• 185874d23f Cleanup at logout.php Marijn Jansen 2017-01-25 12:06:13 +01:00
• 827be40646 Email confirm on settings page and emailconfirm fix (: Marijn Jansen 2017-01-25 12:02:31 +01:00
• 93ddefa42f Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-25 11:20:15 +01:00
• d19639d1c3 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-25 11:20:01 +01:00
• d2c7f0787b Spelling mistake Marijn Jansen 2017-01-25 11:19:41 +01:00
• 1402a3ea07 Fixed query for image tags K. Nobel 2017-01-25 11:19:24 +01:00
• 981e34c950 redesigned code Joey Lai 2017-01-25 11:19:01 +01:00
• 022620a375 Merge branch 'marijn-emailconfirm' into 'master' Marijn Jansen 2017-01-25 11:17:31 +01:00
• 28f31d749b Email confirm (: Marijn Jansen 2017-01-25 11:16:53 +01:00
• 17600adbf1 Merge branch 'marijn-emailconfirm' into 'master' Marijn Jansen 2017-01-25 09:33:36 +01:00
• f7da87596a Added emailconfirm.php Marijn Jansen 2017-01-25 09:30:05 +01:00
• 7efd062f98 Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-24 17:32:43 +01:00
• fddbd0ca87 Merge branch 'master' into lars Lars van Hijfte 2017-01-24 17:32:13 +01:00
• 37d83169c6 In notification bar accept or deny Lars van Hijfte 2017-01-24 17:31:39 +01:00
• d19038cb1c Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-24 17:11:09 +01:00
• 12ed710369 Fixed API Lars van Hijfte 2017-01-24 17:10:12 +01:00
• 3de4e1387f Merge branch 'master' into lars Lars van Hijfte 2017-01-24 17:07:07 +01:00
• 7bf8a16cf0 Dingen door elkaar Lars van Hijfte 2017-01-24 17:06:39 +01:00
• cbfce6f698 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-01-24 17:05:51 +01:00
• 7144d700e4 Removed debug echo from profile page. K. Nobel 2017-01-24 17:02:49 +01:00
• ec56dbe578 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-24 17:00:10 +01:00
• b8f662f825 Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB K. Nobel 2017-01-24 16:59:14 +01:00
• de03d8799a Fixed placeholder for new post. K. Nobel 2017-01-24 16:58:51 +01:00
• b9fc016f7d add post viewing basis, add insert post and comment queries Hendrik 2017-01-24 16:56:04 +01:00
• 70957015ce Fixed links to friends on profile page. K. Nobel 2017-01-24 16:51:34 +01:00
• f9f1e2bf17 Changed select posts query. K. Nobel 2017-01-24 16:40:30 +01:00
• 4b6fe1d202 Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-24 15:17:19 +01:00
• fd055e8355 Fixed bugs Lars van Hijfte 2017-01-24 15:16:15 +01:00
• 0b705df09a Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-24 15:12:01 +01:00
• c48227e258 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-01-24 15:11:29 +01:00
• 7a19fea5f9 Redesigned register functions Joey Lai 2017-01-24 15:08:24 +01:00
• 887c773463 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-24 15:03:24 +01:00
• 4967ab6ea0 Made some small changes for Lars. K. Nobel 2017-01-24 15:01:55 +01:00
• 6314494177 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-24 14:49:02 +01:00
• 86b97cc186 Max file size for gifs. Marijn Jansen 2017-01-24 14:47:38 +01:00
• 4b3d7967fb Merge branch 'master' into kevin-prototype K. Nobel 2017-01-24 14:47:05 +01:00
• d44ddf2793 Added functionality for add friend buttons. K. Nobel 2017-01-24 14:36:27 +01:00
• 9e89307bf9 Merge branch 'lars-chat' into 'master' Lars van Hijfte 2017-01-24 14:33:11 +01:00
• dc11830c80 Fixed name length lars-chat Lars van Hijfte 2017-01-24 14:32:43 +01:00
• 8403ff0a17 Merge branch 'lars-chat' into 'master' Lars van Hijfte 2017-01-24 14:30:09 +01:00
• dbb23922d8 Merge branch 'master' into lars-chat Lars van Hijfte 2017-01-24 14:26:48 +01:00
• a88483ae47 FINALLY FIXED THE UNREAD CHAT MESSAGES! Lars van Hijfte 2017-01-24 14:26:15 +01:00
• ee6b55bd91 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-24 14:02:34 +01:00
• 08c3d73377 Merge branch 'master' into 'marijn-settings' Marijn Jansen 2017-01-24 14:02:19 +01:00
• c1359920e0 New Standard avatar Marijn Jansen 2017-01-24 14:00:55 +01:00
• 4579b98eb8 Checks and resize on profile pictures :) Marijn Jansen 2017-01-24 13:54:08 +01:00
• 62a2b32c95 Changed Alerts to Exceptions. Marijn Jansen 2017-01-24 12:12:48 +01:00
• f6051ee14f Merge branch 'master' into hendrik-search Hendrik 2017-01-24 11:05:58 +01:00
• 96003b1bdc Merge branch 'hendrik-search' into 'master' Lars van Hijfte 2017-01-24 10:21:17 +01:00
• c4a0367fef Merge branch 'lars-chat' into 'master' Lars van Hijfte 2017-01-24 10:19:52 +01:00
• c4e4508b53 Changed admin layout and fixed for enums Lars van Hijfte 2017-01-24 10:19:13 +01:00
• d7e84ee138 Merge branch 'lars-algemeen' into lars-chat Lars van Hijfte 2017-01-23 17:22:38 +01:00
• 7eec0cfa2a Begin chat change Lars van Hijfte 2017-01-23 17:22:22 +01:00
• 348b66c08c Merge branch 'master' into lars-chat Lars van Hijfte 2017-01-23 17:08:43 +01:00
• 37aa073fc1 End of day commit Lars van Hijfte 2017-01-23 16:45:16 +01:00
• 119c82e110 minor color and text fixes Hendrik 2017-01-23 16:27:54 +01:00
• b6d166bdea Merge branch 'lars-algemeen' into 'master' Lars van Hijfte 2017-01-23 16:27:45 +01:00
• 8c4c4a59fd Merge branch 'master' into lars-algemeen lars-algemeen Lars van Hijfte 2017-01-23 16:25:18 +01:00
• 58ce5f1e75 Menu, netjes, notification Lars van Hijfte 2017-01-23 16:24:48 +01:00
• 80f7c24641 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-23 16:24:28 +01:00
• f82dd73b7d Profile picrure old deletion (: Marijn Jansen 2017-01-23 16:23:47 +01:00
• 648c2d26e4 Merge branch 'master' into hendrik-testing Hendrik 2017-01-23 16:06:19 +01:00
• 2ff23ae668 Merge branch 'master' into hendrik-search Hendrik 2017-01-23 16:06:03 +01:00
• ac83bb750b fix status for enums, fix pages Hendrik 2017-01-23 16:05:22 +01:00
• e6f5044a9a add page functionality Hendrik 2017-01-23 16:04:59 +01:00