Commit Graph

261 Commits

Author SHA1 Message Date
Brian Smith a1828cd93d trying to fix tests 2014-02-16 13:06:36 -05:00
Brian Smith 5ba98b93ab fixing tests in progress 2014-02-16 08:40:03 -05:00
Brian Smith 36287d0b5f VRFS-1028 hover bubble / like and follow refactor 2014-02-16 02:28:35 -05: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
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 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 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
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 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
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 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 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