..
app
Merge branch 'develop' into feature/jam_track_ui_2
2015-03-12 08:51:52 -05:00
config
Merge branch 'develop' into feature/jam_track_ui_2
2015-03-12 08:51:52 -05:00
db
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
doc
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
lib
* icecast working locally on my mac (VRFS-1002)
2014-01-21 14:51:03 +00:00
log
VRFS-1654 issue fixed without test
2014-05-09 23:50:50 +08:00
public
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
script
* VRFS-1403 - maxmind single step import done
2014-07-19 21:11:16 -05:00
spec
* wip
2015-03-16 13:27:39 -05:00
test
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
vendor
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
.gitignore
* updating gitignore
2013-09-22 19:11:47 +00:00
.rakeTasks
VRFS-2351 : JamTracks admin - merge from feature/jam_tracks_merge.
2014-11-16 16:24:00 -06:00
.rspec
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
.rvmrc
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
.simplecov
* VRFS-1103 - coverage for all projects. need to figure out how to merge all
2014-02-13 22:11:30 -06:00
Gemfile
VRFS-2785 : Add Jam Track Right (purchased jam track) to admin ui. Hook up a refund action.
2015-02-19 16:41:09 -06:00
README.md
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
README.rdoc
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
Rakefile
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
build
* intsall to vendor/bundle
2014-02-02 14:03:31 -06:00
config.ru
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
jenkins
* VRFS-1016
2014-01-31 14:25:17 -06:00
migrate.sh
* adding migrate script to admin
2014-07-27 12:22:35 -05:00
run.sh
merging jam-admin into admin
2013-09-16 03:15:31 +00:00