Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
6cfe5decbf
Merge branch 'develop' into feature/nocaptcha
2015-01-05 17:04:13 -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
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
e8fd6360aa
VRFS-2552 removed config.json_engine due to this error: undefined method key? JSON::Ext::Generator::State
2015-01-01 18:00:43 +00:00
Seth Call
8a84ff5609
* fix broken tests because of removal of diagnostics, and fix bad logging pattern
2014-12-31 23:17:47 -06:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -06:00
Seth Call
7ca3acb676
* wip
2014-12-22 09:50:59 -06:00
Seth Call
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
300426e2c9
VRFS-2480 : Additional recurly config
2014-11-25 14:34:07 -06:00
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06: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
6f463b7b6c
* adding steven to dev users
2014-09-20 21:25:57 -05:00
Seth Call
2bd189b697
* VRFS-2159 merge
2014-09-12 22:30:51 -05:00
Seth Call
d34929d70b
* landing pages in VRFS-2037
2014-08-14 22:23:22 -05:00
Seth Call
30b2c1bb53
* VRFS-2045 - fixing tests that use websocket-gateway, pass in 20 instead of defaulting of 0 for max connections
2014-08-14 13:16:38 -05:00
Seth Call
776704fdf5
* VRFS-2045 - guard against too many concurrent connections
2014-08-14 11:35:17 -05:00
Seth Call
322cdad87d
* wip
2014-08-14 10:09:33 -05:00
Seth Call
edc805e442
* VRFS-2040 - pass in retry value to backend
2014-08-13 12:51:40 -05:00
Seth Call
36043ec631
* make the packet size configurabel
2014-08-06 08:11:07 -05:00
Seth Call
2aab3c902d
* fixing test that failed on build server
2014-07-30 17:29:26 -05:00
Seth Call
a11ae44a90
* VRFS-1951 - make sure staging emails don't get sent from my machie
2014-07-30 16:39:59 -05:00
Seth Call
dc3fd38af1
* adding bart to dev_users
2014-07-26 14:19:48 -05:00
Seth Call
e4da30f39e
* wip
2014-05-29 14:39:08 -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
ad266e5b80
* VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
2014-04-30 15:29:10 -05:00
Seth Call
9820562892
* more websocket/heartbeat fixes
2014-04-30 03:01:28 +00:00
Seth Call
0a811a147c
* adding bert as a dev user
2014-04-16 17:13:55 +00:00
Seth Call
95f1a59851
* VRFS-1404 reconnect with tests
2014-04-09 18:25:52 +01:00
0987cf2cf8
VRFS-1483 editing batch emails
2014-03-19 16:37:03 +00:00
Seth Call
4aece93b87
* run websocket-gateway in spec_helper intsead of initializer for tests VRFS-1509
2014-03-21 04:44:34 +00:00
Seth Call
b04c7bcea5
* VRFS-871 - user-to-user messaging complete
2014-03-20 11:53:26 +00:00
Seth Call
000dd3fdd0
* VRFS-1253 - working in a basic sense with pagination
2014-03-09 18:04:56 +00:00
Seth Call
5f67ad3290
* make rabbitmq_host and rabbitmq_port configurable for websocket-gateway
2014-03-04 15:51:49 -06:00
d831cae7c7
VRFS-1193 fixed landing page promo buzz image display
2014-02-20 09:07:59 -06:00
Seth Call
5ba4e97dca
* VRFS-1089 - jamadmin creation of recordings done
2014-02-13 16:41:50 +00:00
Seth Call
dc462d804d
* VRFS-982 - style with custom easydropdown instead of select element
2014-02-10 22:43:09 +00:00
Seth Call
b668e54f57
* VRFS-1083 - twitter mostly working; need to deal with edge cases
2014-02-07 14:07:08 +00:00
Seth Call
17961e676d
* VRFS-1077 done
2014-02-06 16:31:52 +00:00
Seth Call
d4a5737c51
* VRFS-1025 finished
2014-02-03 21:19:14 +00:00
Seth Call
3d453468f2
* adding ability to run everything within jam-web for jobs
2014-01-29 13:24:34 -06:00
Seth Call
576e8deeee
* fixing recursion bug in eventmachine.rb
2014-01-26 19:51:56 +00:00
Seth Call
d23ca37a82
* fix for VRFS-1023; bugsnag preventing rails from starting
2014-01-25 21:07:39 -06:00
Seth Call
a26b93a54b
* adding requires bugsnag in needed locations to fix VRFS-1023- jam-web won't start
2014-01-25 17:48:17 -06: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
01e50b45b3
* fixes for EventMachine initialization to work in ruby-only context (without web)
2014-01-16 02:21:28 +00:00
Seth Call
63d6f428b3
* VRFS-997 - mix notifications
2014-01-15 22:15:33 +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
50595d155c
* VRFS-801 - closer to all fixes required for mixing
2014-01-13 13:44:28 +00:00
Seth Call
Steven Miers
Jonathan Kolyer