seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
2,530 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

228 Commits

Author SHA1 Message Date
Jonathan Kolyer c22331c010 conflict merge 2014-01-29 23:05:09 -06:00
Jonathan Kolyer 1a965b298b vrfs152: integrated fb invites to dropdown 2014-01-29 23:03:12 -06:00
Jonathan Kolyer 13df76e136 vrfs152: added dynamic fetching of facebook invited_user signup url 2014-01-29 22:49:36 -06:00
Brian Smith b457babf79 VRFS-1020 share dialog work 2014-01-29 21:37:36 -05:00
Jonathan Kolyer 7c39c3cd4c vrfs152: integration fb login into view code 2014-01-29 19:55:16 -06:00
Brian Smith 374a9da957 VRFS-986 landing page dev complete 2014-01-28 02:35:35 -05:00
Daniel Weigh a7f10d8141 VRFS-930 Musician fixes 
VRFS-931 Band fixes

Allows for (temporary?) hiding of buttons when FOLLOW is clicked.
 2014-01-26 13:44:06 -05:00
Daniel Weigh b98e6439d9 VRFS-930 Musician fixes 
"Oops". removed accidentally committed test text.
 2014-01-26 13:35:03 -05:00
Daniel Weigh f2d0801908 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-26 13:26:01 -05:00
Daniel Weigh 31a18a1f95 VRFS-931 Band tweaks 2014-01-26 13:25:19 -05: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
Brian Smith 73875a4950 merge develop 2014-01-25 13:26:56 -05:00
Brian Smith dcea238631 VRFS-1020 share dialog work 2014-01-25 10:37:15 -05:00
Brian Smith 30b13ed538 merge develop 2014-01-22 21:21:40 -05:00
Brian Smith aa056d53fd VRFS-986 recent history sidebar for landing pages 2014-01-21 01:45:51 -05:00
Brian Smith 6d482a034d VRFS-986 more landing page work 2014-01-16 02:50:13 -05:00
Brian Smith 4f9e36a332 VRFS-986 more landing page work 2014-01-16 01:55:36 -05: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 b8829b417a * VRFS-997 - mix complete notification 2014-01-15 18:00:45 +00:00
Daniel Weigh 703da937e8 VRFS-930 Musician fixes 2014-01-23 06:10:40 -05:00
Jonathan Kolyer a32697b2e4 vrfs1008: fixed typo 2014-01-14 03:19:21 -06:00
Jonathan Kolyer d2f71dd874 Merge branch 'vrfs1008' into develop 2014-01-14 02:31:48 -06:00
Daniel Weigh b8a51e9f6c VRFS-930 Musician fixes 2014-01-21 21:55:38 -05:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Jonathan Kolyer 91007055a0 vrfs1008: fixed updating invites bug 2014-01-14 02:29:07 -06:00
Jonathan Kolyer ea6391e46e vrfs1008: styled the invite dialog box; fixed bug updating invites 2014-01-14 01:52:22 -06:00
Brian Smith 59f6e10e55 VRFS-986 recording landing page work 2014-01-14 02:49:21 -05:00
Jonathan Kolyer 3c6af2e028 vrfs1008: sending updated invites 2014-01-14 01:31:20 -06:00
Jonathan Kolyer 61a7dcd50f vrfs1008: added existingInvites storage for updates 2014-01-14 01:01:37 -06:00
Jonathan Kolyer cfeed312bf vrfs1008: refactoring 2014-01-14 00:12:00 -06:00
Jonathan Kolyer 28d346fe23 vrfs1008: refactoring, cleanup, bug fixes 2014-01-14 00:02:54 -06:00
Jonathan Kolyer a8b7f3e5a6 vrfs1008: integration bug fixing 2014-01-13 23:18:09 -06:00
Jonathan Kolyer 33c64c2881 vrfs1008: fixing integration bugs 2014-01-13 22:33:32 -06:00
Jonathan Kolyer 11074044a7 vrfs1008: 2014-01-13 19:37:52 -06:00
Jonathan Kolyer 3e2ae677fe vrfs1008: integration with active session 2014-01-13 19:00:42 -06:00
Jonathan Kolyer a923025a80 vrfs1008: changed createInvitations to be anon fcn 2014-01-13 18:35:05 -06:00
Jonathan Kolyer ddcfef56c4 vrfs1008: added hook to external createInvitations function 2014-01-13 14:57:22 -06:00
Jonathan Kolyer d9d240541d vrfs1008: fixing integration of refactoring with createsession 2014-01-13 14:50:56 -06:00
Jonathan Kolyer f3ab5f8297 vrfs1008: createSession invite refactor integration 2014-01-13 10:35:34 -06:00
Jonathan Kolyer 8fdbc7cc08 vrfs1008: refactoring invite logic 2014-01-13 10:11:26 -06:00
Jonathan Kolyer ef01c9a8f1 vrfs1008: moved invite musician html into template for reuse in sessions page 2014-01-13 07:38:47 -06:00
Jonathan Kolyer 68b0fd92d6 vrfs988: updated #query on new search; added semicolons 2014-01-12 02:50:55 -06:00
Jonathan Kolyer 1276c66bd3 vrfs988: fixed sync bugs in searchResults 2014-01-12 02:11:54 -06:00
Jonathan Kolyer af4f03c91e vrfs988: refresh both sidebar and searchResults when search params changed 2014-01-12 02:02:15 -06:00
Jonathan Kolyer ddd1b93420 vrfs988: syncing the search type selections between searchResults and sidebar 2014-01-12 01:53:39 -06:00
Jonathan Kolyer 1a39f6296b vrfs988: changed band url to use website 2014-01-12 01:40:30 -06:00
Jonathan Kolyer da980ce699 vrfs988: refactoring search results; added fans/bands result template handling 2014-01-11 23:34:23 -06:00
Jonathan Kolyer a4816fecfd vrfs988: refactored search results processing 2014-01-11 22:44:58 -06:00
Jonathan Kolyer cdb2b9fab9 vrfs988: sidebar/searchresults 2014-01-11 20:18:20 -06:00
Jonathan Kolyer 2229babf68 vrfs-988: refactoring search as text by entity, rather than site-wide 2014-01-11 06:27:05 -06:00