 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 |
|
Brian Smith
|
9769ade049
|
added keyword search to find session
|
2013-02-02 18:55:26 -05: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
|
5d1af73685
|
more work
|
2013-01-29 21:46:40 -08:00 |
|
Mike Slemmer
|
60d5964ecb
|
more work
|
2013-01-23 17:48:13 -08:00 |
|
Mike Slemmer
|
2d697d029b
|
more work
|
2013-01-22 14:03:23 -08:00 |
|
Mike Slemmer
|
8a54a0a116
|
more work
|
2013-01-22 11:15:52 -08:00 |
|
Brian Smith
|
81d37f13b9
|
fix friend search issue
|
2013-01-21 21:54:23 -05:00 |
|
Brian Smith
|
5e31dd5a06
|
VRFS-201 enhanced search feature to include friends
|
2013-01-21 00:51:31 -05:00 |
|
Mike Slemmer
|
9ae702eaaf
|
more work
|
2013-01-16 16:38:57 -08:00 |
|
Mike Slemmer
|
60366d5c0e
|
more work
|
2013-01-14 18:13:45 -08:00 |
|
Seth Call
|
7c2b5da509
|
* VRFS-217: replacing elasticsearch with pg
|
2013-01-13 22:50:38 -06:00 |
|
Jonathan Kolyer
|
d2ebfbde4f
|
added method location= and revised location to handle missing fields better
|
2013-01-06 06:34:16 -06:00 |
|
Jonathan Kolyer
|
0425a9d389
|
make text consistent between html/text versions
|
2013-01-06 05:53:41 -06:00 |
|
Jonathan Kolyer
|
55f4f67c0e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-01-05 20:41:44 -06:00 |
|
Brian Smith
|
7a7b352b1a
|
fixed friend bug
|
2013-01-10 22:42:32 -05:00 |
|
Jonathan Kolyer
|
1d0c8b3cce
|
VRFS-193: beta user welcome email
|
2013-01-05 20:40:22 -06:00 |
|
Jonathan Kolyer
|
651dd72665
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-01-04 04:13:44 -06:00 |
|
Brian Smith
|
225a81adb9
|
VRFS-80 session history
|
2013-01-06 15:46:48 -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 |
|
Brian Smith
|
2c4e550910
|
VRFS-159 fixed bugs / added unit tests
|
2012-12-30 09:39:41 -05:00 |
|
Brian Smith
|
80a5a5d7f3
|
VRFS-159 block, spam, ignore friend requests / unit tests
|
2012-12-29 09:28:41 -05:00 |
|
Mike Slemmer
|
9b443f08f7
|
Completing password reset
|
2012-12-27 23:30:03 -08:00 |
|
Mike Slemmer
|
a5f6bc725a
|
reset password work
|
2012-12-21 16:56:16 -08:00 |
|
Brian Smith
|
db2f16c471
|
refactor
|
2012-12-17 02:02:20 -05:00 |