 Seth Call
|
148009ece5
|
* VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg
|
2014-02-04 20:28:00 +00:00 |
|
Seth Call
|
c3a51989fd
|
* changing to localhost:3000 instead of jamkazamdev.local
|
2014-02-04 14:40:05 +00:00 |
|
Seth Call
|
d4a5737c51
|
* VRFS-1025 finished
|
2014-02-03 21:19:14 +00:00 |
Jonathan Kolyer
|
da9a001e43
|
fixed issues editing buzz entries
|
2014-02-01 21:59:25 -06:00 |
|
Jonathan Kolyer
|
d92d02a361
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-01 21:52:40 -06:00 |
|
Jonathan Kolyer
|
61de77c7e1
|
vrfs152: fixed broken tests
|
2014-02-01 21:48:46 -06:00 |
|
Seth Call
|
5dc376fa23
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-01 20:46:04 -06:00 |
|
Seth Call
|
7f409c2cb4
|
VRFS-1054 removing reload slush
|
2014-02-01 20:45:58 -06:00 |
|
Seth Call
|
4e89a686e2
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-01 04:51:49 +00:00 |
|
Seth Call
|
4ce77a44b3
|
* VRFS-1039 - add extension to mount name
|
2014-02-01 04:51:38 +00:00 |
|
Seth Call
|
c9b58229c4
|
* fixing broken tests some more
|
2014-01-31 10:04:17 -06:00 |
|
Seth Call
|
3d6069bdb3
|
* fix broken tests
|
2014-01-31 09:32:18 -06:00 |
Brian Smith
|
edebf42e73
|
VRFS-1020 share dialog work
|
2014-01-31 01:39:09 -05:00 |
|
Seth Call
|
b4b120aa3b
|
* removing first_recording_at method and allowing server_id to be modified
|
2014-01-30 20:43:35 -06:00 |
|
Seth Call
|
f1a8c1b744
|
* remove first_recording_at method
|
2014-01-30 20:39:42 -06:00 |
|
Seth Call
|
3a5321dc5c
|
* merging manifest and user
|
2014-01-30 15:53:22 -06:00 |
|
Seth Call
|
6ccfc4cc08
|
* VRFS-1010 possibly done
|
2014-01-30 15:51:05 -06:00 |
|
Jonathan Kolyer
|
c22331c010
|
conflict merge
|
2014-01-29 23:05:09 -06:00 |
|
Jonathan Kolyer
|
e839c8cb69
|
vrfs152: moved generate_signup_url into invited_user
|
2014-01-29 22:48:35 -06:00 |
|
Jonathan Kolyer
|
4a1ebb7630
|
vrfs152: added test for facebook_invite!
|
2014-01-29 21:37:49 -06:00 |
|
Jonathan Kolyer
|
a73d4d758d
|
vrfs152: created one FB invite constraint
|
2014-01-29 21:22:37 -06:00 |
|
Brian Smith
|
555b53e3c3
|
format code
|
2014-01-28 10:31:57 -05:00 |
|
Brian Smith
|
3ad56b4142
|
fix session bug
|
2014-01-28 10:30:16 -05:00 |
|
Brian Smith
|
374a9da957
|
VRFS-986 landing page dev complete
|
2014-01-28 02:35:35 -05:00 |
|
Brian Smith
|
40a8dbd89e
|
remove binding.pry
|
2014-01-26 16:48:15 -05:00 |
|
Brian Smith
|
998ebfdc6c
|
VRFS-986 landing page sidebar complete / session landing fixes
|
2014-01-26 16:46:41 -05:00 |
|
Seth Call
|
ad1521c98b
|
* VRFS-1022 make sure to use resolve_string mime_type, subtype, bitrate, and again try to disable tests in rspec
|
2014-01-25 17:38:03 -06:00 |
|
Seth Call
|
d93d27db52
|
* trying to disable testsgg
|
2014-01-25 16:48:24 -06:00 |
|
Seth Call
|
e63e718091
|
* merged
|
2014-01-25 14:19:12 -06:00 |
|
Seth Call
|
96768b7979
|
* VRFS-1022 finished
|
2014-01-25 14:03:14 -06:00 |
|
Brian Smith
|
d6a38f6bee
|
VRFS-986 bug fixes
|
2014-01-23 21:43:49 -05:00 |
|
Brian Smith
|
30b13ed538
|
merge develop
|
2014-01-22 21:21:40 -05:00 |
|
Seth Call
|
35466433ca
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-22 16:23:46 -06:00 |
|
Seth Call
|
4b13c5c16c
|
* making ubuntu command need sudo, and adding ubuntu template maker
|
2014-01-22 16:23:33 -06:00 |
|
Seth Call
|
7c375278f8
|
* fixing jamadmin pages
|
2014-01-21 20:30:40 -06:00 |
|
Seth Call
|
fcec0a776b
|
* icecast working locally on my mac (VRFS-1002)
|
2014-01-21 14:51:03 +00:00 |
|
Brian Smith
|
aa056d53fd
|
VRFS-986 recent history sidebar for landing pages
|
2014-01-21 01:45:51 -05:00 |
|
Brian Smith
|
6660102982
|
VRFS-986 landing page work
|
2014-01-20 09:28:06 -05:00 |
|
Brian Smith
|
eea5cc781e
|
VRFS-986 landing page work
|
2014-01-19 17:23:10 -05:00 |
|
Seth Call
|
dea36d897f
|
* VRFS-982 and VRFS-1003 - making every table that's directly related to music_session be UNLOGGED
|
2014-01-19 05:17:30 +00:00 |
|
Seth Call
|
e57946afd2
|
* fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006)
|
2014-01-19 02:20:44 +00:00 |
|
Seth Call
|
8644f4cbc3
|
* VRFS-1006 admin pages added to icecast
|
2014-01-17 19:55:26 +00:00 |
|
Seth Call
|
5d6e34f374
|
* VRFS-1000 - mapped all the castles, got the xml working, and added more tests
|
2014-01-17 04:51:19 +00:00 |
|
Seth Call
|
ece0b9bf87
|
* suppressing puts to stdout in test runs
|
2014-01-16 03:29:52 +00:00 |
|
Seth Call
|
7d90425864
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-15 22:20:29 +00:00 |
|
Seth Call
|
dc781f04ad
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-15 18:00:59 +00:00 |
|
Seth Call
|
b8829b417a
|
* VRFS-997 - mix complete notification
|
2014-01-15 18:00:45 +00:00 |
|
Jonathan Kolyer
|
42713f4c9d
|
vrfs152: allowing invited_users to have null email
|
2014-01-15 04:10:13 -06:00 |
|
Jonathan Kolyer
|
8f7a959a9e
|
vrfs152: relaxed requirement for an email address
|
2014-01-15 03:56:46 -06:00 |
jam
|
10687093c1
|
Resolve conflicts
|
2014-01-14 21:24:45 +00:00 |