Commit Graph

  • 202022c524 Various fixes develop Fergal Moran 2018-11-02 00:46:06 +00:00
  • f3b40713ae Enable downloads for all Fergal Moran 2018-10-26 21:23:25 +01:00
  • aeda96acc8 Merge tag '4.1.0' into develop Fergal Moran 2016-09-19 20:51:40 +01:00
  • 757dd03bcf Merge branch 'release/4.1.0' master Fergal Moran 2016-09-19 20:51:34 +01:00
  • 6a802e78ac Version bump Fergal Moran 2016-09-19 20:51:28 +01:00
  • e11ae90c01 Merge tag 'facebook_share_image' into develop Fergal Moran 2016-09-19 20:50:55 +01:00
  • 5e65d77db2 Merge branch 'hotfix/facebook_share_image' Fergal Moran 2016-09-19 20:50:45 +01:00
  • f9aa4f8526 Changed social._getLink to ignore if http Fergal Moran 2016-09-19 20:50:25 +01:00
  • 3431a7c924 btsync permissions fuck up Fergal Moran 2016-09-16 22:05:45 +01:00
  • eedaf24184 Merge branch 'master' of github.com:fergalmoran/dss.web Fergal Moran 2016-07-08 20:50:11 +01:00
  • 84c1ed8c02 Added sm to bower Fergal Moran 2016-07-08 20:50:08 +01:00
  • 6cfd2ab942 Grunt fixes Fergal Moran 2016-07-06 23:52:30 +01:00
  • 374550b2db Merge branch 'develop' Fergal Moran 2016-07-06 22:41:03 +01:00
  • 6fd01702b9 Done! Fergal Moran 2016-07-06 22:40:46 +01:00
  • 8a13f1d447 Fixed user infinite scroll Fergal Moran 2016-06-30 23:09:04 +01:00
  • 1f089b77f9 User initial filtering Fergal Moran 2016-06-30 21:54:16 +01:00
  • 14d0ba06e5 Added padding to mix button bar Fergal Moran 2016-06-29 19:26:06 +01:00
  • cc39b89d56 Sized delete comment dialog Fergal Moran 2016-06-29 18:48:44 +01:00
  • ab2420f616 Hide search in mobile Fergal Moran 2016-06-28 23:16:11 +01:00
  • 11703d757b Merge tag '4.0.3' into develop Fergal Moran 2016-06-28 23:05:14 +01:00
  • 285eda7ba9 Merge branch 'release/4.0.3' Fergal Moran 2016-06-28 23:05:03 +01:00
  • 907fbcb6d6 Version bump Fergal Moran 2016-06-28 23:04:53 +01:00
  • d078d8c748 Fixed up mix page Fergal Moran 2016-06-28 23:04:15 +01:00
  • 383ab2cf5f Fixed search icon url Fergal Moran 2016-06-28 21:21:57 +01:00
  • 9d27e56bed Finished Fergal Moran 2016-06-28 21:06:53 +01:00
  • 79049e6569 Fixed user list Fergal Moran 2016-06-27 20:51:43 +01:00
  • 4cf90b44ba Removed hamburger Fergal Moran 2016-06-24 23:29:16 +01:00
  • 3555caaee1 Some flat fixed to user profile Fergal Moran 2016-06-24 23:20:38 +01:00
  • 2975ee44c9 Fixed some padding Fergal Moran 2016-06-23 23:11:38 +01:00
  • fad72931e0 Hiding genres (for now) Fergal Moran 2016-06-23 22:13:47 +01:00
  • 45b4d94c14 Merge conflicts Fergal Moran 2016-06-23 22:06:56 +01:00
  • ec28c3636a Fixed hides Fergal Moran 2016-06-23 22:05:59 +01:00
  • 068adfb7ac Mobile layout fixes Fergal Moran 2016-06-23 21:57:05 +01:00
  • 74e5770f68 Merged hotfix/hide_upload_mobile into develop Fergal Moran 2016-06-23 21:56:41 +01:00
  • d27cfb6fc8 merge tag '4.0.2' into develop Fergal Moran 2016-06-23 20:59:17 +01:00
  • 3d7fd978d3 Merge branch 'release/4.0.2' Fergal Moran 2016-06-23 20:59:07 +01:00
  • f2eab0b6ee Version bump Fergal Moran 2016-06-23 20:59:03 +01:00
  • 3e03650a30 Merge branch 'feature/mix_stacking' into develop Fergal Moran 2016-06-23 20:58:04 +01:00
  • 2da45dedad Stacked mixes Fergal Moran 2016-06-23 20:58:02 +01:00
  • 6245e666dd Merge branch 'master' into feature/mix_stacking Fergal Moran 2016-06-23 20:56:19 +01:00
  • 9c3e7189ec Merge branch 'master' into develop Fergal Moran 2016-06-23 20:56:07 +01:00
  • c29665f449 Upload button bar Fergal Moran 2016-06-23 20:23:26 +01:00
  • 180839f5ce Navbar fix Fergal Moran 2016-06-23 20:09:31 +01:00
  • 9a12ab3ebc pulsate update Fergal Moran 2016-06-22 22:56:42 +01:00
  • df3961c9ca asdsadsa Fergal Moran 2016-06-22 22:56:14 +01:00
  • 494c28b54c Added id to upload button Fergal Moran 2016-06-22 22:28:13 +01:00
  • cc3cca424b FUCKING NAVBAR Fergal Moran 2016-06-22 21:35:02 +01:00
  • b38c9d495d Debug live navbar test Fergal Moran 2016-06-22 21:26:00 +01:00
  • 35fa5c5d76 Merge tag 'upload_layout' into develop Fergal Moran 2016-06-22 20:32:48 +01:00
  • 11012a29a7 Merge branch 'hotfix/upload_layout' Fergal Moran 2016-06-22 20:32:40 +01:00
  • 3e107fb217 Fixed upload flow Fergal Moran 2016-06-22 20:32:38 +01:00
  • 89ecb181f8 Pre-merge Fergal Moran 2016-06-22 18:34:38 +01:00
  • 29d54ee979 Added safe apply Fergal Moran 2016-06-21 22:25:08 +01:00
  • 7b3226cbd6 f Fergal Moran 2016-06-21 22:12:38 +01:00
  • 99978210dc Gritter images Fergal Moran 2016-06-21 22:06:55 +01:00
  • 4dfbfee265 g Fergal Moran 2016-06-21 22:06:10 +01:00
  • 448839fa64 Removed long gritter time Fergal Moran 2016-06-21 21:46:07 +01:00
  • 7602031a2e Local gritter (for image urls) Fergal Moran 2016-06-21 21:38:49 +01:00
  • ce7c5a0fab Added gritter images to assets (hacky) Fergal Moran 2016-06-21 21:18:29 +01:00
  • 8e66601ead Build fixes Fergal Moran 2016-06-21 20:35:55 +01:00
  • c043b7e19d Live env fixes Fergal Moran 2016-06-21 20:33:56 +01:00
  • 8bc258f917 LF Fergal Moran 2016-06-21 10:18:40 +01:00
  • 84cdd04900 Merge branch 'develop' Fergal Moran 2016-06-20 21:59:20 +01:00
  • 86429b6621 Rich toast sorted Fergal Moran 2016-06-20 21:59:08 +01:00
  • 9ea24f6986 Fixed notifications dropdown Fergal Moran 2016-06-20 20:26:07 +01:00
  • 9fa849dd6c Template sorted Fergal Moran 2016-06-20 20:05:38 +01:00
  • 66d7c00332 Sockets working Fergal Moran 2016-06-14 21:55:56 +01:00
  • 6faf75d264 Added docker build file Fergal Moran 2016-06-09 19:59:27 +01:00
  • 92d651c631 Added docker build file Fergal Moran 2016-06-09 19:59:10 +01:00
  • d940575fbe Merge tag '3.5.1' into develop Fergal Moran 2016-06-08 23:16:44 +01:00
  • 864f4479db Merge branch 'release/3.5.1' Fergal Moran 2016-06-08 23:16:28 +01:00
  • c80f54b510 Version bump Fergal Moran 2016-06-08 23:16:18 +01:00
  • 94f886d1c6 Fixed stuff Fergal Moran 2016-06-08 23:15:06 +01:00
  • 0eaa358714 Merge branch 'socket_fixes' Fergal Moran 2016-06-03 20:52:26 +01:00
  • c7eecf6e4a Waveform signalling fixes Fergal Moran 2016-06-03 20:51:56 +01:00
  • 47f703c477 Facebook share template Fergal Moran 2016-05-24 20:27:31 +01:00
  • 89b6cae9b8 Fixed og:url in mix template Fergal Moran 2016-02-09 21:11:31 +00:00
  • 3e9da44417 Fake Fergal Moran 2016-02-09 18:57:42 +00:00
  • 1a47eaadb5 Fixed angular version in bower Fergal Moran 2016-02-08 23:19:58 +00:00
  • 3feada6a0d Routes stuff for FB Fergal Moran 2016-02-08 23:00:07 +00:00
  • 6067882f0d Merge tag '3.4.2' into develop Fergal Moran 2016-02-08 20:33:31 +00:00
  • 045ca5d80a Merge branch 'release/3.4.2' Fergal Moran 2016-02-08 20:33:24 +00:00
  • b0080855ef Release start Fergal Moran 2016-02-08 20:32:38 +00:00
  • 1a5a4794e1 Added logging to FB redirect Fergal Moran 2016-02-08 20:32:09 +00:00
  • 318eb9462e Fixed origin URL in twitter login Fergal Moran 2016-02-05 22:50:15 +00:00
  • 9f7eb3b3eb Removed some crud and fixed logout Fergal Moran 2016-02-04 20:17:09 +00:00
  • b2d7f27910 Merge tag 'fb_https' into develop Fergal Moran 2016-02-03 21:13:37 +00:00
  • 9179e31bc7 Merge branch 'hotfix/fb_https' Fergal Moran 2016-02-03 21:13:25 +00:00
  • f1df5f1fcd Auto detect https in node server Fergal Moran 2016-02-03 21:13:23 +00:00
  • 9213574b91 Fixed api URL Fergal Moran 2016-02-03 20:38:16 +00:00
  • 8bcf21563f Fixed google redirect Fergal Moran 2016-01-30 15:09:36 +00:00
  • dbe8739718 Infinite Scroll version Fergal Moran 2016-01-27 00:09:36 +00:00
  • 32de554824 Merge conflicts Fergal Moran 2016-01-26 22:18:00 +00:00
  • 3a895df75c Version bump Fergal Moran 2016-01-26 22:07:56 +00:00
  • 78ff35990f Merge conflicts Fergal Moran 2016-01-26 22:07:10 +00:00
  • 6b4bb7b601 Feature finished Fergal Moran 2016-01-26 22:02:48 +00:00
  • 0ab088f80a Getting nowhere Fergal Moran 2016-01-17 21:13:23 +00:00
  • f817d24aca Unsure Fergal Moran 2016-01-14 23:19:04 +00:00
  • 47563b77b7 Merge tag 'mobile_layout' into develop Fergal Moran 2016-01-13 20:38:39 +00:00
  • 38e0175e98 Merge branch 'hotfix/mobile_layout' Fergal Moran 2016-01-13 20:38:25 +00:00