Commit Graph

  • a6b6d6d747 Style changes Marijn Jansen 2017-01-31 10:23:47 +01:00
  • 6983aa06a2 Finishing touches Marijn Jansen 2017-01-30 23:03:50 +01:00
  • 8dfa31696c autocomplete suggestions at password Marijn Jansen 2017-01-30 22:49:43 +01:00
  • ce53b6e9e4 Checkbox for showBday and showEmail Marijn Jansen 2017-01-30 22:42:47 +01:00
  • bc7cbb0fb7 Merge branch 'marijn-settings' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-settings Marijn Jansen 2017-01-30 21:49:17 +01:00
  • 422e2d1308 Date picker in bday Marijn Jansen 2017-01-30 21:48:18 +01:00
  • 6e6bbf8d92 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-30 20:19:24 +01:00
  • a0e77491a2 Merge branch 'master' into hendrik-testing Hendrik 2017-01-30 16:34:40 +01:00
  • e464f5bca2 cleaned admin.js, add admin/owner check (frontend), fix submit ajax Hendrik 2017-01-30 16:32:57 +01:00
  • 3140242b4f Removed old query for posts. K. Nobel 2017-01-30 16:24:07 +01:00
  • 0b6ca72dfc Fixed chat date not showing Lars van Hijfte 2017-01-30 16:00:16 +01:00
  • 6831994ede Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-30 15:41:32 +01:00
  • bb56679885 Merge branch 'kevin-prototype' into 'master' Marijn Jansen 2017-01-30 15:41:05 +01:00
  • b0a8ceafc3 Added youtube links Lars van Hijfte 2017-01-30 15:40:31 +01:00
  • 54b56da445 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-30 15:37:57 +01:00
  • 183a98a339 Fixed link to groups on profile page. K. Nobel 2017-01-30 15:34:32 +01:00
  • 941296802f Added posts to group page. K. Nobel 2017-01-30 15:30:08 +01:00
  • aa12e29948 Fixed posts on profile page. K. Nobel 2017-01-30 15:29:42 +01:00
  • 1acad8e765 modified masonry and posts, masonry is now reusable on group pages. K. Nobel 2017-01-30 15:28:54 +01:00
  • 44ff3a4cab added time to chat messages Lars van Hijfte 2017-01-30 15:08:07 +01:00
  • dd017d8885 Merge branch 'marijn-404' into 'master' Marijn Jansen 2017-01-30 14:35:51 +01:00
  • 282875c6a2 Redirect to index Marijn Jansen 2017-01-30 14:35:25 +01:00
  • c840b28495 Merge branch 'marijn-404' into 'master' Marijn Jansen 2017-01-30 14:34:08 +01:00
  • f1b5a7fe95 Resize Marijn Jansen 2017-01-30 14:33:38 +01:00
  • e8c76bef5b Merge branch 'marijn-nietslecht' into 'master' Marijn Jansen 2017-01-30 14:31:17 +01:00
  • 25957c6c78 Merge branch 'marijn-404' into 'master' Marijn Jansen 2017-01-30 14:31:03 +01:00
  • 20b951cad2 404 page Marijn Jansen 2017-01-30 14:30:36 +01:00
  • 792f346b12 Added admin-panel button Lars van Hijfte 2017-01-30 14:16:11 +01:00
  • 54ddb78453 Chat receive messages is now better Lars van Hijfte 2017-01-30 13:59:02 +01:00
  • 9a36dea592 Removed a comma Marijn Jansen 2017-01-30 13:22:44 +01:00
  • 578ad34020 Picture at nietslecht-button Marijn Jansen 2017-01-30 13:21:12 +01:00
  • f3df682af5 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-30 13:20:53 +01:00
  • c8450f3cb3 Changed profile buttons Lars van Hijfte 2017-01-30 12:44:15 +01:00
  • b30ef0d0cf Merge branch 'marijn-dbConnect' into 'master' Marijn Jansen 2017-01-30 12:10:37 +01:00
  • 877637fcc9 Added video and links in the chat Lars van Hijfte 2017-01-29 18:29:27 +01:00
  • 89c8c35b4a Changed profile look a bit more Lars van Hijfte 2017-01-29 17:24:39 +01:00
  • c1a7ccc076 Found some extra statemensts Marijn Jansen 2017-01-29 14:08:45 +01:00
  • b24fed57d9 Changed db connect and database query structure so PhpStorm can detect it. Marijn Jansen 2017-01-29 14:01:25 +01:00
  • da30b9101c Added age calculation Marijn Jansen 2017-01-29 13:09:22 +01:00
  • dd2113b234 Merge branch 'hendrik-testing' into 'master' Lars van Hijfte 2017-01-27 16:16:07 +01:00
  • 3f960cc091 Merge branch 'master' into hendrik-testing Hendrik 2017-01-27 16:15:42 +01:00
  • 08f668859c begin with facebook login Joey Lai 2017-01-27 16:15:23 +01:00
  • b12eaced4a improve adminpanel w/ ajax, enum fixes, misc fixes Hendrik 2017-01-27 16:14:54 +01:00
  • 16b1f93968 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-01-27 16:13:32 +01:00
  • 753c596056 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-27 16:09:11 +01:00
  • 8da1469ca9 Started with group page. K. Nobel 2017-01-27 16:05:45 +01:00
  • f7f442ce75 Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-27 16:05:11 +01:00
  • c8c81ae730 Merge branch 'master' into lars Lars van Hijfte 2017-01-27 16:03:54 +01:00
  • a57465189a Chat post images Lars van Hijfte 2017-01-27 16:03:33 +01:00
  • dc51ac5964 Even more sexy turnary statements! Marijn Jansen 2017-01-27 15:41:59 +01:00
  • be9fa6d2c1 Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-27 15:41:02 +01:00
  • 7e2c20e244 Added showEmail and showBday to the settings page Marijn Jansen 2017-01-27 15:40:07 +01:00
  • dd6b41783a Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-27 14:18:27 +01:00
  • e9eeeaf110 fixed idk Joey Lai 2017-01-27 14:17:56 +01:00
  • 2651e0fb2b Merge branch 'joey-testing' into 'master' Marijn Jansen 2017-01-27 14:04:39 +01:00
  • 5e9629eddd Fixed bugs Joey Lai 2017-01-27 14:03:11 +01:00
  • d356468554 Merge branch 'marijn-nietslecht' into 'master' Marijn Jansen 2017-01-27 12:30:56 +01:00
  • ce6a751630 Niet slecht inverted Marijn Jansen 2017-01-27 12:30:28 +01:00
  • 609f350cd3 Made different files for login and register Joey Lai 2017-01-27 12:27:40 +01:00
  • 07c3b07eb3 Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-27 12:23:04 +01:00
  • f27b9ec6b4 Chat messages split per day Lars van Hijfte 2017-01-27 12:22:26 +01:00
  • bf1df4d2d4 Merge branch 'marijn-nietslecht' into 'master' Marijn Jansen 2017-01-27 12:22:14 +01:00
  • 3b542e0878 "Niet slecht."-button! Marijn Jansen 2017-01-27 12:20:50 +01:00
  • 82c2eaccb3 Merge branch 'master' into marijn-nietslecht Marijn Jansen 2017-01-27 11:23:42 +01:00
  • cbff973b63 Save manu state with cookie Lars van Hijfte 2017-01-27 11:15:33 +01:00
  • c2d8521cdd Merge branch 'master' into hendrik-testing Hendrik 2017-01-27 10:48:18 +01:00
  • 23904caf69 Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-26 22:37:19 +01:00
  • f1bfc89e6a Custom scrollbar Lars van Hijfte 2017-01-26 22:33:32 +01:00
  • f32e0ca382 Merge branch 'master' into lars Lars van Hijfte 2017-01-26 21:57:13 +01:00
  • d89e672990 Also fixed unread chat Lars van Hijfte 2017-01-26 21:54:47 +01:00
  • 032e25b044 You can now only chat with friends Lars van Hijfte 2017-01-26 21:50:47 +01:00
  • 7073995534 Stop before Genius Bar visit Marijn Jansen 2017-01-26 17:03:11 +01:00
  • 637a26ba33 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-26 16:18:35 +01:00
  • dbdb12cca0 Modal for register Joey Lai 2017-01-26 16:17:58 +01:00
  • 70b7734e8b Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-26 16:14:09 +01:00
  • c1fc022658 Merge branch 'joey-testing' into 'master' Lars van Hijfte 2017-01-26 16:13:43 +01:00
  • 5c1208460f Added direct button on the profile to chat with someone Lars van Hijfte 2017-01-26 16:12:50 +01:00
  • 59fc65e27a Made small changes to posts, added amount of comments and niet slechts K. Nobel 2017-01-26 16:09:18 +01:00
  • 0c324b9095 Merge branch 'master' into hendrik-testing Hendrik 2017-01-26 15:33:08 +01:00
  • ee204d78a7 minor fixes Hendrik 2017-01-26 15:32:38 +01:00
  • cdfbcc0168 Merge branch 'master' into marijn-nietslecht Marijn Jansen 2017-01-26 15:24:55 +01:00
  • bf87d20985 Queries for niet slecht Marijn Jansen 2017-01-26 15:14:51 +01:00
  • 96f70e1a11 Fixed date and other extras Joey Lai 2017-01-26 14:50:41 +01:00
  • e75df42bd8 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-26 14:32:00 +01:00
  • b66c108f4e Fixed post titles for htmlchars. K. Nobel 2017-01-26 14:31:45 +01:00
  • f4b2fee290 Merge branch 'lars' into 'master' Lars van Hijfte 2017-01-26 14:14:40 +01:00
  • a60a9b6594 Merge branch 'master' into lars Lars van Hijfte 2017-01-26 14:12:27 +01:00
  • feb64002f5 Live search Lars van Hijfte 2017-01-26 14:12:04 +01:00
  • 33a640329b Filter on search page Lars van Hijfte 2017-01-26 13:53:59 +01:00
  • 59b0b00304 Merge branch 'hendrik-post' into 'master' Lars van Hijfte 2017-01-26 13:47:40 +01:00
  • 51cc736aca Merge branch 'master' into hendrik-post Hendrik 2017-01-26 13:46:24 +01:00
  • 1a53d01747 add authentication Hendrik 2017-01-26 13:29:56 +01:00
  • e24960c319 Merge branch 'kevin-prototype' into 'master' Lars van Hijfte 2017-01-26 13:29:42 +01:00
  • cf964ec8d6 Merge branch 'master' into kevin-prototype K. Nobel 2017-01-26 13:24:16 +01:00
  • b89a575039 Merge branch 'master' into hendrik-testing Hendrik 2017-01-26 13:02:35 +01:00
  • 91aca6baa7 change comments to use ajax Hendrik 2017-01-26 12:21:01 +01:00
  • 3ebacd6251 Fixed masonry grid (posts). K. Nobel 2017-01-26 12:20:32 +01:00
  • 423c2fd771 Revert "Merge branch 'marijn-settings' into 'master'" Marijn Jansen 2017-01-26 12:16:28 +01:00
  • 58e5f200fa Merge branch 'marijn-settings' into 'master' Marijn Jansen 2017-01-26 12:14:52 +01:00
  • 47eed5514a Removed .idea folder Marijn Jansen 2017-01-26 12:14:07 +01:00