3eca6aeee5
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-06-04 05:59:31 +00:00
d5a8959677
Merge with develop.
2015-06-03 14:22:21 -05:00
Seth Call
ecd8b75f91
* fix case in raleway assets path
2015-05-29 23:21:29 -05:00
Seth Call
7199a76e3d
* cors gem added to gemfile for cloudfront and https
2015-05-29 22:41:01 -05:00
777d4a39cb
VRFS-3036 tohire builder
2015-05-21 06:42:27 +00:00
e794ccc7af
VRFS-3036 bands to_join builder controls
2015-05-19 05:48:29 +00:00
294c01d44a
Merge with latest develop
2015-05-11 17:25:37 -05:00
7b5cdbf390
VRFS-3106 : Populate country name and state(region) labels using carmen gem.
2015-05-06 15:35:41 -05:00
ccb4680c36
This seems to be required now.
2015-05-06 13:24:21 -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
5970fae4fa
* VRFS-3188 - sort instrument appropriately
2015-05-05 09:22:15 -05:00
2260d21fc1
VRFS-3007 : Merge with latest develop
2015-04-28 16:43:38 -05:00
Seth Call
19ad2fbcc5
* VRFS-2991 - sitemap generator done (but still vetting other parts of the site for basic SEO)
2015-04-14 16:39:39 -05:00
086b3bc3c4
VRFS-2795 styling and descriptions
2015-04-04 20:26:41 +00:00
4fbf3e694d
VRFS-2795 filter description & spec tests; support for reset, cancel buttons; proper display and update impl
2015-04-04 14:55:41 +00:00
c8ad1d3856
VRFS-2805 : Use jquery.payment to make the credit card and verification more user-friendly. Also use jquery.payment for validation.
2015-03-02 13:30:45 -06:00
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
Seth Call
b89e6e9475
* VRFS-2748, VRFS-2749 - update styling for / page and home page
2015-02-06 22:04:37 -06:00
5f9f8a0cdd
Cleanup; upgrade deprecated gem. Attempt to fix intermittently failing test.
2015-01-16 18:00:44 -06:00
a900087d87
VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests.
2015-01-11 19:17:18 -06:00
9d5d36f059
VRFS-2540 : Clean out some existing recaptcha scaffolding.
...
Current recaptcha gem only works within controllers, so pass flag down
the stack when recaptcha fails. Respect application config for
“recaptcha_enable” at all levels higher than user level. Allows usage
of existing mechanism for attribute validation and passing subsequent
errors back to the UI for reporting.
2015-01-05 17:01:28 -06:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -06:00
Seth Call
4a79f0c4ec
* wip
2014-12-20 14:05:31 -06:00
c068619d4d
Lock guard gem version to avoid warning.
2014-11-13 11:06:03 -06:00
c742a13da9
Fix a few specs.
2014-11-12 11:02:38 -06:00
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
b2219da522
Merge feature/video_mvp to develop and resolve conflicts.
2014-11-03 18:28:28 -06:00
Seth Call
1552f72192
* pin down rabl until fix for cache key is present (VRFS-2369 and VRFS-2374)
2014-10-26 08:05:33 -05:00
e3dadf9c4b
VRFS-2032 : Youtube test account app name/developer key.
2014-10-15 15:17:03 -05:00
077d3f4253
VRFS-2033 - YouTube client library
2014-10-15 12:25:05 -05:00
Seth Call
2d71a12a79
* pinning back oj for now
2014-10-06 14:53:50 -05:00
Seth Call
993074b136
* pinning back devise
2014-10-06 09:36:55 -05:00
Seth Call
61f0bd2aa0
* merged
2014-09-22 14:20:58 -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
27f4adf772
* VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs
2014-08-18 20:41:44 -05:00
Seth Call
5ae975c097
* merged
2014-08-15 09:40:39 -05:00
Seth Call
80c7d5b049
* VRFS-2049 - more guards in jamServer.js against runaway clients
2014-08-15 09:40:04 -05:00
af1a4596e0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-08-14 23:57:51 -04:00
Seth Call
4c85740597
* wip
2014-08-13 11:09:52 -05:00
d40b29a947
VRFS-1971 escape HTML before saving / unescape before rendering
2014-08-07 00:50:10 -04:00
Seth Call
00ab39d82b
* speeding up web tests
2014-07-19 22:53:33 -05:00
Seth Call
081d0ab0dc
* adding zip to gem
2014-07-19 21:58:57 -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
6096687b07
* railties is floating to 4.x; pinning
2014-06-19 15:46:38 -05:00
5fc9696d01
merge develop
2014-06-11 08:45:34 -04:00
de7cb2d6ab
fix tests
2014-06-11 03:06:17 +08:00
3ed14be60f
finish basic create session flow
2014-06-10 06:13:54 +08:00
Seth Call
49e03a967c
* pinning rspec in web to fix tests
2014-06-03 16:57:13 -05:00
e49c98c659
Merge branch 'feature/scheduled_sessions' into feature/create_session_flow
2014-06-02 02:57:15 +08:00
cb6742d06b
Create session flow (ui completed...)
2014-06-02 02:45:17 +08:00
ae79912dab
merge develop
2014-05-31 07:41:59 -04:00
Seth Call
e4da30f39e
* wip
2014-05-29 14:39:08 -05:00
7a4ad83cef
merge develop
2014-05-29 00:20:09 -04:00
f31248815d
VRFS-1670 session info page work
2014-05-26 23:52:59 -04:00
b235817a0c
VRFS-736 undo accidental commit
2014-05-21 07:19:02 +00:00
6c0807ac5a
VRFS-736 adding email content for progression steps
2014-05-21 07:17:42 +00:00
4d4d04b343
VRFS-1651 - test-www should not use build_number
2014-05-07 08:30:41 -05:00
1fa9ffcc3f
VRFS-1651 - really no jam_* gems in test-www
2014-05-07 07:40:22 -05:00
6528c5f838
VRFS-1651 - our gems aren't even needed for this
2014-05-07 07:25:48 -05:00
Seth Call
76e63193ca
* fixing some broken tests
2014-04-09 21:11:13 +00:00
e59d9cbe7a
VRFS-1483 email error handling
2014-04-05 18:52:12 +00:00
Seth Call
b48308a4fd
* VRFS-1575 - just very initial work
2014-04-04 19:38:31 +01:00
Seth Call
f1ef1de83c
* wip new ftue
2014-04-03 15:11:23 +01:00
0987cf2cf8
VRFS-1483 editing batch emails
2014-03-19 16:37:03 +00:00
1c39238fe5
VRFS-1483 adding send batch layouts and such
2014-03-18 23:05:40 +00:00
Seth Call
c9438fcf99
* feed shows items. no scrolling, no support for query modification yet
2014-03-11 06:09:44 +00:00
Seth Call
a87f07c654
* pin multijson to 1.9.0
2014-03-06 14:50:46 -06:00
b281349bec
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 09:11:44 -06:00
d831cae7c7
VRFS-1193 fixed landing page promo buzz image display
2014-02-20 09:07:59 -06:00
Seth Call
df14676495
* VRFS-1135 - user and band targetting possible
2014-02-20 07:45:51 +00:00
Seth Call
3efb3fc5ab
* feed test fixes
2014-02-20 03:23:38 +00:00
Seth Call
d6149a3908
* pin rails to 3.x
2014-02-18 04:54:33 +00:00
Seth Call
26725e1c9b
* fix one claimed_recording test
2014-02-18 00:46:33 +00:00
Seth Call
f86d0643eb
* remove dup haml-rails
2014-02-14 11:59:28 -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
184ac3e834
* VRFS-924 haml added
2014-02-11 15:52:18 +00:00
Seth Call
9598c06e1f
* moved shareable_resolver into new controller, and made tests
2014-02-06 21:02:04 +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
b256182cc6
* VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1
2014-02-02 13:34:53 -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
d23ca37a82
* fix for VRFS-1023; bugsnag preventing rails from starting
2014-01-25 21:07:39 -06:00
Seth Call
fcec0a776b
* icecast working locally on my mac (VRFS-1002)
2014-01-21 14:51:03 +00:00
Seth Call
01e50b45b3
* fixes for EventMachine initialization to work in ruby-only context (without web)
2014-01-16 02:21:28 +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
1f31bb3ff5
* fixing debian postinstall issue
2014-01-14 09:47:30 -06:00
Seth Call
d89ce4c140
* VRFS-801 - almost working on my dev machine
2014-01-11 04:57:07 +00:00
Seth Call
83409e9da8
* adding resque gem to Gemfile
2014-01-08 22:55:44 +00:00
ae1fd60bbf
add builder to gems list
2014-01-07 22:27:00 +00:00
Seth Call
45a18c4449
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-06 20:35:41 +00:00
Seth Call
ba3b9ab873
* VRFS-946 - in-session recording
2014-01-05 03:47:23 +00:00
452ddb3ff0
VRFS-933 more notification work; fixed test failures
2014-01-01 22:06:59 -05:00
Seth Call
73b04ba5fc
* oomps--left in my local capybara-screenshot reference
2013-12-30 19:10:12 +00:00
Seth Call
e4ed571dcb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-30 18:34:26 +00:00
Seth Call
ab70d15eaf
* the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks)
2013-12-30 18:34:15 +00:00
4a9ad7b733
VRFS-937 - locking 'gon' to ~>4.1.0 to fix test failures
2013-12-28 11:54:53 -06:00
Seth Call
182242c7fb
* VRFS-856 - hopefully the fix
2013-12-21 15:12:25 +00:00
Seth Call
9943e4518b
* oops. adding path to poltergeist gem
2013-12-21 02:43:55 +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
Jonathan Kolyer
Steven Miers
Seth Call
Brian Smith
Bert Owen
Anthony Davis
jam