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

99 Commits

Author SHA1 Message Date
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
Mike Slemmer c03a6751dd fix test 2013-04-25 00:08:19 -07:00
Mike Slemmer 8d4fd2aeaf more recordings work 2013-04-24 23:50:52 -07:00
Seth Call fe222ff13a * perrfdata model 2013-04-16 19:36:01 -05:00
Seth Call 2e157bf157 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-04-15 21:12:18 -05:00
Seth Call 7d17742f46 * perfdata 2013-04-15 21:12:16 -05:00
Mike Slemmer 3abde183b7 added model stuff for mix 2013-04-12 15:36:05 -07:00
Seth Call 8ca4848d28 * updating ArtifactUpdate to reflect new mandatory fields 2013-04-10 01:16:04 -05:00
Brian Smith 5c59e55149 VRFS-281 added abstraction layer for notifications 2013-03-21 23:18:41 -04:00
Seth Call 21ab1db405 * VRFS-200 added a can_invite check so that endusers can't create an invite 2013-03-21 01:47:11 -05:00
Seth Call 42429d4395 * VRFS-259: beta signup 2013-03-14 23:22:31 -05:00
Seth Call 6a9b43c7de Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-03-01 07:35:58 -06:00
Seth Call 88136c06c7 * allow user model to permit null first/last on administrative signup 2013-03-01 07:35:50 -06:00
Jonathan Kolyer 1b62522ce3 vrfs192: added stale_connection_client_ids and flag_connection_stale_with_client_ids to allow websocket-gateway ability to cleanup when stale connection is deleted 2013-02-21 11:36:58 -06:00
Brian Smith aa19d59914 limit to 1 genre 2013-02-16 16:10:45 -05:00
Mike Slemmer 42596d6506 Merge branch 'slemmer_20130122' 2013-02-16 01:23:57 -08:00
Seth Call 713b4b6f4b * VRFS-217; necessary changes to test and make artifact model work with carrierwave 2013-02-12 22:40:01 -06:00
Seth Call 1b1ac040a6 merged gemfile 2013-02-12 20:06:23 -06:00
Seth Call 717f076cc7 * artifact_update; changes with sha1 2013-02-12 19:56:40 -06:00
Mike Slemmer e767deb875 fixed conflicts 2013-02-12 14:16:48 -08:00
Jonathan Kolyer 172b3067d5 Merge branch 'vrfs192' 2013-02-11 00:27:20 -06:00
Jonathan Kolyer 44d2aba3c6 refactored names for connection states 2013-02-11 00:02:25 -06:00
Jonathan Kolyer be981979c8 vrfs192: added tests for connection state and removing/flagging stale connections 2013-02-06 07:14:00 -06:00
Seth Call 47cc69a5f0 * adding artifact_updte table 2013-02-05 23:14:07 -06:00
Mike Slemmer 4f4b7219d8 more work 2013-02-04 18:07:08 -08:00
Mike Slemmer cfd5af8c95 more work 2013-02-04 11:12:20 -08:00
Mike Slemmer 051a841995 more work 2013-01-31 00:25:07 -08:00
Mike Slemmer a3e93a208d minor update 2013-01-30 09:57:12 -08:00
Brian Smith ceaf4119af added participants as filter criteria / fixed bug with genre filter 2013-01-30 10:43:01 -05:00
Mike Slemmer 33c3a54d12 more work 2013-01-29 21:46:56 -08:00
Mike Slemmer 5d1af73685 more work 2013-01-29 21:46:40 -08:00
Mike Slemmer 9ae702eaaf more work 2013-01-16 16:38:57 -08:00
Mike Slemmer f1dc45bc0b more work 2013-01-15 14:54:17 -08:00
Mike Slemmer 60366d5c0e more work 2013-01-14 18:13:45 -08:00
Seth Call 41781e8121 * VRFS-217 a test I should have had all along 2013-01-13 23:03:15 -06:00
Seth Call 7c2b5da509 * VRFS-217: replacing elasticsearch with pg 2013-01-13 22:50:38 -06:00
Jonathan Kolyer 651dd72665 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-01-04 04:13:44 -06:00
Brian Smith 3bfae973b9 fixed unit test to insert into session_history table on session creation 2013-01-06 16:38:03 -05:00
Jonathan Kolyer 7d1e7417ed VRFS-194: added can_invite attribute, defaults to true, but false for invited users 2013-01-04 04:13:39 -06:00
Mike Slemmer 9db67b98c8 fix test 2012-12-21 21:35:45 -08:00
Mike Slemmer a5f6bc725a reset password work 2012-12-21 16:56:16 -08:00
Mike Slemmer 81ebd4aa99 fixed test 2012-12-14 01:07:14 -08:00
Mike Slemmer 0a4e41e5d1 set_password plus some refactoring 2012-12-13 19:32:23 -08:00
Mike Slemmer 7ff103a430 more work 2012-12-13 09:15:47 -08:00
Mike Slemmer c068f2ca16 work 2012-12-11 14:59:37 -08:00
Seth Call 990e4c1a0d * require 'legal_terms' boolean = true on create session 2012-12-09 16:11:01 -06:00
Seth Call af8bee6084 * VRFS-149; bootstrap dev users 2012-12-09 14:56:35 -06:00