Seth Call
0dbbfc0ee7
* VRFS-2855 - broadcast notifications done
2015-06-10 08:26:45 -05:00
d5a8959677
Merge with develop.
2015-06-03 14:22:21 -05:00
Seth Call
d959a17be4
* affiliate program in place VRFS-3030
2015-05-28 08:20:14 -05:00
Seth Call
c96f0a7859
* VRFS-3260 - fraud check code and admin helpers complete
2015-05-20 09:24:17 -05:00
d684ecda3b
Merge with latest from develop and manually fix.
2015-05-18 16:02:07 -05:00
Seth Call
f5595a03d5
* actually send email when fraud detected
2015-05-16 10:18:35 -05:00
11f60b71e4
VRFS-3242 : Schema and model changes required for band profile functionality.
...
* Additional attributes for band_type, band_status, concert_count,
add_new_members, play_commitment, touring_option, paid_gigs,
hourly_rate, gig_minimum
* For joined table musician_instruments, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table performance_stamples, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table online_presences, remove the hard requirement that
they be joined to a user, rather a “player” that is polymorphic.
* Change models as appropriate with new attributes and modify
belongs_to / has_many directives as necessary.
* Fix existing usages of user_id to work with polymorphic player_id.
* Fix tests that use user_id
* Add new tests that exercise online_presence, performance_samples, and
instruments that target a band, rather than a user.
2015-05-13 21:06:14 -05:00
294c01d44a
Merge with latest develop
2015-05-11 17:25:37 -05:00
Seth Call
f2aba1e390
* VRFS-3235 - download helper
2015-05-11 11:15:57 -05:00
Seth Call
2495f58bf5
* VRFS-3220 - estimated taxes fixed
2015-05-07 14:48:16 -05:00
Seth Call
96df8cbfea
* disabling teaspoon gemfile for now, because of weird errors; and also VRFS-3176 (jamtrack preview regen task)
2015-05-05 11:44:28 -05:00
Seth Call
4d28915381
* VRFS-3177 - add spinner to playback and stop preloading all media on page
2015-05-04 17:48:14 -05:00
Seth Call
a2d5c0a2b9
* VRFS-3166 - only play one widget at a time
2015-05-04 07:52:30 -05:00
Seth Call
1bd054d050
* VRFS-3094 - update style and minor issues in shopping cart screen
2015-04-27 15:42:38 -05:00
Seth Call
4cce21e7f8
* VRFS-3080 - partial refund manual process done
2015-04-23 16:20:21 -05:00
Seth Call
989518fa68
* VRFS-3082 - email alert if jamtrack fails
2015-04-23 10:34:17 -05:00
Seth Call
091f2be556
* make the nobody@jamkazam.com configurable so that we can override it in chef to provide context clues
2015-04-22 15:43:36 -05:00
Seth Call
e42b926a5e
* VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases
2015-04-10 15:19:08 -05:00
Seth Call
821ca9d76a
* VRFS-2875 - sales record keeping as well as recurly hook processing
2015-04-03 15:34:12 -05:00
Seth Call
f7febfabcf
* VRFS-2999 - create whole track preview for master track on import
...
* VRFS-3000 - create duration for jam track
* VRFS-2996 - create jamtrack preview widget
* VRFS-2870 - individual jam track landing page (still needs tests)
2015-03-31 13:36:49 -05:00
Seth Call
3d43f123b1
* VRFS-2992 -make mp3 as well as ogg preview
2015-03-29 21:51:14 -05:00
Seth Call
4a36bc6982
* VRFS-2988 - relax position duplication constraint
2015-03-26 10:16:14 -05:00
Seth Call
f63c94d9a3
* VRFS-2984 - use alternate syntax for sox trim
2015-03-25 16:05:41 -05:00
Seth Call
53ef0f1b4f
VRFS-2975 - change jam track Id to varchar(64)
2015-03-25 11:11:10 -05:00
Seth Call
bfe302b2f1
* merged
2015-03-24 14:43:48 -05:00
Seth Call
ccd60aa631
* merged develop
2015-03-24 11:27:26 -05:00
8c2df0bb6b
VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting
2015-03-23 20:06:32 +00:00
153d79749c
VRFS-2972 for jam_track_rights, exclude is_test_purchase=true
2015-03-23 07:03:57 +00:00
dd23b38f4e
VRFS-2916 fixed subquery override from block
2015-03-23 04:48:13 +00:00
Seth Call
36b4179492
* VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only)
2015-03-20 17:26:56 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
cba86f4db4
VRFS-2916 added totals; limit month range to 1; filled out all unpopulated cols with 0; misc tweaks
2015-03-20 08:06:02 +00:00
5621f227b8
VRFS-2916 formatting, added jam_track_played placeholders
2015-03-19 06:07:43 +00:00
Seth Call
bb35535262
* VRFS-2941 - fix meddling of mount_uplaoder with existing URS
2015-03-17 10:55:16 -05:00
Seth Call
5269520924
* fix bug in earliest cohort code
2015-03-17 10:36:41 -05:00
188274cbb5
merging feature/cohort_data with develop
2015-03-17 05:33:01 +00:00
a577a6e43e
VRFS-2916 monthly tweaking
2015-03-17 05:31:04 +00:00
4a0aa25785
VRFS-2916 monthly filter
2015-03-17 05:04:13 +00:00
5ee4784417
VRFS-2916 admin index
2015-03-17 01:34:04 +00:00
Seth Call
ab72438a3f
* VRFS-2932 - make preview apply to all jam track tracks
2015-03-16 17:50:38 -05:00
Seth Call
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
420c00e3b5
VRFS-2916 fixed monthly queries
2015-03-16 06:03:36 +00:00
087ec9b1e0
VRFS-2916 online play query
2015-03-14 21:24:01 +00:00
eff4453482
VRFS-2916 monthly queries
2015-03-14 20:53:03 +00:00
961af94e6c
VRFS-2795 cohorts first pass
2015-03-14 18:39:07 +00:00
b38370589f
VRFS-2916 cohort model/table
2015-03-13 07:10:39 +00:00
Seth Call
f9e02c5707
Merge branch 'develop' into feature/jam_track_ui_2
...
Conflicts:
admin/app/admin/jam_tracks.rb
admin/app/views/admin/jam_tracks/_form.html.slim
admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
admin/config/initializers/jam_tracks.rb
db/manifest
ruby/lib/jam_ruby.rb
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
ruby/lib/jam_ruby/jam_tracks_manager.rb
ruby/lib/jam_ruby/models/jam_track.rb
ruby/lib/jam_ruby/models/jam_track_right.rb
ruby/lib/jam_ruby/models/jam_track_track.rb
ruby/spec/jam_ruby/models/jam_track_right_spec.rb
ruby/spec/jam_ruby/models/jam_track_track_spec.rb
ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
web/app/assets/javascripts/download_jamtrack.js.coffee
web/app/assets/javascripts/globals.js
web/app/assets/javascripts/jam_rest.js
web/app/assets/javascripts/order.js
web/app/assets/javascripts/playbackControls.js
web/app/assets/javascripts/session.js
web/app/assets/stylesheets/client/session.css.scss
web/app/controllers/api_jam_tracks_controller.rb
web/app/controllers/api_recurly_controller.rb
web/spec/controllers/api_jam_tracks_controller_spec.rb
2015-03-12 08:51:52 -05:00
Seth Call
6c82e00d00
* VRFS-2876 cleaning up preview downloadability in jam-admin
2015-03-11 09:20:45 -05:00
Seth Call
9279d88d8d
* VRFS-2876 - pro licensing added and 20 second snippet
2015-03-10 22:10:22 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
f935b8c7e9
VRFS-2782 : Multiple bitrates in admin UI.
2015-03-04 16:13:54 -06:00
Seth Call
aba4546e44
Squashed commit of the following:
...
* VRFS-2881 use backend audio source info in metronome
* VRFS-2832 add metronome play controls with mode control
* VRFS-2873 straighten out metronome names in frontend
* VRFS-2782 use getMyNetworkState for ntp_stable determination
* VRFS-2864 allow 'cluster' test, a new metronome mode
* VRFS-2861 metronome sounds not always matching frontend
* VRFS-2852 relax idea that only one person can open metronome
* VRFS-2865 metronome sounds not always matching frontend(dup)
* VRFS-2847 metronome volume now moves master and personal both
* VRFS-2835 metronome 'prevent' message is now dialog, not notify
* VRFS-2833 anyone can control volume/mute of metronome
* VRFS-2850 don't prevent metronome if solo session
2015-03-03 19:06:55 -06:00
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06:00
Seth Call
9415593244
* merged
2015-02-27 08:41:49 -06:00
Seth Call
8205b5ea58
* VRFS-2841 - load jmep into the backend
2015-02-27 08:37:12 -06:00
2823645a60
Merge with develop & fix manifest.
2015-02-26 17:49:10 -06:00
81f288f4f7
VRFS-2782 : Multiple bitrates in admin UI.
2015-02-26 17:01:53 -06:00
Seth Call
6107622f79
* VRFS-2839 - add check to admin
2015-02-25 22:05:18 -06:00
Seth Call
a02f7c2dfb
* VRFS-2839 - add check to admin
2015-02-25 22:04:58 -06:00
1de7c86e29
VRFS-2785 : Fields for new purchased jam track.
2015-02-25 09:41:03 -06:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
e662c95fba
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
Seth Call
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -06:00
Seth Call
b89e6e9475
* VRFS-2748, VRFS-2749 - update styling for / page and home page
2015-02-06 22:04:37 -06:00
Seth Call
b5c446dd04
* VRFS-2625 - adding bpm and tap_in_count to tap in row, and remove tap_in from jamtracks
2015-01-08 11:38:46 -06:00
3028e421fb
VRFS-2614 : Allow jam track to be hidden to non-admin users by setting available=false.
...
Model, controller, admin UI, web UI, and spec to verify non-available
jam_tracks can only be seen by admin users.
2015-01-07 12:33:49 -06:00
Seth Call
405c155c71
* VRFS-2606 get offset time into MM:SS:MLS format
2015-01-07 11:07:26 -06:00
Seth Call
2ff30946e8
* VRFS-2606 - add new tap in fields, support them in activeadmin
2015-01-07 09:30:05 -06:00
Seth Call
aed848c507
Merge branch 'develop' into feature/jam_tracks
...
Conflicts:
db/manifest
pb/src/client_container.proto
ruby/lib/jam_ruby.rb
web/config/environments/development.rb
web/config/environments/test.rb
2015-01-04 09:31:33 -06:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -06:00
Seth Call
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
207b7b9e20
VRFS-1890 : Mechanism to move track up/down, hook up in admin UI.
2014-12-06 14:04:31 -06:00
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
696cdc0283
VRFS-2476 : Field size and length to improve JamTracks Admin UI.
2014-11-16 17:30:49 -06:00
220195ef5c
Friendlier development environment for active admin UI.
2014-11-16 17:00:31 -06:00
3484f169ba
VRFS-2475 - Disallow blank option for Time Signature, Status, Type, Licensor, Pro, Genre and Sales Region fields.
2014-11-16 16:59:54 -06:00
ab2b4fb5da
VRFS-2473 - Disallow blank options on jam_track track instrument field, as well as type field.
2014-11-16 16:58:53 -06:00
497ac657ad
VRFS-2351 : JamTracks admin - merge from feature/jam_tracks_merge.
2014-11-16 16:24:00 -06:00
Seth Call
92b617898f
* VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality
2014-11-14 20:47:56 -06:00
e7b8d05f6d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-31 05:05:05 +00:00
6f28ca7874
VRFS-2132 modified crash_dumps to accept dump files and upload them to aws
2014-10-31 05:04:48 +00:00
Seth Call
62833198b3
* VRFS-2431 - run normalize-ogg and normalize-mp3 to bump up master mix
2014-10-29 11:28:13 -05:00
Seth Call
fe7edbba5d
* many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181
2014-10-22 23:10:49 -05:00
Seth Call
ce8c218054
* pinning devise in adming
2014-10-08 09:29:45 -05:00
Seth Call
71f6b7edc6
* VRFS-2304 - create scoring timeout when doing a network test
2014-10-06 16:44:30 -05:00
Seth Call
b87ff571ce
* VRFS-1073 - support multiple websocket gateways
2014-09-24 14:27:56 -05:00
Seth Call
8a4038e7ce
* pinning capybara-screenshot; it just released a breaking version (1.0.0)
2014-09-17 20:57:49 -05:00
Seth Call
609846c295
* VRFS-2204 - udp_reachable showing now
2014-09-17 20:31:58 -05:00
Seth Call
2bd189b697
* VRFS-2159 merge
2014-09-12 22:30:51 -05:00
Seth Call
5f85908c79
* VRFS-2104 - client update dialog happens when it needs to; not just on startup
2014-08-31 10:30:59 -05:00
Seth Call
591432d9d2
* adding sanitize gem to admin
2014-08-19 14:24:50 -05:00
Seth Call
e4a8ce3759
* fix broken admin test
2014-08-14 14:08:35 -05:00
Seth Call
5c9f0da222
* make it possible to only see diagnostic info in the admin feed, and further diagnostic info of a certain type
2014-08-14 12:44:46 -05:00
Seth Call
90ec0b3f1a
* fix admin tests
2014-08-13 15:32:51 -05:00
Seth Call
4ce9d5fd7c
* add prefix to form URL
2014-07-31 21:08:53 -05:00
Seth Call
91399fd94e
* bumping max length
2014-07-31 20:21:49 -05:00
Seth Call
209b6f2d7e
* sort score histories by date desc
2014-07-29 22:13:38 -05:00
Seth Call
7e810809ac
* fixing up end time format in csv export
2014-07-28 23:15:39 -05:00
Seth Call
ef87d635e2
* fixing some admin pathing/url issues
2014-07-28 10:05:16 -05:00
Seth Call
50c611d729
* removing debugger gem from admin gemfile for now
2014-07-28 09:49:56 -05:00
Seth Call
c65b05993b
* adding migrate script to admin
2014-07-27 12:22:35 -05:00
Seth Call
2716211b18
* VRFS-1496 fixing up help text and header text
2014-07-27 11:49:26 -05:00
Seth Call
4f7c1ef22e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-27 11:46:38 -05:00
Seth Call
44ba9ef441
* VRFS-1496 - export CSV
2014-07-27 11:45:46 -05:00
Seth Call
2dd6153ed8
* wip on score export
2014-07-26 14:18:17 -05:00
e87ae50dfe
VRFS-1942 tuning admin view
2014-07-26 04:10:40 +00:00
d28a65c5ff
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-26 03:59:11 +00:00
ff73c170bd
VRFS-1942 refactoring scheduled session emails; new admin view into batch email data queries
2014-07-26 03:58:58 +00:00
Seth Call
adb0b15555
* fixing bad schedules on scheduler.yml, and wip on admin web reporting
2014-07-25 15:01:14 -05:00
Seth Call
433148cd55
* adding rubyzip to websocket-gateway and admin
2014-07-19 23:05:20 -05:00
Seth Call
513a46067a
* merged
2014-07-19 21:12:11 -05:00
Seth Call
5f131f9407
* VRFS-1403 - maxmind single step import done
2014-07-19 21:11:16 -05:00
Seth Call
5feb642c0f
* fixing admin tests
2014-07-14 17:43:07 -05:00
Seth Call
eecc402744
* pin faker to 1.3.0
2014-07-03 20:52:36 -05:00
Seth Call
5b8fd14088
* pin jquery-ui-rails to 4.2.1
2014-07-03 20:39:26 -05:00
Seth Call
ec6c4d010c
* fix Gemfile in admin-web
2014-06-24 11:33:56 -05:00
Seth Call
6d84241cae
* merged
2014-06-23 22:28:23 -05:00
Seth Call
5750584769
* VRFS-1803 - myriad create session styling fixes; some default behaviors added, UI behavors added; VRFS-1808; change up how upload files works
2014-06-23 22:26:27 -05:00
Seth Call
3d1c4f2488
* VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message
2014-06-19 14:05:33 -05:00
Seth Call
526dc3a512
* null guarding timestamps for admin fed
2014-06-15 21:04:06 -05:00
Seth Call
62bf8eb0a0
* allow core dumps and a greater number of handes for the web processes
2014-06-14 13:06:37 -05:00
Seth Call
9edc3a5e24
* fixing bad reference to internet_service_provider
2014-06-13 15:10:47 -05:00
Seth Call
84f1e79223
* pin admin tests
2014-06-03 17:45:48 -05:00
30037bc967
VRFS-1698 removed sendgrid email error handling
2014-05-31 09:03:18 +00:00
b8736ff389
VRFS-1698 changed batch sending to one-at-a-time
2014-05-31 07:44:56 +00:00
Seth Call
e4da30f39e
* wip
2014-05-29 14:39:08 -05:00
1ce510bb18
VRFS-1705 - 'monitor' subproj initial commit
2014-05-21 16:52:11 -05:00
Seth Call
ac2ee3210f
* VRFS-1654 - fixing tests
2014-05-13 14:48:58 -05:00
9929e1eca1
VRFS-1708 / VRFS-1654 - marking these tests as pending
2014-05-11 15:59:37 -05:00
Seth Call
e3b17fb439
* .touch on the history entries
2014-05-09 14:36:03 -05:00
6ecb7abcad
VRFS-1654 issue fixed without test
2014-05-09 23:50:50 +08:00
8f06168f1c
VRFS-1654 - configure feed layout
2014-05-08 23:18:57 +08:00
Seth Call
4e9c2377ba
* fix broken pages in admin
2014-05-08 08:04:06 -05:00
Seth Call
244f79eefb
* merging develop into feature/scheduled_sessions
2014-05-07 15:04:41 -05:00
Seth Call
57e8860dcb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-07 14:22:56 -05:00
4d4d04b343
VRFS-1651 - test-www should not use build_number
2014-05-07 08:30:41 -05:00
Seth Call
97269133ba
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-07 08:03:43 -05:00
1fa9ffcc3f
VRFS-1651 - really no jam_* gems in test-www
2014-05-07 07:40:22 -05:00
fb1d634875
VRFS-1651 - jam_ gem version does not matter for test_www
2014-05-07 07:33:33 -05:00
Seth Call
7dd1e6c464
* renaming of tables in
2014-05-06 17:50:41 -05:00
Seth Call
f3d39a351d
* wip
2014-05-06 08:34:38 -05:00
Seth Call
eab5e5b72b
* merging in master with heartbeat fixes into develop after release
2014-05-05 10:50:47 -05:00
Seth Call
00a6139cd1
* merged
2014-04-29 14:04:26 +00:00
Seth Call
f9e035e621
* adding db 1/0 to test mode
2014-04-23 21:52:35 +00:00
Seth Call
bc006b8c71
* adding some error logs for recording missing scenarios (VRFS-1643), and merging email redirect problem manually
2014-04-23 19:48:40 +00:00
a7d83064df
VRFS-1576 fixing redirect paths to use active_admin_template
2014-04-23 06:39:49 +00:00
6ee83f8dcc
VRFS-1576 error handling; referral page; new admin menu
2014-04-22 01:55:40 +00:00
Seth Call
76e63193ca
* fixing some broken tests
2014-04-09 21:11:13 +00:00
887795bead
VRFS-1483 final cleanup
2014-04-05 22:16:32 +00:00
e5d280e374
VRFS-1483 final cleanup
2014-04-05 22:13:28 +00:00
ce6d143876
VRFS-1483 added authoritzation for email_batch
2014-04-05 21:42:56 +00:00
15090e3c70
VRFS-1483 error collector; cleanup
2014-04-05 21:25:47 +00:00
e59d9cbe7a
VRFS-1483 email error handling
2014-04-05 18:52:12 +00:00
4e95c7cbd5
VRFS-1483 changed instructions to indicate default hiding of admin session
2014-04-05 18:26:16 +00:00
b17dafd94f
Merge branch 'develop' into hotfix/feed_icon_fix
2014-04-01 21:31:07 -04:00
accaa99e38
VRFS-1483 integrating opt-out; fixing tests
2014-04-01 14:42:26 +00:00
925c5831af
VRFS-1445 display correct values of musician flag and country in admin
2014-04-01 01:18:31 -04:00
e29907f09b
merging
2014-03-19 18:44:35 +00:00
Seth Call
de10ed09d7
* adding config in admin needed by web VRFS-1541
2014-03-27 20:14:59 +00:00
eecdbebf3d
VRFS-1483 integrating admin interface
2014-03-19 18:42:28 +00:00
0987cf2cf8
VRFS-1483 editing batch emails
2014-03-19 16:37:03 +00:00
Seth Call
b9ee475db5
* working on event page
2014-03-10 06:31:20 +00:00
Seth Call
3c5a14312a
* Event page 'chrome' is setup and pulling from database--now to add band logic
2014-03-09 22:58:57 +00:00
Seth Call
faed48271b
* VRFS-1372 resolved, and not requiring local only until figure out some deployment issues
2014-03-07 14:20:34 -06:00
Seth Call
a570856156
* fix for VRFS-1362 by not putting all query params back in URL
2014-03-06 16:17:32 -06:00
Seth Call
44be38f2b0
* VRFS-1280 - allow people to listen to public widgets without being logged in by allowing music session show API public access
2014-03-04 00:58:40 -06:00
490b8ad06c
VRFS-1326 added Latest ID column
2014-03-04 05:47:32 +00:00
17088d49b5
VRFS-1326 fixed integration of latest/buzz
2014-03-04 05:38:58 +00:00
Seth Call
dae0f40929
* removed is_downloadable for VRFS-1141, from database and UI
...
* what's next dialog has icheck-styled checkbox now VRFS-913
* facebook invitations hooked up for VRFS-1121
2014-02-22 05:09:39 +00:00
e0ae2e378e
VRFS-1194 changed recording/session drop-down list selection to unique ID text input
2014-02-20 10:01:25 -06:00
ca64966c7f
* duplicate entry
...
$ bundle exec rails server
Your Gemfile lists the gem bcrypt-ruby (= 3.0.1) more than once.
You should probably keep only one of them.
While it's not a problem now, it could cause errors if you change the
version of just one of them later.
2014-02-20 00:30:25 -05:00
Seth Call
b21fcd74b2
* allow duration to be specified
2014-02-19 15:15:55 +00:00
Seth Call
6a5c607fed
* remove javascript_include to avoid precompiled error VRFS-1175
2014-02-18 23:43:53 +00:00
Seth Call
d6149a3908
* pin rails to 3.x
2014-02-18 04:54:33 +00:00
cd3b57ef45
changed redirect to use route paths
2014-02-15 18:33:41 -06:00
Seth Call
0300306e1d
* VRFS-1130 - found issue where postback wasn't using ENV['RAILS_RELATIVE_URL_ROOT']
2014-02-15 04:22:48 +00:00
6186e20251
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-14 01:01:37 -05:00
5d8fac92c6
* fix admin redirect
2014-02-14 01:01:09 -05:00
Seth Call
4d1f24e606
* gon has issue fixed
2014-02-13 23:26:53 -06:00
Seth Call
9e561c047a
* VRFS-1103 - coverage for all projects. need to figure out how to merge all
2014-02-13 22:11:30 -06:00
Seth Call
5ba4e97dca
* VRFS-1089 - jamadmin creation of recordings done
2014-02-13 16:41:50 +00:00
Seth Call
69523e0e07
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-13 14:19:29 +00:00
Seth Call
52f9bde0a3
* taking gon to 5.0.1 for now
2014-02-13 14:19:08 +00:00
fba4e53093
VRFS-1037 reverted redirect path on create/update
2014-02-11 21:05:09 -06:00
479b05c67b
VRFS-1037 fixed redirect path on create/update
2014-02-11 21:02:51 -06:00
3ed657f815
VRFS-1037 fixed redirect path on create/update
2014-02-11 21:01:06 -06:00
Seth Call
0f0521ccf8
* VRFS-152-replace localhost with 127.0.0.1, if present
2014-02-11 17:25:03 +00:00
Seth Call
652c56dafd
* VRFS-924 haml added
2014-02-11 15:53:20 +00:00
Seth Call
184ac3e834
* VRFS-924 haml added
2014-02-11 15:52:18 +00:00
ce9c379853
VRFS-1099 - modfying Buzz/Latests creation
2014-02-11 20:35:24 -06:00
966075c885
VRFS-1034 fixed image uploading for buzz; added UI text instructing user to upload image before editing text
2014-02-07 20:26:17 -06:00
bf04986e25
VRFS-1033 changed column names from {short,long}_text to Who/Quote
2014-02-06 13:07:32 -06:00
Seth Call
7661fc5e39
* VRFS-1082 and VRFS-1083 - centralize facebook logic for invitationDialog, and add twitter integration into share dialog
2014-02-07 21:28:47 +00:00
Seth Call
f86d7fbdd5
* deal with chuid differently so pre-script works
2014-02-05 02:13:41 +00:00
Seth Call
4549282f0d
* trying no-https rubygems for a bit, see if it helps build
2014-02-04 21:53:37 +00:00
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
103954cb96
* VRFS-1074 - create run folders for pids on every upstart start
2014-02-04 18:18:15 +00:00
Seth Call
ae8b6ebbc7
* renaming all ShareDialog to ShareSessionDialog
2014-02-04 17:05:38 +00:00
Seth Call
513fb2b8d4
* intsall to vendor/bundle
2014-02-02 14:03:31 -06:00
da9a001e43
fixed issues editing buzz entries
2014-02-01 21:59:25 -06:00
Seth Call
7f409c2cb4
VRFS-1054 removing reload slush
2014-02-01 20:45:58 -06:00
Seth Call
6806d6f0d3
* VRFS-1016
2014-01-31 14:25:17 -06:00
Seth Call
2e5eb4fd7f
* beefing up description in icecast_bootstrap
2014-01-30 20:13:09 -06:00
Seth Call
6ccfc4cc08
* VRFS-1010 possibly done
2014-01-30 15:51:05 -06:00
Seth Call
8f5a2a6369
* tell NOKOGIRI to use system libraries in build environment
2014-01-26 14:46:11 -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
fcec0a776b
* icecast working locally on my mac (VRFS-1002)
2014-01-21 14:51:03 +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
1f37b9881f
* parameterizing email configs and trying to speed up build on server
2014-01-14 16:55:34 -06:00
Seth Call
a7fa73cfb3
* VRFS-801 still working out some mixer devops issues now;
2014-01-13 22:48:55 +00:00
Seth Call
43572c1524
* fixing rake routes bug
2014-01-13 13:57:14 +00:00
Seth Call
34b96db2c1
* updating nav of jam-admin and adding mixes page
2014-01-13 11:24:16 +00:00
Seth Call
f79d3bdd70
* fixing bad name in debian scripts from audimxer to audiomixer
2014-01-13 11:22:28 +00:00
Seth Call
f5a271c35b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-11 04:57:30 +00:00
Seth Call
d89ce4c140
* VRFS-801 - almost working on my dev machine
2014-01-11 04:57:07 +00:00
401a97d566
Merge branch 'develop' into vrfs927
2014-01-10 18:13:00 -06:00
85d6129a50
vrfs-927: fixing latest promotions
2014-01-10 18:10:14 -06:00
Seth Call
1555af6db8
* VRFS-984 finished. subpath is /resque
2014-01-10 16:25:55 +00:00
e5d23cc3bd
merge conflicts
2014-01-08 18:45:34 -06:00
785817d299
vrfs-927: added initial promo latest support
2014-01-08 18:38:04 -06:00
4b85863a33
vrfs-927: buzz admin fixes
2014-01-08 18:00:22 -06:00
Seth Call
83409e9da8
* adding resque gem to Gemfile
2014-01-08 22:55:44 +00:00
bb2024fe19
vrfs-927: carrierwave_direct integration
2014-01-08 01:04:17 -06:00
d8cb2c72c4
VRFS-951 Pushing only develop or master branch files as debians
2014-01-05 21:35:22 -06:00
9e4995a55b
vrfs-927: carrrierwave integration
2014-01-04 03:15:19 -06:00
7212f20a0f
vrfs-927: admin editing buzz promotions
2013-12-22 10:19:39 -06:00
fa05c3eb5d
vrfs737: added user progression admin panel
2013-12-21 23:22:54 -06:00
Seth Call
182242c7fb
* VRFS-856 - hopefully the fix
2013-12-21 15:12:25 +00:00
Seth Call
8deced77c7
* pinning aws-sdk to 1.29.1 everywhere because the gem released today is broken
2013-12-20 23:44:12 +00:00
Seth Call
dc5f5c48a8
* trying to fix admin based on stuff that broke in develop branch on Nov 5
2013-12-18 15:47:02 +00:00
Seth Call
adfc22364a
* fix for VRFS-885
2013-12-05 11:24:30 +00:00
Seth Call
826f89d4f3
* working through all the dependency issues with admin
2013-11-05 20:10:59 +00:00
250933490b
removing 'unf' in admin Gemfile in case it's breaking the build
2013-11-05 22:21:12 -06:00
Seth Call
297bce049d
* working through all the various dependency issues of admin project
2013-11-05 20:06:38 +00:00
cfb6a6133f
adding optional 'fog' dependency 'unf' to suppress warnings
2013-11-05 20:03:43 -06:00
291a3a8ac2
vrfs-774: changing country value from USA to US for max_mind_geo support
2013-11-03 01:49:10 -06:00
9f09674d77
vrfs-774: added geokit-rails and postgres_ext for geocoded user searches
2013-10-28 21:44:14 -05:00
61ae54048a
typos
2013-10-19 23:45:43 -05:00
Seth Call
481514e301
* VRFS-778, VRFS-777, VRFS-788, VRFS-787-to create new downloads page, I needed to add a new layout 'web', and make user dropdown more reusable
2013-10-19 14:46:06 -05:00
Seth Call
7c7eca0964
* fixing up admin tests after changing their menu label
2013-10-16 12:28:44 -05:00
Seth Call
482c2cece3
* VRFS-773 - isp page avaible
2013-10-16 11:20:37 -05:00
db5804d1cf
vrfs-768: changed url param for admin toggle to just admin; added h2 title with instructions for toggling
2013-10-15 09:54:16 -05:00
712e748218
vrfs-768: added check for user_admin_eq in scoped_collection
2013-10-10 14:42:40 -05:00
c088bd2f57
VRFS-575: fixed link creation
2013-09-29 22:04:06 -05:00
eb079464ab
VRFS-575: moved association to perf data from music_session to music_session_user_history; updated admin links for perf data
2013-09-23 12:21:33 -05:00
f7ea752ea4
VRFS-717: fixed sort ordering to use created_at DESC
2013-09-23 11:40:28 -05:00
Seth Call
8b48a97fe2
* updating gitignore
2013-09-22 19:11:47 +00:00
Seth Call
40c8f66e64
* fixing bad constant
2013-09-22 02:18:33 +00:00
Seth Call
6477bbb867
* VRFS-702 - fixing cookie policy page
2013-09-22 01:35:50 +00:00
Seth Call
Steven Miers
Jonathan Kolyer
Anthony Davis
Bert Owen
developer
Brian Smith
Daniel Weigh
Chris Doughty