Commit Graph

2626 Commits

Author SHA1 Message Date
Seth Call e8fe86e504 * VRFS-1083 user_authorizations require user now; found some bugs 2014-02-07 17:18:57 +00:00
Seth Call 7cf866b4b8 * merged 2014-02-07 14:11:24 +00:00
Seth Call b668e54f57 * VRFS-1083 - twitter mostly working; need to deal with edge cases 2014-02-07 14:07:08 +00:00
Brian Smith f7e4a49fa9 VRFS-1020 share dialog 2014-02-07 02:14:34 -05:00
Brian Smith 003b5f8d33 VRFS-1020 display share URL on dialog 2014-02-07 00:57:31 -05:00
Brian Smith db21415b7b remove space 2014-02-06 20:44:43 -05:00
Seth Call 47694c5f52 * adding tests for share_resolver 2014-02-06 21:53:19 +00:00
Seth Call 7e1d5c1e4e * fixing controller 2014-02-06 21:44:49 +00:00
Seth Call 1c6c1da027 * fixing associations 2014-02-06 21:41:35 +00:00
Seth Call 28c2298931 * removing set of shareable_id 2014-02-06 21:12:40 +00:00
Seth Call 9598c06e1f * moved shareable_resolver into new controller, and made tests 2014-02-06 21:02:04 +00:00
Seth Call caa565470d * VRFS-1081 - restyle share dialog 2014-02-06 18:59:19 +00:00
Seth Call 4c39e45708 * merged 2014-02-06 16:35:33 +00:00
Seth Call 36bc5cb72d * adding in new logos 2014-02-06 16:32:04 +00:00
Seth Call 17961e676d * VRFS-1077 done 2014-02-06 16:31:52 +00:00
Brian Smith bc305cac5e VRFS-1020 fix share token design 2014-02-06 00:45:48 -05:00
Seth Call 10573fd37a * merged 2014-02-05 11:20:18 +00:00
Brian Smith 3f9bb9bdad VRFS-1020 share dialog work 2014-02-05 02:15:55 -05:00
Brian Smith fbba95856d VRFS-1020 share dialog work 2014-02-05 01:51:26 -05:00
Seth Call eadeb5888f * working on fb integration 2014-02-05 03:17:19 +00:00
Seth Call 0d0ed1de5e * fix share-dialog name 2014-02-05 02:17:52 +00:00
Seth Call a43399a95d * more error handling 2014-02-05 02:12:38 +00:00
Seth Call badeb5ba70 * fix syntax error 2014-02-05 01:58:11 +00:00
Seth Call 669e8e2862 Merge branch 'feature/share_dialog' of bitbucket.org:jamkazam/jam-cloud into feature/share_dialog 2014-02-05 01:55:55 +00:00
Seth Call ca7a69a465 * working on checkboxes 2014-02-05 01:55:51 +00:00
Brian Smith 11fbcc96e7 merge develop 2014-02-04 20:23:08 -05:00
Brian Smith 9e72e6510a merge develop 2014-02-04 20:21:24 -05:00
Seth Call 52f783f70e * fixing another issue with recording id vs claimed recording id 2014-02-04 23:21:34 +00:00
Seth Call 0f29d020a9 * oops fixed a typo in recording reorg 2014-02-04 23:17:38 +00:00
Seth Call c1bee157dd * refactor recordings in the same way 2014-02-04 23:15:12 +00:00
Seth Call ea48b6aa36 * reorging music session page to have most code in JS file 2014-02-04 23:09:13 +00:00
Seth Call fe0c4a374d * adding 'extra_js' block to web layout 2014-02-04 23:00:11 +00:00
Seth Call a25ccf5ced * fixing typo in @music_sessions variable 2014-02-04 22:45:37 +00:00
Seth Call 4549282f0d * trying no-https rubygems for a bit, see if it helps build 2014-02-04 21:53:37 +00:00
Seth Call 11c5c8723b * changing url to mp3_url and ogg_url in rabls 2014-02-04 21:49:33 +00:00
Seth Call 636ca9b891 * VRFS-1076 - fix for leave session being broken 2014-02-04 21:45:34 +00:00
Seth Call 8c1e2c5df6 * backend handles these notfications already VRFS-1067 2014-02-04 21:21:51 +00:00
Seth Call dab9063fb9 * backend handles these notfications already VRFS-1067 2014-02-04 21:20:30 +00:00
Seth Call 148009ece5 * VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg 2014-02-04 20:28:00 +00:00
Seth Call 9ce300db56 * fix for welcome.js not being in assets 2014-02-04 19:10:31 +00:00
Seth Call 9526be15ad * finish renaming back ShareDialog 2014-02-04 18:25:53 +00:00
Seth Call 103954cb96 * VRFS-1074 - create run folders for pids on every upstart start 2014-02-04 18:18:15 +00:00
Seth Call 389b6d5635 * rename it all back to Sharedialog 2014-02-04 18:04:12 +00:00
Seth Call ff8eea553f * finish rename of ShareDialog to ShareSessionDialog 2014-02-04 17:28:49 +00:00
Seth Call ae8b6ebbc7 * renaming all ShareDialog to ShareSessionDialog 2014-02-04 17:05:38 +00:00
Seth Call c3a51989fd * changing to localhost:3000 instead of jamkazamdev.local 2014-02-04 14:40:05 +00:00
Seth Call 5df00b2883 * VRFS-1012-fixing any URLs that don't start with /client 2014-02-04 13:48:13 +00:00
Jonathan Kolyer 7797b6907c vrfs152: added GA tracking for FB invites 2014-02-04 01:16:16 -06:00
Jonathan Kolyer 3414229384 vrfs152: added test to allow multiple signups with a fb invite 2014-02-04 01:12:34 -06:00
Seth Call dc70f349b6 * overlay-small i being pulled 150px to the left 2014-02-04 03:16:39 +00:00