 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 |
Brian Smith
|
da720c4f1c
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-04-13 22:58:38 -04:00 |
|
Brian Smith
|
3700738b84
|
VRFS-284 support for Accept Friend Request button in sidebar
|
2013-04-13 22:58:31 -04:00 |
Mike Slemmer
|
7ba0317aeb
|
return mixes with recordings
|
2013-04-12 17:16:40 -07:00 |
|
Mike Slemmer
|
3abde183b7
|
added model stuff for mix
|
2013-04-12 15:36:05 -07:00 |
|
Seth Call
|
b083f15304
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-04-10 01:16:13 -05:00 |
|
Seth Call
|
8ca4848d28
|
* updating ArtifactUpdate to reflect new mandatory fields
|
2013-04-10 01:16:04 -05:00 |
|
Brian Smith
|
23a0c16b7f
|
add null check for source_user before returning photo_url
|
2013-04-06 21:43:00 -04:00 |
|
Brian Smith
|
c3824cac25
|
VRFS-282 changes to support real-time notification updates in sidebar
|
2013-04-04 23:57:16 -04:00 |
|
Brian Smith
|
e53f712779
|
VRFS-282 changes to support real-time notification updates in sidebar
|
2013-04-04 13:12:06 -04:00 |
|
Brian Smith
|
28ecbdfa48
|
fix tests / move notification types to constants file
|
2013-03-31 17:49:47 -04:00 |
|
Brian Smith
|
7ec4d6021d
|
VRFS-282 VRFS-283 toasts / notifications for friend updates and requests
|
2013-03-31 14:07:46 -04:00 |
|
Seth Call
|
90e6d23bb7
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-03-27 10:09:19 -05:00 |
|
Seth Call
|
14e297b5b1
|
* adding perfdata models
|
2013-03-27 10:09:14 -05:00 |
|
Seth Call
|
305af36633
|
* adding perfdata models
|
2013-03-27 10:08:43 -05:00 |
|
Brian Smith
|
f1ac2a951e
|
fix tests
|
2013-03-23 04:08:28 -04:00 |
|
Brian Smith
|
7a0d927060
|
VRFS-281 debugging issues
|
2013-03-23 03:50:01 -04:00 |
|
Brian Smith
|
5c59e55149
|
VRFS-281 added abstraction layer for notifications
|
2013-03-21 23:18:41 -04:00 |
|
Seth Call
|
1fb66dc77b
|
* fixing can_invite for administrative invites and making sure to send email only on after_create
|
2013-03-21 02:12:28 -05: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
|
560961c455
|
* VRFS-259: beta signup
|
2013-03-14 23:23:16 -05:00 |
|
Seth Call
|
42429d4395
|
* VRFS-259: beta signup
|
2013-03-14 23:22:31 -05:00 |
|
Brian Smith
|
040b48a02a
|
rollback
|
2013-03-09 23:31:09 -05:00 |
|
Brian Smith
|
854c3a5e2e
|
changes
|
2013-03-09 23:29:10 -05:00 |
|
Brian Smith
|
8d68323d5c
|
remove country from user location for now
|
2013-03-02 19:40:58 -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
|
54d0675672
|
added reconnect method
|
2013-02-21 19:34:04 -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 |
|
Seth Call
|
c229405069
|
* clear tracks out and reassert the list
|
2013-02-16 09:01:06 -06:00 |
|
Mike Slemmer
|
997d0e3563
|
Fix for broken test
|
2013-02-16 01:33:58 -08:00 |
|
Mike Slemmer
|
42596d6506
|
Merge branch 'slemmer_20130122'
|
2013-02-16 01:23:57 -08:00 |
|
Brian Smith
|
d05edc371c
|
order user instruments by proficiency / priority
|
2013-02-13 02:09:31 -05: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
|
ddd402ba6b
|
made code layout more readable; tuned logging for connection state changes
|
2013-02-11 00:26:46 -06:00 |
|
Jonathan Kolyer
|
44d2aba3c6
|
refactored names for connection states
|
2013-02-11 00:02:25 -06:00 |
|
Brian Smith
|
6794547b11
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-02-06 21:18:17 -05:00 |
|
Jonathan Kolyer
|
f7728cc9fc
|
vrfs192: added AASM logic
|
2013-02-06 07:12:36 -06:00 |
|
Jonathan Kolyer
|
755d3a9025
|
vrfs192: added music_session_id to login_ack method
|
2013-02-06 07:11:31 -06:00 |
|
Jonathan Kolyer
|
6a31e05bbd
|
vrfs192: added flag_stale_connections method; updated remove_stale_connections and create_connection
|
2013-02-06 07:11:05 -06:00 |
|
Seth Call
|
47cc69a5f0
|
* adding artifact_updte table
|
2013-02-05 23:14:07 -06:00 |
|
Brian Smith
|
0e4163ebe4
|
allow only 1 genre
|
2013-02-05 03:06:09 -05: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 |