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
|
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
|
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 |
|
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 |
|
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
|
6ab57b4313
|
* updating to point to int.jamkazam.com VRFS-424
|
2013-07-19 16:37:14 -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
|
80a82ae88c
|
t puiMerge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-07-12 16:18:50 -05:00 |
|
Seth Call
|
a18610c92a
|
* VRFS-196, VRFS-199, VRFS-195; a class AmqpConnectionManager, with a manual test, is new available that handles reconnect
|
2013-07-12 16:18:42 -05:00 |
|
Brian Smith
|
bdac3e9fd9
|
fix text in email subject / body
|
2013-07-10 21:46:38 -04:00 |
|
Seth Call
|
8d3ebcabb6
|
* VRFS-417; allowing emails to go in with case preservation; but check for existing using case insensitivity
|
2013-07-10 15:18:25 -05:00 |
|
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 |