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 |
|
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 |
|
Brian Smith
|
dce007a13d
|
VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres
|
2014-05-18 22:31:25 -04: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 |
 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 |