 Seth Call
|
76e63193ca
|
* fixing some broken tests
|
2014-04-09 21:11:13 +00:00 |
|
Seth Call
|
cc7bbf3f6a
|
* resolved merge
|
2014-04-09 18:31:40 +01:00 |
|
Seth Call
|
95f1a59851
|
* VRFS-1404 reconnect with tests
|
2014-04-09 18:25:52 +01:00 |
Brian Smith
|
8e9bf41b10
|
VRFS-1573 start playing audio as soon as session/recording landing pages load
|
2014-04-08 22:29:03 -04:00 |
|
Brian Smith
|
1a7e63d50a
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-08 21:37:12 -04:00 |
|
Seth Call
|
3dfc455fa4
|
* reconnect working for in-session; beginning in-situ reconnect refactor
|
2014-04-08 12:43:26 +01:00 |
|
Brian Smith
|
a6f5fa7f54
|
VRFS-1356 do not display broken instrument icon by using helper method that resolves to default icon
|
2014-04-08 01:41:25 -04:00 |
|
Brian Smith
|
4906c2b902
|
VRFS-1437 update play and like stats during refresh
|
2014-04-08 01:21:10 -04:00 |
|
Brian Smith
|
5784c26089
|
VRFS-1437 fix bug
|
2014-04-08 01:17:40 -04:00 |
|
Brian Smith
|
73f819511e
|
VRFS-1437 update recording/session landing page comments automatically
|
2014-04-08 00:59:35 -04:00 |
|
Seth Call
|
79c243a20b
|
* automatic reconnect dialog will guide user without having to click - VRFS-1404
|
2014-04-07 17:36:08 +01:00 |
Jonathan Kolyer
|
8b9bb336e4
|
Merge branch 'vrfs736' into develop
|
2014-04-07 07:55:32 +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 |
|
Brian Smith
|
0dbe8ea634
|
update tests
|
2014-04-06 16:59:38 -04:00 |
|
Brian Smith
|
200541e964
|
update tests
|
2014-04-06 16:59:09 -04:00 |
|
Brian Smith
|
cdc28e48fb
|
remove alert
|
2014-04-06 16:44:56 -04:00 |
|
Brian Smith
|
6cda9023c7
|
VRFS-1440 session and recording landing page comments should use timeago for timestamps
|
2014-04-06 16:43:32 -04:00 |
|
Jonathan Kolyer
|
887795bead
|
VRFS-1483 final cleanup
|
2014-04-05 22:16:32 +00:00 |
|
Jonathan Kolyer
|
e5d280e374
|
VRFS-1483 final cleanup
|
2014-04-05 22:13:28 +00:00 |
|
Jonathan Kolyer
|
6834a05568
|
Merge branch 'develop' into vrfs1483
|
2014-04-05 21:43:37 +00:00 |
|
Jonathan Kolyer
|
ce6d143876
|
VRFS-1483 added authoritzation for email_batch
|
2014-04-05 21:42:56 +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
|
4e95c7cbd5
|
VRFS-1483 changed instructions to indicate default hiding of admin session
|
2014-04-05 18:26:16 +00:00 |
|
Seth Call
|
b37a95c6a5
|
* Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-05 03:21:58 +01:00 |
|
Seth Call
|
3a29abd3d6
|
* fix minimal typo
|
2014-04-05 03:10:44 +01:00 |
|
Seth Call
|
700ef04edf
|
* VRFS-1531, and a fix for feed test having 'dirt' in it from other tests. also reverting batch mailer test
|
2014-04-04 23:16:38 +01:00 |
|
Seth Call
|
8f18ed09f2
|
* removing jquery.d dependencie
|
2014-04-04 20:18:33 +01:00 |
|
Seth Call
|
d1622cfd95
|
* fix batch_mailer tests
|
2014-04-04 20:02:44 +01:00 |
|
Seth Call
|
26d7b067f1
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-04 19:38:42 +01:00 |
|
Seth Call
|
b48308a4fd
|
* VRFS-1575 - just very initial work
|
2014-04-04 19:38:31 +01:00 |
|
Jonathan Kolyer
|
d49c4624cd
|
VRFS-1483 added test Rails.env check
|
2014-04-04 10:23:20 +00:00 |
|
Jonathan Kolyer
|
e9f99dbe08
|
develop merge
|
2014-04-04 10:22:48 +00:00 |
|
Jonathan Kolyer
|
b4a3c73917
|
VRFS-1483 fixed batch email test so it should always work in test Rails.env
|
2014-04-04 10:18:09 +00:00 |
|
Jonathan Kolyer
|
e750ac9e68
|
VRFS-1483 error handling
|
2014-04-04 10:08:00 +00:00 |
|
Brian Smith
|
5683b7386a
|
VRFS-1465 fix tests
|
2014-04-04 00:47:07 -04:00 |
|
Brian Smith
|
981a7eb4e2
|
Merge branch 'hotfix/feed_icon_fix' into develop
|
2014-04-03 23:46:53 -04:00 |
|
Seth Call
|
e1d20949f5
|
* make 'two-instrument' user
|
2014-04-03 15:44:02 +01:00 |
|
Seth Call
|
7816007361
|
* test tweaks
|
2014-04-03 15:38:58 +01:00 |
|
Seth Call
|
18484c484b
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-03 15:11:31 +01:00 |
|
Seth Call
|
f1ef1de83c
|
* wip new ftue
|
2014-04-03 15:11:23 +01:00 |
|
Jonathan Kolyer
|
a7c8d9311f
|
VRFS-1483 fixing tests
|
2014-04-03 05:03:28 +00:00 |
|
Brian Smith
|
7e8b6eb238
|
VRFS-1465 add tests
|
2014-04-03 00:19:39 -04:00 |
|
Brian Smith
|
b17dafd94f
|
Merge branch 'develop' into hotfix/feed_icon_fix
|
2014-04-01 21:31:07 -04:00 |
|
Seth Call
|
90eb0bc081
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-02 00:43:10 +01:00 |
|
Seth Call
|
86246d526f
|
Merge branch 'feature/create_find_tiles' into develop
|
2014-04-02 00:42:56 +01:00 |
|
Seth Call
|
7bfe1cb634
|
* VRFS-1532 - launch in chrome, ff, or IE10/11. otherwise show instructions to go run it yourself
* VRFS-1541 - alphabetically order recordings
* VRFS-1563 - password reset page should have no crashes anymore.
|
2014-04-02 00:38:36 +01:00 |
|
Jonathan Kolyer
|
3509a84de5
|
VRFS-1483 replaced layout with user_mailer
|
2014-04-01 14:51:45 +00:00 |
|
Jonathan Kolyer
|
634de87e90
|
Merge branch 'develop' into vrfs1483
|
2014-04-01 14:49:29 +00:00 |
|
Jonathan Kolyer
|
accaa99e38
|
VRFS-1483 integrating opt-out; fixing tests
|
2014-04-01 14:42:26 +00:00 |