Commit Graph

292 Commits

Author SHA1 Message Date
Brian Smith 3ca2a9b12e Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-07-08 00:12:13 -04:00
Brian Smith cb1e50374b VRFS-377 fix API key 2013-07-08 00:11:03 -04:00
Seth Call fb9a866062 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-07-07 20:51:37 -05:00
Seth Call 4bdca93b63 * updating pg gem to coincide with jam-db 2013-07-05 13:12:22 -05:00
Mike Slemmer c0b9472b07 VFRS-402 2013-07-05 01:24:12 -07:00
Brian Smith 5eb90fe4b5 VRFS-377 desk.com integration 2013-07-04 17:10:46 -04:00
Seth Call b09b2a5ad4 * adding a method called 'unique_users in MusicSessionHistory so that you can easily see what users joined the session VRFS-268 2013-07-02 20:11:04 -05:00
Mike Slemmer dfad349bc0 fixed test 2013-06-30 18:25:01 -07:00
Mike Slemmer 3a59c3b86b more work 2013-06-30 13:55:03 -07:00
Brian Smith 4e08d1180e another attempt to fix tests 2013-06-26 20:11:13 -04:00
Brian Smith bb832f3fef another attempt to fix tests 2013-06-26 18:07:03 -04:00
Brian Smith 3569eecf3d fix tests 2013-06-26 12:28:21 -04:00
Brian Smith 4980f1929a fix tests 2013-06-26 12:24:38 -04:00
Brian Smith b52bf2b779 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-06-26 11:16:42 -04:00
Brian Smith 7ddeab5ce2 fix tests 2013-06-26 11:16:28 -04:00
Seth Call 317b4497b3 t pMerge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-06-25 23:29:07 -05:00
Seth Call 83ffdd6574 * updatingt size/md5 on both created and update of artifact 2013-06-25 23:28:54 -05:00
Brian Smith 477954aa5f VRFS-107 session join / departure notifications 2013-06-25 23:10:21 -04:00
Seth Call 78b4b28920 * amqp gem pinned 2013-06-24 20:44:16 -05:00
Seth Call aa5f8d87d2 * still pinning versions; actionmailer this time 2013-06-24 20:35:40 -05:00
Seth Call 9644e13812 * pinning eventmachine to see if that helps 2013-06-24 20:33:56 -05:00
Seth Call b30e9d9006 * pinning rails version to see if this fixes jam-ruby 2013-06-24 20:31:45 -05:00
Seth Call c261fe4929 * adding verbose flag to busndle update to see why it's taking hours on build server 2013-06-24 20:17:36 -05:00
Seth Call bf6ed0f21c * removing HTTPS from rubygems because it supposedly helps things go faster 2013-06-24 17:02:37 -05:00
Seth Call 4a42cc2f33 * removing dependency of actionmailer_extensios 2013-06-24 16:58:45 -05:00
Seth Call b3e1b94764 * updating how slow tests are ran 2013-06-24 16:38:31 -05:00
Seth Call 918ad58d80 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-06-24 16:31:55 -05:00
Seth Call a78c8e0d63 * VRFS-300 and VRFS-386 done-all emails are styled using a common template 2013-06-24 16:31:40 -05:00
Brian Smith 3c3cc85b53 VRFS-385 search fix 2013-06-22 19:35:42 -04:00
Seth Call bd0b42533c * VRFS-378: allow user to be logged in right after signup, also supporting user signing up as a fan 2013-06-21 21:28:42 -05:00
Seth Call 80b23f7efe * allow update of genre 2013-06-10 20:37:10 -05:00
Seth Call 8594d6820f * not allowing null description; not validating genres when not being updated; not validating terms on update 2013-06-10 20:25:42 -05:00
Brian Smith d2747aa2f8 VRFS-263 include instruments in user search - may need index added on instrument_id column in musicians_instruments table 2013-06-08 21:38:00 -04:00
Seth Call 87f678669d * avatar changes to user model 2013-05-30 20:59:37 -05:00
Seth Call 137ed1b65a * checking in little s3 helper 2013-05-23 08:41:27 -05:00
Seth Call 4b3185c0c9 * adding max_mind model and csv import added (using postgres-copy gem) 2013-05-16 22:44:26 -05:00
Seth Call 0637c4c088 * typo in set_password fixed VRFS-312 2013-05-14 17:33:02 -05:00
Seth Call e4d5266245 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-05-14 14:02:34 -05:00
Seth Call a98a04738d * VRFS-312 in-app password updates 2013-05-14 14:02:22 -05:00
Mike Slemmer c1e91d87c9 eliminate favorites for now 2013-05-13 22:22:09 -07:00
Mike Slemmer faa3fe82a7 more work 2013-05-13 22:09:17 -07:00
Seth Call 5f31daccd1 * VRFS-311; reject users that try to set their email to the same email as it currently is 2013-05-12 22:27:12 -05:00
Seth Call 2dfdf8463c * VRFS-311 - emailing and user model business logic done 2013-05-10 07:10:33 -05:00
Seth Call 9d2ebe67cd erge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-05-07 11:54:14 -05:00
Seth Call d51feece12 * removing check for protected method (due to switch to ruby 2.0.0) 2013-05-07 11:52:31 -05:00
Mike Slemmer d3aa419b60 big recording push 2013-05-06 16:47:20 -07:00
Seth Call 5e64e6a7a2 * perf-data upload fixes 2013-05-05 19:17:16 -05:00
Brian Smith 87564c442b fix tests 2013-04-28 22:21:16 -04:00
Brian Smith 72cdd1b4d7 VRFS-305 musician profile bands tab 2013-04-28 15:06:17 -04:00
Brian Smith 00578afc49 VRFS-306 bug fixes to support followers/followings 2013-04-26 23:24:13 -04:00