Commit Graph

2657 Commits

Author SHA1 Message Date
Seth Call 52f9bde0a3 * taking gon to 5.0.1 for now 2014-02-13 14:19:08 +00:00
Seth Call a732d2a191 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-11 17:26:30 +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 c60322aaf4 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-11 15:52:39 +00:00
Seth Call 184ac3e834 * VRFS-924 haml added 2014-02-11 15:52:18 +00:00
Anthony Davis 000678f45e VRFS-1029 - updating copyright 2014-02-10 19:52:06 -06:00
Seth Call dc462d804d * VRFS-982 - style with custom easydropdown instead of select element 2014-02-10 22:43:09 +00:00
Jonathan Kolyer d47d007895 Merge branch 'vrfs152' into develop 2014-02-10 11:54:55 -06:00
Jonathan Kolyer 8a469e4943 VRFS-152 fixed sharing with FB auth in place 2014-02-10 11:54:19 -06:00
Seth Call a5d29cc8aa * fix (sign-in) state problem with fb login 2014-02-09 22:39:42 +00:00
Seth Call 2934755d46 * fix (sign-in) state problem with fb login 2014-02-09 22:39:18 +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 12d294f62f * fix typo in production config 2014-02-07 22:26:27 +00:00
Seth Call afbe4c09c2 * VRFS-1084-notify working on web layout 2014-02-07 21:44:57 +00:00
Seth Call ff9f132341 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-07 21:28:56 +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 b648c40587 * merged 2014-02-07 17:38:51 +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 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
Jonathan Kolyer bf04986e25 VRFS-1033 changed column names from {short,long}_text to Who/Quote 2014-02-06 13:07:32 -06: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
Daniel Weigh ac8913c027 VRFS-294
Updates to the band profile page
2014-02-06 08:11:20 -05:00
Daniel Weigh dddfb50c45 VRFS-1012 Fix band profile navigation.
forgot a file
2014-02-06 08:07:31 -05:00
Daniel Weigh 77e7b60ca5 VRFS-1012 Fix band profile navigation. 2014-02-06 08:03:44 -05: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
Seth Call ee67bb59b2 * fail on error 2014-02-05 11:14:07 +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 195c5fea7e * oops; missing comma for ogg url' 2014-02-05 03:18:17 +00: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 f86d7fbdd5 * deal with chuid differently so pre-script works 2014-02-05 02:13:41 +00:00