seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,085 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

439 Commits

Author SHA1 Message Date
Jonathan Kolyer 0b9eec4823 fixed broken tests again 2014-02-18 00:12:47 -06:00
Jonathan Kolyer cba678616f fixed broken test from refactoring of followers 2014-02-17 23:38:35 -06:00
Seth Call d6149a3908 * pin rails to 3.x 2014-02-18 04:54:33 +00:00
Seth Call 8483239054 * pg_migrate bump to 0.1.13 with relaxed thor version 2014-02-18 03:42:42 +00:00
Seth Call b9e20ba446 * moving recording_plays to where it belongs 2014-02-17 23:56:17 +00:00
Seth Call 51d446ab62 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-17 23:26:58 +00:00
Seth Call 4f964a7294 * VRFS-1135 baby steps to play storting 2014-02-17 23:26:53 +00:00
Seth Call 5654f27b55 * merged 2014-02-17 23:26:17 +00:00
Seth Call 0218ca5ad6 * urls fixed for VRFS-1148 2014-02-17 19:12:52 +00:00
Seth Call 5ae2a769b5 * fix mix regressions due to addition of MixUploader 2014-02-17 03:56:42 +00:00
Seth Call 134974af61 * fix issue 2014-02-17 02:52:00 +00:00
Seth Call ff6b3795ce * merged 2014-02-17 00:32:51 +00:00
Seth Call 5ef630cf86 * in progress on next parameter VRFS-1135 2014-02-17 00:30:08 +00:00
Brian Smith 348f96f5b0 fix bugs 2014-02-16 17:39:26 -05:00
Brian Smith 83f347e84c merge like/follow refactor and hover bubble work 2014-02-16 16:03:32 -05:00
Brian Smith ebc49b6ccc VRFS-1028 more refactor work 2014-02-16 14:48:54 -05:00
Brian Smith a1828cd93d trying to fix tests 2014-02-16 13:06:36 -05:00
Seth Call 8cfe032dc2 * adding error info to debug VRFS-1140 and pagination in progress on VRFS-1135 2014-02-16 14:04:24 +00:00
Brian Smith 5ba98b93ab fixing tests in progress 2014-02-16 08:40:03 -05:00
Seth Call f7d0ef2b05 * VRFS-1135 only one recording comes back; not per claimed recording 2014-02-16 13:10:00 +00:00
Jonathan Kolyer 4dd15d1146 Merge branch 'develop' into vrfs1110 2014-02-16 02:32:53 -06:00
Jonathan Kolyer cddf9a5013 added active_latests convenience method 2014-02-16 02:31:44 -06:00
Jonathan Kolyer 37025a68d7 VRFS-1110 changed param name; added api request support 2014-02-16 01:28:39 -06:00
Brian Smith 36287d0b5f VRFS-1028 hover bubble / like and follow refactor 2014-02-16 02:28:35 -05:00
Jonathan Kolyer b0dcb4a934 VRFS-1110 add autocomplete tests 2014-02-16 00:17:56 -06:00
Brian Smith c173582aa3 more work on like/follow refactor 2014-02-15 20:24:51 -05:00
Brian Smith c03404d520 like/follow refactor 2014-02-15 18:23:00 -05:00
Seth Call 26a8b8013d * VRFS-1135 - initial implementation with no ways to control the returned results. it just returns most recent to oldest now, with a max of 20 2014-02-15 21:19:03 +00:00
Brian Smith 5a03ec87ae follow/like refactor to use polymorphic associations 2014-02-15 11:55:01 -05:00
Seth Call 0fbd3543ca * VRFS-1118 fix hidden text problem 2014-02-14 23:41:01 +00:00
Seth Call b534a1e757 * trying rcov formatter for jenkins integration (VRFS-1103) 2014-02-13 21:17:47 +00:00
Seth Call 240967f7ce * VRFS-1098 - fixed case where registering as a musician in the native interface sends you to downloads (goofy). Also refactoder is_native_client? into a helper 2014-02-13 18:27:38 +00:00
Seth Call 763538e136 * VRFS-1095 fixing copy-to-clipboard for share dialog in native client. 2014-02-13 17:51:51 +00:00
Seth Call 5ba4e97dca * VRFS-1089 - jamadmin creation of recordings done 2014-02-13 16:41:50 +00:00
Seth Call 52f9bde0a3 * taking gon to 5.0.1 for now 2014-02-13 14:19:08 +00:00
Seth Call 0f0521ccf8 * VRFS-152-replace localhost with 127.0.0.1, if present 2014-02-11 17:25:03 +00:00
Seth Call 652c56dafd * VRFS-924 haml added 2014-02-11 15:53:20 +00:00
Seth Call 524ef6d833 * left in typo right before commit 2014-02-08 03:09:25 +00:00
Seth Call b90bfe97ec Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-08 03:07:56 +00:00
Seth Call fa7f83a371 * VRFS-1090 all_discarded add to db schema 2014-02-08 03:05:16 +00:00
Jonathan Kolyer 966075c885 VRFS-1034 fixed image uploading for buzz; added UI text instructing user to upload image before editing text 2014-02-07 20:26:17 -06:00
Seth Call 64de2bc4cb * VRFS-980 - escape special characters in the filename of the avatar 2014-02-07 23:56:39 +00:00
Seth Call 7661fc5e39 * VRFS-1082 and VRFS-1083 - centralize facebook logic for invitationDialog, and add twitter integration into share dialog 2014-02-07 21:28:47 +00:00
Seth Call e8fe86e504 * VRFS-1083 user_authorizations require user now; found some bugs 2014-02-07 17:18:57 +00:00
Seth Call b668e54f57 * VRFS-1083 - twitter mostly working; need to deal with edge cases 2014-02-07 14:07:08 +00:00
Seth Call 47694c5f52 * adding tests for share_resolver 2014-02-06 21:53:19 +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 4c39e45708 * merged 2014-02-06 16:35:33 +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 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 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
Seth Call d4a5737c51 * VRFS-1025 finished 2014-02-03 21:19:14 +00:00
Seth Call 513fb2b8d4 * intsall to vendor/bundle 2014-02-02 14:03:31 -06:00
Seth Call 3ded3ff39c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-02 13:35:33 -06:00
Seth Call b256182cc6 * VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1 2014-02-02 13:34:53 -06:00
Jonathan Kolyer da9a001e43 fixed issues editing buzz entries 2014-02-01 21:59:25 -06:00
Jonathan Kolyer d92d02a361 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-01 21:52:40 -06:00
Jonathan Kolyer 61de77c7e1 vrfs152: fixed broken tests 2014-02-01 21:48:46 -06:00
Seth Call aaf4914885 VRFS-1054 removing reload slush 2014-02-01 20:46:38 -06:00
Seth Call 5dc376fa23 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-01 20:46:04 -06:00
Seth Call 7f409c2cb4 VRFS-1054 removing reload slush 2014-02-01 20:45:58 -06:00
Anthony Davis a3f8d9288c VRFS-923 - deleting at the object level instead. works fine on my machine. 2014-02-01 19:30:23 -06:00
Seth Call 6ae07fa187 * make icecast config job wait configurable amount of time after reloading before moving on (hack until VRFS-1043) 2014-02-01 15:59:43 +00:00
Seth Call 68221090eb * marking pending a test that fails on mac, not linux 2014-02-01 05:02:56 +00:00
Seth Call 4e89a686e2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-01 04:51:49 +00:00
Seth Call 4ce77a44b3 * VRFS-1039 - add extension to mount name 2014-02-01 04:51:38 +00:00
Seth Call 6806d6f0d3 * VRFS-1016 2014-01-31 14:25:17 -06:00
Seth Call d5478dc926 * removing force:true in IcecastConfigWriter 2014-01-31 13:19:46 -06:00
Seth Call 3517cf048b * re-establish pg connection before/after fork 2014-01-31 12:37:43 -06:00
Seth Call c9b58229c4 * fixing broken tests some more 2014-01-31 10:04:17 -06:00
Seth Call 3d6069bdb3 * fix broken tests 2014-01-31 09:32:18 -06:00
Brian Smith edebf42e73 VRFS-1020 share dialog work 2014-01-31 01:39:09 -05:00
Seth Call b4b120aa3b * removing first_recording_at method and allowing server_id to be modified 2014-01-30 20:43:35 -06:00
Seth Call f1a8c1b744 * remove first_recording_at method 2014-01-30 20:39:42 -06:00
Seth Call 3a5321dc5c * merging manifest and user 2014-01-30 15:53:22 -06:00
Seth Call 6ccfc4cc08 * VRFS-1010 possibly done 2014-01-30 15:51:05 -06:00
Seth Call 956b25c577 * fixing bug when icecast.xml exists VRFS-1010 2014-01-30 09:32:12 -06:00
Jonathan Kolyer c22331c010 conflict merge 2014-01-29 23:05:09 -06:00
Jonathan Kolyer e839c8cb69 vrfs152: moved generate_signup_url into invited_user 2014-01-29 22:48:35 -06:00
Jonathan Kolyer 4a1ebb7630 vrfs152: added test for facebook_invite! 2014-01-29 21:37:49 -06:00
Jonathan Kolyer a73d4d758d vrfs152: created one FB invite constraint 2014-01-29 21:22:37 -06:00
Seth Call 3903822ca5 * overriding lock timeout for LonelyJobs 2014-01-29 14:33:47 -06:00
Seth Call 3d453468f2 * adding ability to run everything within jam-web for jobs 2014-01-29 13:24:34 -06:00
Brian Smith 555b53e3c3 format code 2014-01-28 10:31:57 -05:00
Brian Smith 3ad56b4142 fix session bug 2014-01-28 10:30:16 -05:00
Brian Smith 374a9da957 VRFS-986 landing page dev complete 2014-01-28 02:35:35 -05:00
Brian Smith 40a8dbd89e remove binding.pry 2014-01-26 16:48:15 -05:00
Brian Smith 1463866c75 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-26 16:46:46 -05:00
Brian Smith 998ebfdc6c VRFS-986 landing page sidebar complete / session landing fixes 2014-01-26 16:46:41 -05:00
Seth Call 708da1fb70 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-26 14:46:23 -06:00
Seth Call 8f5a2a6369 * tell NOKOGIRI to use system libraries in build environment 2014-01-26 14:46:11 -06:00
Seth Call 576e8deeee * fixing recursion bug in eventmachine.rb 2014-01-26 19:51:56 +00:00
Seth Call 8cf8e7ae1d * skip Unicorn check when running a worker 2014-01-25 22:31:06 -06:00
Seth Call afb0f30c9f * still working on this bugsnag issue VRFS-1023 2014-01-25 21:24:14 -06:00
Seth Call d23ca37a82 * fix for VRFS-1023; bugsnag preventing rails from starting 2014-01-25 21:07:39 -06:00
Seth Call 90583f8463 * actually comment out audiomixer tests, hwich fail on server 2014-01-25 18:53:59 -06:00
Seth Call ad1521c98b * VRFS-1022 make sure to use resolve_string mime_type, subtype, bitrate, and again try to disable tests in rspec 2014-01-25 17:38:03 -06:00
Seth Call d93d27db52 * trying to disable testsgg 2014-01-25 16:48:24 -06:00
Seth Call bf7b09e820 * marking a few tests as pending 2014-01-25 16:23:57 -06:00
Seth Call e63e718091 * merged 2014-01-25 14:19:12 -06:00
Seth Call 96768b7979 * VRFS-1022 finished 2014-01-25 14:03:14 -06:00
Brian Smith d6a38f6bee VRFS-986 bug fixes 2014-01-23 21:43:49 -05:00
Brian Smith 30b13ed538 merge develop 2014-01-22 21:21:40 -05:00
Seth Call 35466433ca Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-22 16:23:46 -06:00
Seth Call 4b13c5c16c * making ubuntu command need sudo, and adding ubuntu template maker 2014-01-22 16:23:33 -06:00
Seth Call 7c375278f8 * fixing jamadmin pages 2014-01-21 20:30:40 -06:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Brian Smith aa056d53fd VRFS-986 recent history sidebar for landing pages 2014-01-21 01:45:51 -05:00
Brian Smith 6660102982 VRFS-986 landing page work 2014-01-20 09:28:06 -05:00
Brian Smith eea5cc781e VRFS-986 landing page work 2014-01-19 17:23:10 -05:00
Seth Call dea36d897f * VRFS-982 and VRFS-1003 - making every table that's directly related to music_session be UNLOGGED 2014-01-19 05:17:30 +00:00
Seth Call 5c8e315ee5 * pending didn't take 2014-01-19 03:32:36 +00:00
Seth Call 13f711754c * suppressing the other failing test on the build server 2014-01-19 03:14:00 +00:00
Seth Call 4e05affc77 * disabling audiomixer tests until I figure out why it's failing on audiomixer 2014-01-19 02:56:35 +00:00
Seth Call e57946afd2 * fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006) 2014-01-19 02:20:44 +00:00
Seth Call f327317ede Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-17 19:55:42 +00:00
Seth Call 8644f4cbc3 * VRFS-1006 admin pages added to icecast 2014-01-17 19:55:26 +00:00
Seth Call 5d6e34f374 * VRFS-1000 - mapped all the castles, got the xml working, and added more tests 2014-01-17 04:51:19 +00:00
Seth Call cfa2ba383a * fixing EM test and removing old pending tests 2014-01-16 12:37:25 +00:00
Seth Call ece0b9bf87 * suppressing puts to stdout in test runs 2014-01-16 03:29:52 +00:00
Seth Call 01e50b45b3 * fixes for EventMachine initialization to work in ruby-only context (without web) 2014-01-16 02:21:28 +00:00
Seth Call 7d90425864 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-15 22:20:29 +00:00
Seth Call 63d6f428b3 * VRFS-997 - mix notifications 2014-01-15 22:15:33 +00:00
Seth Call dc781f04ad Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-15 18:00:59 +00:00
Seth Call b8829b417a * VRFS-997 - mix complete notification 2014-01-15 18:00:45 +00:00
Jonathan Kolyer 42713f4c9d vrfs152: allowing invited_users to have null email 2014-01-15 04:10:13 -06:00
Jonathan Kolyer 8f7a959a9e vrfs152: relaxed requirement for an email address 2014-01-15 03:56:46 -06:00
Seth Call f6d1869d52 * adding folders for the various jobs 2014-01-14 21:16:38 -06:00
jam 10687093c1 Resolve conflicts 2014-01-14 21:24:45 +00:00
jam b15604c148 Icecast modules and test 2014-01-14 21:22:05 +00:00
Daniel Weigh 4bdd77f171 * placeholder scroller for feed. 2014-01-21 21:56:35 -05:00
Brian Smith 59f6e10e55 VRFS-986 recording landing page work 2014-01-14 02:49:21 -05:00
Seth Call a7fa73cfb3 * VRFS-801 still working out some mixer devops issues now; 2014-01-13 22:48:55 +00:00
Seth Call 50595d155c * VRFS-801 - closer to all fixes required for mixing 2014-01-13 13:44:28 +00:00
Seth Call 8f5b021464 * adding fixed test 2014-01-13 13:23:09 +00:00
Seth Call da784f2cd0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-13 11:23:41 +00:00
Seth Call a61ff76dae * stringifying id field in response to client downloads 2014-01-13 11:23:35 +00:00
Jonathan Kolyer c4d04adb77 vrfs988: fixed broken search test 2014-01-12 22:23:18 -06:00
Brian Smith 6d42e42c18 VRFS-987 backend support for session/recording likes, plays, and comments 2014-01-12 12:51:06 -05:00
Jonathan Kolyer e0d8dd286a vrfs988: updated to work with new search attribute names 2014-01-12 02:58:04 -06:00
Jonathan Kolyer e539157d76 Merge branch 'develop' into vrfs988 2014-01-12 02:53:11 -06:00
Jonathan Kolyer 74e95ad908 vrfs988: added band spec and band.website value integrity on save 2014-01-12 02:49:57 -06:00
Jonathan Kolyer 48bde580ae vrfs988: fixed filter searchtype bug 2014-01-12 01:48:15 -06:00
Jonathan Kolyer da980ce699 vrfs988: refactoring search results; added fans/bands result template handling 2014-01-11 23:34:23 -06:00