 Seth Call
|
106222638f
|
* VRFS-1684 and VRFS-1686 - updating stored procs, added /api/sessions/nonactive/, adding a bunch of tests for sms_index
|
2014-06-17 14:10:24 -05:00 |
|
Seth Call
|
5ad6db90ef
|
* VRFS-1684 - approved RSVP'ed users now have scores as well
|
2014-06-16 18:14:04 -05:00 |
Scott Comer
|
d02e10def5
|
fix asm_index stored procedure to populate all users of active sessionsinto ams_users_tmp whether they have scores or not
|
2014-06-15 19:26:13 -05:00 |
|
Scott Comer
|
3c3565893d
|
wire up live latency and tag; accessors for tag and latency; fix borked function def; ams_init function; ams transaction
|
2014-06-14 21:27:34 -05:00 |
|
Scott Comer
|
691f0c1a65
|
first cut at ams_index stored procedure
|
2014-06-13 10:22:29 -05:00 |
Brian Smith
|
5fc9696d01
|
merge develop
|
2014-06-11 08:45:34 -04:00 |
|
Seth Call
|
4a603cbaa2
|
* VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives
|
2014-06-09 15:43:16 -05:00 |
|
Brian Smith
|
a9b67a9a6b
|
VRFS-1693 resque job to schedule recurring music sessions
|
2014-06-03 01:10:25 -04:00 |
|
Scott Comer
|
1d19bf613c
|
removed users isp field, use last_jam_locidispid%1000000 instead; added fields for state and country codes.
|
2014-06-01 16:03:32 -05:00 |
|
Brian Smith
|
ae79912dab
|
merge develop
|
2014-05-31 07:41:59 -04:00 |
|
Seth Call
|
05666f7927
|
wip
|
2014-05-29 14:34:18 -05:00 |
|
Brian Smith
|
7a4ad83cef
|
merge develop
|
2014-05-29 00:20:09 -04:00 |
|
Brian Smith
|
3078236ef6
|
add open_rsvps flag to music_sessions table
|
2014-05-26 12:09:18 -04:00 |
|
Scott Comer
|
bf06df36a3
|
added better regions database; added appropriate indexing for regions table
|
2014-05-22 15:17:00 -05:00 |
|
Scott Comer
|
5527a6032c
|
geolite region/state codes per country
|
2014-05-22 08:14:45 -05:00 |
Bert Owen
|
00d06fe6f2
|
* merge
|
2014-05-22 16:07:17 +08:00 |
|
Bert Owen
|
57f1fab935
|
VRFS-1677 fixed
|
2014-05-22 16:02:48 +08:00 |
|
Brian Smith
|
0e419a7881
|
VRFS-1692 cancel RSVP complete
|
2014-05-22 00:40:17 -04:00 |
|
Brian Smith
|
176e862338
|
VRFS-1691 update RSVP request complete
|
2014-05-21 23:36:34 -04:00 |
|
Scott Comer
|
94421c03c0
|
merge conflict with db/manifest resolved
|
2014-05-21 21:33:38 -05:00 |
|
Scott Comer
|
09231c5fe6
|
fix for vrfs-1476 - scoring should store the detail data
|
2014-05-21 21:30:43 -05:00 |
Jonathan Kolyer
|
bbd0c27d23
|
VRFS-736 cleanup of sess_notrecord text; added progress mailer queue
|
2014-05-21 22:41:17 +00:00 |
|
Jonathan Kolyer
|
836baee962
|
merging with develop
|
2014-05-21 21:55:26 +00:00 |
|
Scott Comer
|
4a76e0c983
|
get_work has a larger radius and excludes the current connections address
|
2014-05-21 14:05:45 -05:00 |
|
Brian Smith
|
d665a09080
|
scheduled session rsvp wip
|
2014-05-20 00:31:26 -04:00 |
|
Bert Owen
|
cdc9d121cb
|
VRFS-1674 Create Session API
|
2014-05-19 23:35:38 +08:00 |
|
Jonathan Kolyer
|
e44ccc7653
|
VRFS-736 client_notdl mailer
|
2014-05-19 15:12:59 +00:00 |
|
Brian Smith
|
dce007a13d
|
VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres
|
2014-05-18 22:31:25 -04:00 |
|
Jonathan Kolyer
|
6e7562ffc8
|
VRFS-736 progression emails first pass
|
2014-05-18 00:12:01 +00:00 |
|
Scott Comer
|
9eaa34b07f
|
disable lat lng and distance in queries for users
|
2014-05-17 14:55:26 -05:00 |
|
Jonathan Kolyer
|
b393cf35c4
|
VRFS-1664 STI columns for email batches
|
2014-05-17 17:42:47 +00:00 |
|
Bert Owen
|
027fd61606
|
* added recurring_mode to music_session for recurring sessions
|
2014-05-16 00:19:44 +08:00 |
|
Bert Owen
|
24117c1b67
|
VRFS-1718 added MusicNotation model, migration
|
2014-05-15 23:49:06 +08:00 |
|
Brian Smith
|
2302c89154
|
VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic
|
2014-05-13 01:22:23 -04:00 |
|
Scott Comer
|
ca27a6ab97
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
Conflicts:
db/manifest
|
2014-05-08 19:47:17 -05:00 |
|
Scott Comer
|
3f688a8392
|
update user home base (last_jam_blah) fields upon registation and joining a music session as a musician
|
2014-05-08 19:44:52 -05:00 |
|
Seth Call
|
9948917f95
|
* fix promotional data
|
2014-05-08 08:25:30 -05:00 |
|
Seth Call
|
244f79eefb
|
* merging develop into feature/scheduled_sessions
|
2014-05-07 15:04:41 -05:00 |
|
Seth Call
|
5f1ea4c754
|
* merging manifest
|
2014-05-07 05:17:17 -05:00 |
|
Seth Call
|
c31c13b07e
|
* adding chat_messages constraint for user_id
|
2014-05-06 20:04:53 -05:00 |
|
Seth Call
|
7dd1e6c464
|
* renaming of tables in
|
2014-05-06 17:50:41 -05:00 |
|
Seth Call
|
732fd66f0e
|
* all tests pass; but need to now rename music session tables to match class names...
|
2014-05-06 16:17:26 -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
|
acd1efd877
|
* wip
|
2014-05-05 10:06:27 -05:00 |
|
Scott Comer
|
6be0791adb
|
merge
|
2014-05-02 15:20:21 -05:00 |
|
Scott Comer
|
5cc515d615
|
a small cleanup of connection fields and fix broken tests
|
2014-05-02 13:44:29 -05:00 |
|
Seth Call
|
7515b1c3bd
|
* moving new migration to end of manifest
|
2014-05-02 11:36:51 -05:00 |
|
Bert Owen
|
7d3ac6fc54
|
VRFS-1503 implement session chat feature
|
2014-05-03 00:33:27 +08:00 |
|
Bert Owen
|
bf04fca205
|
VRFS-1503 implement session chat feature
|
2014-05-03 00:30:56 +08:00 |
|
Seth Call
|
65fb0511c6
|
* merging manually database migrations from the master branch now, because I need to preserve db lineage with www as a priority
|
2014-05-01 15:04:23 -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 |
|
Jonathan Kolyer
|
1af868dd60
|
VRFS-1577 moved session_ratings.sql to bottom
|
2014-04-30 14:23:26 +00:00 |
|
Jonathan Kolyer
|
2ee96c49ec
|
merging develop
|
2014-04-30 14:21:23 +00:00 |
|
Jonathan Kolyer
|
dddc0311c0
|
VRFS-1577 VRFS-736 session ratings
|
2014-04-30 14:07:23 +00:00 |
|
Seth Call
|
9820562892
|
* more websocket/heartbeat fixes
|
2014-04-30 03:01:28 +00:00 |
|
Seth Call
|
e3e9cb5830
|
* keeping master in line with development, for dataabse
|
2014-04-29 16:31:36 +00:00 |
|
Seth Call
|
d472c2b78f
|
* keeping master manifest is lock with develop
|
2014-04-29 16:29:06 +00:00 |
|
Bert Owen
|
3921324b32
|
VRFS-1503 added protocol buffer, chat message model & controller, rest api
|
2014-04-23 14:34:59 +02:00 |
|
Bert Owen
|
ddf3c9cc5f
|
VRFS-1503 added protocol buffer, chat message model & controller, rest api
|
2014-04-23 14:27:58 +02:00 |
|
Bert Owen
|
07e141cc8f
|
VRFS-1503 added protocol buffer, chat message model & controller, rest api
|
2014-04-23 14:27:49 +02:00 |
|
Jonathan Kolyer
|
ed09892284
|
merging develop and vrfs1576
|
2014-04-23 07:50:50 +00:00 |
|
Bert Owen
|
15064ad6c0
|
VRFS-1567 fix default sender, add new migration for email_batches table
|
2014-04-21 10:39:08 -07:00 |
|
Jonathan Kolyer
|
937efed3e5
|
VRFS-1576 affiliate_partner model
|
2014-04-20 22:54:49 +00:00 |
|
Jonathan Kolyer
|
7203124e89
|
merging
|
2014-04-08 07:21:50 +00:00 |
|
Jonathan Kolyer
|
880027a87f
|
VRFS-736 added liked us tracking to email footer icons for twitter/fb/goog
|
2014-04-07 07:54:17 +00:00 |
|
Jonathan Kolyer
|
15090e3c70
|
VRFS-1483 error collector; cleanup
|
2014-04-05 21:25:47 +00:00 |
|
Jonathan Kolyer
|
e59d9cbe7a
|
VRFS-1483 email error handling
|
2014-04-05 18:52:12 +00:00 |
|
Jonathan Kolyer
|
e750ac9e68
|
VRFS-1483 error handling
|
2014-04-04 10:08:00 +00:00 |
|
Jonathan Kolyer
|
accaa99e38
|
VRFS-1483 integrating opt-out; fixing tests
|
2014-04-01 14:42:26 +00:00 |
|
Jonathan Kolyer
|
e29907f09b
|
merging
|
2014-03-19 18:44:35 +00:00 |
|
Seth Call
|
da7fc7d901
|
* VRFS-1541 done from a code perspective... just need to do some admin work once posted
|
2014-03-31 03:28:04 +01:00 |
|
Seth Call
|
526f6fe577
|
* VRFS-1473 - notifications should be highlighted, wip
|
2014-03-26 17:09:48 +00:00 |
|
Seth Call
|
b04c7bcea5
|
* VRFS-871 - user-to-user messaging complete
|
2014-03-20 11:53:26 +00:00 |
|
Jonathan Kolyer
|
e8dd5f6ae5
|
VRFS-1483 state transitions and optimistic locking
|
2014-03-19 04:24:42 +00:00 |
|
Jonathan Kolyer
|
40a2049bdf
|
VRFS-1483 added from_email column to email_batches
|
2014-03-18 20:31:23 +00:00 |
|
Jonathan Kolyer
|
3204de01e6
|
VRFS-1483 merge
|
2014-03-18 15:13:03 +00:00 |
|
Jonathan Kolyer
|
e6d0851391
|
VRFS-1483 adding first set of updates for batch emails
|
2014-03-18 15:07:45 +00:00 |
|
Scott Comer
|
60aa59e11f
|
faster signup
|
2014-03-11 17:35:00 -05:00 |
|
Seth Call
|
1d1578fde8
|
* adding social description ability for sharing facebook
|
2014-03-11 18:14:05 +00:00 |
|
Seth Call
|
557412992e
|
* add just a few more constraint delete cascades
|
2014-03-11 16:06:50 +00:00 |
|
Seth Call
|
a5a083a4e8
|
* fix for recording landing page not working, and fix for sort order enforced for jamfest
|
2014-03-11 15:50:08 +00:00 |
|
Seth Call
|
c9625a4529
|
* VRFS-1377 done, tested. going to manually test soon on production
|
2014-03-10 15:21:21 +00:00 |
|
Jonathan Kolyer
|
66b66a926b
|
VRFS-925 updating position of bands_did_session.sql
|
2014-03-10 09:02:23 +00:00 |
|
Jonathan Kolyer
|
d63f090657
|
VRFS-925 merge conflict
|
2014-03-10 09:01:33 +00:00 |
|
Seth Call
|
7df02c0778
|
* merging manifest
|
2014-03-10 07:13:01 +00:00 |
|
Seth Call
|
b9ee475db5
|
* working on event page
|
2014-03-10 06:31:20 +00:00 |
|
Scott Comer
|
a0fab2b584
|
mod the get_work stored procedure to exclude all connections but those which are from clients.
|
2014-03-10 00:17:34 -05: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 |
|
Scott Comer
|
af748cba75
|
rake tasks for importing geoip data
|
2014-03-09 17:35:12 -05:00 |
|
Jonathan Kolyer
|
848702e04d
|
VRFS-925 added bands_did_session.sql to bottom
|
2014-03-09 13:45:35 +00:00 |
|
Jonathan Kolyer
|
3b2c3ea755
|
VRFS-925 merge conflict
|
2014-03-09 13:42:53 +00:00 |
|
Jonathan Kolyer
|
2b11cb7abb
|
VRFS-925 ga event processing
|
2014-03-09 13:38:46 +00:00 |
|
Scott Comer
|
c1bea4ae03
|
merge conflict
|
2014-03-09 01:28:41 -06:00 |
|
Scott Comer
|
f8e06c476d
|
fixed and normalized data types and nullability in max_mind_geo and max_mind_isp; fixed rakes for same to use ruby csv instead of pg; dropped the huge maxmind data files i committed earlier; fixed lack of genre in websocket factories.rb constructed music sessions.
|
2014-03-09 00:22:51 -06:00 |
|
Jonathan Kolyer
|
721840172c
|
VRFS-1333 added plays_refactor.sql
|
2014-03-08 20:51:12 +00:00 |
|
Jonathan Kolyer
|
713344a7a7
|
merge conflict
|
2014-03-08 20:50:51 +00:00 |
|
Scott Comer
|
798ccc4529
|
fix case where connection_client_type.sql is boggled by existing connections, and added schema for cities, regions, and countries.
|
2014-03-07 17:23:25 -06:00 |
|
Scott Comer
|
d7443edf58
|
fix case where connection_client_type.sql is boggled by existing connections, and added schema for cities, regions, and countries.
|
2014-03-07 17:23:04 -06: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 |
|
Jonathan Kolyer
|
eb98b97cd5
|
merge conflict
|
2014-03-07 06:53:35 +00:00 |
|
scott comer
|
f64d5e3429
|
code to name maps for countries, united states, and canada
|
2014-03-06 23:35:46 -06:00 |
|
scott comer
|
88eb6584af
|
new geo files
|
2014-03-06 19:45:15 -06:00 |
|
scott comer
|
5be30ed2cc
|
new geoip data
|
2014-03-06 16:38:27 -06:00 |
|
scott comer
|
5aa4759605
|
new geoip data
|
2014-03-06 16:37:43 -06:00 |
|
Jonathan Kolyer
|
1eb4b80482
|
VRFS-1333 refactoring {recording,music_sessions_history}_plays into playable_plays
|
2014-03-05 06:40:04 +00:00 |
|
scott comer
|
f0a0f9f2f2
|
the real deal geoipdata
|
2014-03-04 10:41:00 -06:00 |
|
Scott Comer
|
7d8cb8c458
|
fix missing better test data and bug in connection_manager.rb relating to line 111
|
2014-03-03 20:30:34 -06:00 |
|
Seth Call
|
535a0da880
|
* oops. messed up manifest
|
2014-03-03 16:53:04 -06:00 |
|
Seth Call
|
3c4f5c7e55
|
* merged
|
2014-03-03 16:18:03 -06:00 |
|
Seth Call
|
7ab7bfd795
|
* VRFS-1297, VRFS-1305, VRFS-293, VRFS-950, VRFS-641 - track changes added to help frontend better understand when it needs to poke backend, and refresh state
|
2014-03-03 16:13:23 -06:00 |
|
Scott Comer
|
5d899f57dd
|
complete unit tests for api_scoring_controller and add some better test data
|
2014-03-01 20:36:51 -06:00 |
|
Seth Call
|
051fcd8b04
|
* working around conn.update
|
2014-02-25 03:25:34 +00:00 |
|
Scott Comer
|
4153cfe3a1
|
users.locidispid must be bigint, too
|
2014-02-24 16:31:53 -06:00 |
|
Scott Comer
|
b33206683b
|
merged updates
|
2014-02-24 15:22:26 -06:00 |
|
Scott Comer
|
f69cdc3b4d
|
fix problem with locidispid being int instead of bigint; add scores; flush use of prepared statements for geoip stuff; implement connection manager update of connection and user records with location information
|
2014-02-24 15:19:46 -06:00 |
|
Seth Call
|
0522c20e60
|
* VRFS-1100 - can only download 100 times before 404 given for client downloads, VRFS-862 - quick change to unblock
|
2014-02-24 16:55:56 +00:00 |
|
Seth Call
|
ab2d8c4f8a
|
* VRFS-1213 - work arounds for postgis migrations
|
2014-02-22 06:29:39 +00:00 |
|
Seth Call
|
b5934bba30
|
* merging in from scoring cache migrations
|
2014-02-22 05:11:40 +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 |
|
Scott Comer
|
4a9330523c
|
*** scoring schema migration
|
2014-02-21 22:21:31 -06:00 |
|
Seth Call
|
f3c09f65c2
|
* allowing tests to be skipped, and mostly done with VRFS-1200
|
2014-02-20 22:23:44 +00:00 |
|
Seth Call
|
aab902e8cf
|
* VRFS-1160 - favorites REST API done
|
2014-02-20 20:54:35 +00:00 |
|
Seth Call
|
df14676495
|
* VRFS-1135 - user and band targetting possible
|
2014-02-20 07:45:51 +00:00 |
|
Seth Call
|
2905245f1a
|
* VRFS-1181 - upright bass in the mix
|
2014-02-19 04:40:37 +00:00 |
|
Seth Call
|
3ca1744c27
|
* VRFS-1135 make plays and recordings and sessions unique for user/model combo
|
2014-02-18 13:40:13 +00:00 |
|
Seth Call
|
222bf23cc5
|
* VRFS-1135 sorts added to model; need to change next behavior to come from model, not controller
|
2014-02-18 13:34:51 +00:00 |
|
Seth Call
|
d6149a3908
|
* pin rails to 3.x
|
2014-02-18 04:54:33 +00:00 |
|
Seth Call
|
8483239054
|
* pg_migrate bump to 0.1.13 with relaxed thor version
|
2014-02-18 03:42:42 +00:00 |
|
Seth Call
|
e5c6ba0c76
|
* gah left in bad file in manifest
|
2014-02-18 00:02:31 +00:00 |
|
Seth Call
|
5654f27b55
|
* merged
|
2014-02-17 23:26:17 +00:00 |
|
Seth Call
|
ff6b3795ce
|
* merged
|
2014-02-17 00:32:51 +00:00 |
|
Seth Call
|
5ef630cf86
|
* in progress on next parameter VRFS-1135
|
2014-02-17 00:30:08 +00:00 |
|
Brian Smith
|
83f347e84c
|
merge like/follow refactor and hover bubble work
|
2014-02-16 16:03:32 -05:00 |
|
Brian Smith
|
ebc49b6ccc
|
VRFS-1028 more refactor work
|
2014-02-16 14:48:54 -05:00 |
|
Brian Smith
|
a1828cd93d
|
trying to fix tests
|
2014-02-16 13:06:36 -05:00 |
|
Brian Smith
|
5ba98b93ab
|
fixing tests in progress
|
2014-02-16 08:40:03 -05:00 |
|
Seth Call
|
f7d0ef2b05
|
* VRFS-1135 only one recording comes back; not per claimed recording
|
2014-02-16 13:10:00 +00:00 |
|
Brian Smith
|
36287d0b5f
|
VRFS-1028 hover bubble / like and follow refactor
|
2014-02-16 02:28:35 -05:00 |
|
Brian Smith
|
c173582aa3
|
more work on like/follow refactor
|
2014-02-15 20:24:51 -05:00 |
|
Brian Smith
|
c03404d520
|
like/follow refactor
|
2014-02-15 18:23:00 -05:00 |
|
Seth Call
|
26a8b8013d
|
* VRFS-1135 - initial implementation with no ways to control the returned results. it just returns most recent to oldest now, with a max of 20
|
2014-02-15 21:19:03 +00:00 |
|
Brian Smith
|
5a03ec87ae
|
follow/like refactor to use polymorphic associations
|
2014-02-15 11:55:01 -05:00 |
|
Seth Call
|
9f7dfa4fcc
|
* adding in piano to list of instruments
|
2014-02-14 23:10:39 -06:00 |
|
Seth Call
|
108a9564b6
|
* adding band create error reporting, better styling of 500 errors, and upping region size
|
2014-02-13 22:57:48 +00:00 |
|
Seth Call
|
5ba4e97dca
|
* VRFS-1089 - jamadmin creation of recordings done
|
2014-02-13 16:41:50 +00:00 |
|
Seth Call
|
52f9bde0a3
|
* taking gon to 5.0.1 for now
|
2014-02-13 14:19:08 +00:00 |
|
Seth Call
|
fa7f83a371
|
* VRFS-1090 all_discarded add to db schema
|
2014-02-08 03:05:16 +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
|
4c39e45708
|
* merged
|
2014-02-06 16:35:33 +00:00 |
|
Seth Call
|
17961e676d
|
* VRFS-1077 done
|
2014-02-06 16:31:52 +00:00 |
|
Brian Smith
|
bc305cac5e
|
VRFS-1020 fix share token design
|
2014-02-06 00:45:48 -05: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
|
9ce300db56
|
* fix for welcome.js not being in assets
|
2014-02-04 19:10:31 +00:00 |
|
Seth Call
|
d4a5737c51
|
* VRFS-1025 finished
|
2014-02-03 21:19:14 +00:00 |
|
Seth Call
|
513fb2b8d4
|
* intsall to vendor/bundle
|
2014-02-02 14:03:31 -06: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
|
6806d6f0d3
|
* VRFS-1016
|
2014-01-31 14:25:17 -06:00 |
|
Brian Smith
|
edebf42e73
|
VRFS-1020 share dialog work
|
2014-01-31 01:39:09 -05: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 |
|
Seth Call
|
956b25c577
|
* fixing bug when icecast.xml exists VRFS-1010
|
2014-01-30 09:32:12 -06:00 |
|
Jonathan Kolyer
|
b0a8da15b6
|
vrfs152: moved invited_users_facebook_support.sqlto bottom
|
2014-01-29 23:05:55 -06:00 |
|
Jonathan Kolyer
|
c22331c010
|
conflict merge
|
2014-01-29 23:05:09 -06:00 |
|
Jonathan Kolyer
|
a73d4d758d
|
vrfs152: created one FB invite constraint
|
2014-01-29 21:22:37 -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
|
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 |
|
Seth Call
|
c91940852b
|
* going to 'hide' integrate icecast into sessions.sql' from staging for now
|
2014-01-19 05:20:40 +00: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
|
5c8e315ee5
|
* pending didn't take
|
2014-01-19 03:32:36 +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 |
|
Jonathan Kolyer
|
42713f4c9d
|
vrfs152: allowing invited_users to have null email
|
2014-01-15 04:10:13 -06:00 |
jam
|
10687093c1
|
Resolve conflicts
|
2014-01-14 21:24:45 +00:00 |
|
jam
|
b15604c148
|
Icecast modules and test
|
2014-01-14 21:22:05 +00:00 |
|
Brian Smith
|
59f6e10e55
|
VRFS-986 recording landing page work
|
2014-01-14 02:49:21 -05:00 |
|
Seth Call
|
a7fa73cfb3
|
* VRFS-801 still working out some mixer devops issues now;
|
2014-01-13 22:48:55 +00:00 |
|
Brian Smith
|
6d42e42c18
|
VRFS-987 backend support for session/recording likes, plays, and comments
|
2014-01-12 12:51:06 -05: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 |
|
jam
|
7ec4be3063
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-10 23:53:25 +00:00 |
|
jam
|
cc4cd61930
|
nake char range explicit
|
2014-01-10 21:03:33 +00:00 |
|
Seth Call
|
1555af6db8
|
* VRFS-984 finished. subpath is /resque
|
2014-01-10 16:25:55 +00:00 |
|
Jonathan Kolyer
|
e5d23cc3bd
|
merge conflicts
|
2014-01-08 18:45:34 -06:00 |
|
jam
|
f003fb2501
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-08 01:43:13 +00:00 |
|
jam
|
8c51eb31db
|
Fix test and make sure icecast is at the bottom of the sql command chain
|
2014-01-08 01:42:59 +00:00 |
|
Seth Call
|
c92dd66f24
|
* moving icecast to bottom
|
2014-01-07 23:32:08 +00:00 |
|
jam
|
1ac74eadb3
|
Icecast changes
|
2014-01-07 14:32:12 -06:00 |
|
jam
|
57a9571483
|
resolve conflict
|
2014-01-04 08:04:24 -06: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
|
fa23c267f5
|
* VRFS-946 and VRFS-922 - in-session recording features complete
|
2014-01-06 20:35:35 +00:00 |
Chris Doughty
|
d8cb2c72c4
|
VRFS-951 Pushing only develop or master branch files as debians
|
2014-01-05 21:35:22 -06:00 |
|
Seth Call
|
ba3b9ab873
|
* VRFS-946 - in-session recording
|
2014-01-05 03:47:23 +00:00 |
|
jam
|
b4260a4ed1
|
adde icecast file to gem library
|
2014-01-04 07:40:08 -06:00 |
|
Jonathan Kolyer
|
b731bd84e0
|
vrfs-927: updated db cols for carrierwave integration
|
2014-01-04 03:11:31 -06:00 |
|
Seth Call
|
c3954d65f0
|
* delete existing tracks on older migration that will break existing deployments
|
2013-12-30 19:16:08 +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 |
Brian Smith
|
75b9b97c60
|
fix warning related to ruby- prefix in .ruby-version files
|
2013-12-27 16:28:28 -05:00 |
|
Jonathan Kolyer
|
7212f20a0f
|
vrfs-927: admin editing buzz promotions
|
2013-12-22 10:19:39 -06:00 |
|
Jonathan Kolyer
|
ec126793c7
|
vrfs-927: added new promotional table for home page data
|
2013-12-22 05:22:04 -06:00 |
|
Seth Call
|
a68235f280
|
* adding 'select' to dialog-inner so it'll look JKish
|
2013-12-20 22:24:14 +00:00 |
|
Seth Call
|
242016c38b
|
* VRFS-821 - recordings manager changes
|
2013-12-20 22:01:51 +00:00 |
|
Seth Call
|
8bd715c7ea
|
* VRFS-821 many changes for upload apis, mostly
|
2013-12-17 19:44:30 +00:00 |
|
Seth Call
|
d97a960a0e
|
* VRFS-821 many changes for upload apis, mostly
|
2013-12-17 19:44:21 +00:00 |
|
Jonathan Kolyer
|
196b895f32
|
vrfs-884: merge conflict
|
2013-12-16 12:36:41 -06:00 |
|
Brian Smith
|
5ea5fd3d63
|
VRFS-877 add missing sql file
|
2013-12-15 20:26:21 -05:00 |
|
Brian Smith
|
5b5aef15c8
|
VRFS-877 band photo work
|
2013-12-15 16:27:11 -05:00 |
|
Jonathan Kolyer
|
4c804d2f94
|
vrfs-884: added band geocoding; inital band filtering tests; refactoring musicians filter page
|
2013-12-09 07:15:59 -06:00 |
|
Brian Smith
|
7aeb182f1f
|
VRFS-866 band invitations / notifications
|
2013-11-26 02:47:56 -05:00 |
|
Seth Call
|
95bc077634
|
* merging VRFS-813 into develop branch; mostly dealing with configureTracks.js and change from client-first on track state (VRFS-852)
|
2013-11-16 14:05:23 +00:00 |
|
Seth Call
|
9805775496
|
* VRFS-813 - done for this feature
|
2013-11-16 04:35:40 +00:00 |
|
Seth Call
|
db76c34ba5
|
* VRFS-813 -most all frontend changes needed for start/stop recordings
|
2013-11-03 14:55:55 -06:00 |
|
Jonathan Kolyer
|
b48a298af5
|
merge conflict
|
2013-11-03 03:16:14 -06:00 |
|
Jonathan Kolyer
|
291a3a8ac2
|
vrfs-774: changing country value from USA to US for max_mind_geo support
|
2013-11-03 01:49:10 -06:00 |
|
Brian Smith
|
5e79e34634
|
added biography to user model
|
2013-11-02 23:35:18 -04:00 |
|
Jonathan Kolyer
|
dd5be13e9f
|
vrfs-774: updated max_mind_geo/users table for geocoded searches
|
2013-10-28 21:41:52 -05:00 |
|
Seth Call
|
333d158fc6
|
* VRFS-780; forgot db migrations too. sheesh
|
2013-10-21 17:17:19 -05:00 |
|
Seth Call
|
32a4297569
|
* VRFS-780 - finished, tested, etc
|
2013-10-21 17:13:53 -05:00 |
|
Seth Call
|
f38ca2721a
|
* VRFS-734 - adding all user progression tracking that is possible currently
|
2013-09-30 02:37:22 +00:00 |
|
Seth Call
|
a2ab44648b
|
* VRFS-694 adding newrelic to rails
|
2013-09-18 20:14:37 +00:00 |
|
Seth Call
|
4d723bacaf
|
* fixing relative paths in gems for develop branch as well
|
2013-09-16 02:28:44 +00:00 |
|
Seth Call
|
a091c22aa6
|
merging jam-db into db
|
2013-09-15 17:58:54 +00:00 |