 Seth Call
|
6ea4bae05c
|
merging jam-ruby into ruby
|
2013-09-15 18:04:03 +00:00 |
|
Seth Call
|
745bdac2a2
|
merging jam-pb into pb
|
2013-09-15 18:02:25 +00:00 |
|
Seth Call
|
a091c22aa6
|
merging jam-db into db
|
2013-09-15 17:58:54 +00:00 |
|
Seth Call
|
8ecd553fc4
|
Initial commit
|
2013-09-14 19:48:45 +00:00 |
|
Seth Call
|
102eeb8afb
|
* VRFS-594 - adding message factory helper for creating heartbeat_ack
|
2013-09-01 02:17:10 +00:00 |
|
Seth Call
|
89c750aaa2
|
* VRFS-594 - adding definition for heartbeat_ack
|
2013-09-01 02:16:26 +00:00 |
|
Seth Call
|
05b51756d3
|
* return user_id as well with connections being deleted VRFS-608
|
2013-08-31 19:54:43 +00:00 |
|
Seth Call
|
ca519021ff
|
* VRFS-509 - fixing birth date and gender set on account profile page
|
2013-08-29 12:12:38 +00:00 |
Brian Smith
|
d47bd064a2
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-08-18 20:36:49 -04:00 |
|
Brian Smith
|
2428de8e86
|
VRFS-541 track config bug fixes found during testing
|
2013-08-18 20:36:36 -04:00 |
|
Seth Call
|
df74fda51f
|
* updating ruby version
|
2013-08-18 02:57:13 +00:00 |
|
Seth Call
|
a75c5d450d
|
* updating ruby version
|
2013-08-18 02:57:00 +00:00 |
|
Seth Call
|
28ea6542c0
|
* updating ruby version
|
2013-08-18 02:56:32 +00:00 |
|
Seth Call
|
39fa5bf098
|
* VRFS-521; all emails have Jamkazam > JamKazam fixed
|
2013-08-11 10:48:12 -05:00 |
|
Seth Call
|
2431af4baa
|
* removing extraneous whitespace
|
2013-08-10 20:38:15 -05:00 |
|
Seth Call
|
aa7a6b3e04
|
* VRFS-513; model in place to take feedback from corporate website
|
2013-08-10 15:35:54 -05:00 |
Mike Slemmer
|
7c7d9ec4e2
|
fixups for active admin
|
2013-08-08 19:12:43 -07:00 |
|
Mike Slemmer
|
db15ac0fb5
|
removing search tests
|
2013-08-08 18:38:28 -07:00 |
|
Mike Slemmer
|
856e95d2ad
|
removing search since the admin stuff does it for you
|
2013-08-08 18:38:12 -07:00 |
|
Mike Slemmer
|
c55c63bb7a
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-08-08 18:03:52 -07:00 |
|
Mike Slemmer
|
90dcfbf437
|
tests passing plus added search api
|
2013-08-08 18:03:41 -07:00 |
|
Seth Call
|
d34f704cc5
|
* adding reconnect related messages to jam-pb
|
2013-08-07 10:38:08 -05:00 |
|
Seth Call
|
214fb3a339
|
* merged
|
2013-08-07 10:36:19 -05:00 |
|
Seth Call
|
9424ffa6aa
|
* VRFS-484; more changes needed but this helps a lot of common leave/join scenarios
|
2013-08-07 10:35:27 -05:00 |
|
Mike Slemmer
|
6573efa107
|
Added crash dump version
|
2013-08-06 08:15:39 -07:00 |
|
Mike Slemmer
|
32b5c0c5a8
|
added crash dump client version
|
2013-08-06 08:12:15 -07:00 |
|
Mike Slemmer
|
a87fa595b0
|
fixed conflicts
|
2013-08-06 07:53:17 -07:00 |
|
Mike Slemmer
|
c2df6e2944
|
Adding indices for crash dumps
|
2013-08-06 07:52:52 -07:00 |
|
Mike Slemmer
|
b855ffca23
|
add uri
|
2013-07-31 19:00:30 -07:00 |
|
Mike Slemmer
|
c8dbeb105d
|
added crash_dumps
|
2013-07-31 18:06:25 -07:00 |
|
Seth Call
|
ab46fffa9b
|
* typo in plain-text version of friend invitation
|
2013-07-31 10:44:25 -05:00 |
|
Seth Call
|
cdb138a447
|
* removing errant 'b' in the code
|
2013-07-31 10:06:36 -05:00 |
|
Seth Call
|
6c19304aee
|
* adding the Time.now.year to copyrights in html tepmlates too
|
2013-07-31 09:37:01 -05:00 |
|
Seth Call
|
35e729fbf6
|
* fixing email templates to suppress 'you have account at jamkazam' if invitation is being sent
|
2013-07-31 09:33:51 -05:00 |
|
Brian Smith
|
43acebcd30
|
remove hard-coded year
|
2013-07-30 21:59:09 -04:00 |
Jonathan Kolyer
|
4cc679becd
|
vrfs-268: tweaking music_session_*history associations; added life cycle end for music_session_user_history
|
2013-07-30 12:26:26 -05:00 |
|
Mike Slemmer
|
9d2b51c66e
|
added uri
|
2013-07-31 19:05:38 -07:00 |
|
Mike Slemmer
|
a58db24d15
|
added crash dumps and tests
|
2013-07-31 18:46:24 -07:00 |
|
Jonathan Kolyer
|
b776bbd3e8
|
vrfs-268: added session_removed_at to music_sessions_user_history
|
2013-07-30 12:20:36 -05:00 |
|
Mike Slemmer
|
e6dd4fea7a
|
Added profanity filter - VRFS-219
|
2013-07-26 01:07:24 -07:00 |
|
Mike Slemmer
|
dffc3f61ad
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-07-24 23:23:44 -07:00 |
|
Mike Slemmer
|
125898e011
|
Added profanity filter and tests
|
2013-07-24 23:23:30 -07:00 |
|
Jonathan Kolyer
|
25fcaf79ca
|
vrfs-310: moved the delete_if_empty method into session_check, and added called to JamRuby::MusicSessionHistory.removed_music_session when the music session is deleted (refactoring should call this automatically from MusicSession callback)
|
2013-07-23 15:22:03 -05:00 |
|
Jonathan Kolyer
|
7bdca213fa
|
vrfs-310: added removed_music_session method, and after_destroy callback
|
2013-07-23 15:20:39 -05:00 |
|
Seth Call
|
78ce0c2c58
|
* updating path for ruby 2.0.0
|
2013-07-22 10:18:23 -05:00 |
|
Seth Call
|
6ab57b4313
|
* updating to point to int.jamkazam.com VRFS-424
|
2013-07-19 16:37:14 -05:00 |
|
Seth Call
|
fe557d9c91
|
* sniff architecture rather than hardcode it
|
2013-07-19 11:49:43 -05:00 |
|
Seth Call
|
d11828241a
|
* VRFS-196, VRFS-195, VRFS-197 - adding messages for server up/server down in response to pings in the message factory. also removing suppression of notification for creator of session (need to talk to Brian about this)
|
2013-07-14 21:48:16 -05:00 |
|
Seth Call
|
6342d5d41f
|
* adding server down and server recovered messages for VRFS-196
|
2013-07-14 21:45:20 -05:00 |
|
Seth Call
|
80a82ae88c
|
t puiMerge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-07-12 16:18:50 -05:00 |