Commit Graph

88 Commits

Author SHA1 Message Date
Fergal Moran
0eaa358714 Merge branch 'socket_fixes' 2016-06-03 20:52:26 +01:00
Fergal Moran
c7eecf6e4a Waveform signalling fixes 2016-06-03 20:51:56 +01:00
Fergal Moran
47f703c477 Facebook share template 2016-05-24 20:27:31 +01:00
Fergal Moran
89b6cae9b8 Fixed og:url in mix template 2016-02-09 21:11:31 +00:00
Fergal Moran
3e9da44417 Fake 2016-02-09 18:57:42 +00:00
Fergal Moran
1a47eaadb5 Fixed angular version in bower 2016-02-08 23:19:58 +00:00
Fergal Moran
3feada6a0d Routes stuff for FB 2016-02-08 23:00:07 +00:00
Fergal Moran
6067882f0d Merge tag '3.4.2' into develop
3.4.2
2016-02-08 20:33:31 +00:00
Fergal Moran
045ca5d80a Merge branch 'release/3.4.2' 2016-02-08 20:33:24 +00:00
Fergal Moran
b0080855ef Release start 2016-02-08 20:32:38 +00:00
Fergal Moran
1a5a4794e1 Added logging to FB redirect 2016-02-08 20:32:09 +00:00
Fergal Moran
318eb9462e Fixed origin URL in twitter login 2016-02-05 22:50:15 +00:00
Fergal Moran
9f7eb3b3eb Removed some crud and fixed logout 2016-02-04 20:17:09 +00:00
Fergal Moran
b2d7f27910 Merge tag 'fb_https' into develop
Fixed https in node server
2016-02-03 21:13:37 +00:00
Fergal Moran
9179e31bc7 Merge branch 'hotfix/fb_https' 2016-02-03 21:13:25 +00:00
Fergal Moran
f1df5f1fcd Auto detect https in node server 2016-02-03 21:13:23 +00:00
Fergal Moran
9213574b91 Fixed api URL 2016-02-03 20:38:16 +00:00
Fergal Moran
8bcf21563f Fixed google redirect 2016-01-30 15:09:36 +00:00
Fergal Moran
dbe8739718 Infinite Scroll version 2016-01-27 00:09:36 +00:00
Fergal Moran
32de554824 Merge conflicts 2016-01-26 22:18:00 +00:00
Fergal Moran
3a895df75c Version bump 2016-01-26 22:07:56 +00:00
Fergal Moran
78ff35990f Merge conflicts 2016-01-26 22:07:10 +00:00
Fergal Moran
6b4bb7b601 Feature finished 2016-01-26 22:02:48 +00:00
Fergal Moran
0ab088f80a Getting nowhere 2016-01-17 21:13:23 +00:00
Fergal Moran
f817d24aca Unsure 2016-01-14 23:19:04 +00:00
Fergal Moran
47563b77b7 Merge tag 'mobile_layout' into develop
Added hidden-sm to comment holder
2016-01-13 20:38:39 +00:00
Fergal Moran
38e0175e98 Merge branch 'hotfix/mobile_layout' 2016-01-13 20:38:25 +00:00
Fergal Moran
17980af6a4 Fixed broken mobile mix view 2016-01-13 20:38:22 +00:00
Fergal Moran
77133991d0 Merge tag 'share_links' into develop
Fixed
2016-01-12 22:42:32 +00:00
Fergal Moran
d34472549e Merge branch 'hotfix/share_links' 2016-01-12 22:42:25 +00:00
Fergal Moran
96a00bb685 Fixed up share links 2016-01-12 22:42:21 +00:00
Fergal Moran
7dad41ec8b Added ng-clip 2016-01-12 13:49:16 +00:00
Fergal Moran
429689c79f Added back ngclipboard 2016-01-12 10:47:00 +00:00
Fergal Moran
7af981c4ff Fixed trailing slash in FB redirect 2016-01-11 21:52:59 +00:00
Fergal Moran
a5377a698a Fixed new API route 2016-01-11 21:31:30 +00:00
Fergal Moran
29f9f68fee Maybe not 2016-01-10 23:07:05 +00:00
Fergal Moran
7f84a00d21 Merge tag '3.3.1' into develop
Finished
2015-12-31 23:10:19 +00:00
Fergal Moran
08732cf8bc Merge branch 'release/3.3.1' 2015-12-31 23:10:12 +00:00
Fergal Moran
57946e75ca Version bump 2015-12-31 23:10:09 +00:00
Fergal Moran
7d2f1baf61 Fixed notifications selector 2015-12-31 23:09:19 +00:00
Fergal Moran
9dfb4ff54b Merge tag '3.3.0' into develop
Finished
2015-12-29 21:18:38 +00:00
Fergal Moran
2d13383676 Merge branch 'release/3.3.0' 2015-12-29 21:18:33 +00:00
Fergal Moran
052dae6988 Version bump 2015-12-29 21:18:28 +00:00
Fergal Moran
75e6f65fee Fixed infinite scroll 2015-12-29 21:17:54 +00:00
Fergal Moran
f92cc2bd07 Merge branch 'feature/mixes' into develop 2015-12-29 20:54:24 +00:00
Fergal Moran
e2098c2c76 Added copy button to mix 2015-12-29 20:54:18 +00:00
Fergal Moran
3a50c4bf46 Fixed edit controls being public 2015-12-27 21:38:18 +00:00
Fergal Moran
d6aa1cfbb4 Fixed mix redirect after upload 2015-12-27 21:23:38 +00:00
Fergal Moran
f73719882a Genre link working 2015-12-23 21:43:21 +00:00
Fergal Moran
37c513a135 Fixed infinite scroll 2015-12-21 20:32:15 +00:00