Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-11-10 12:16:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
2229 commits 27 branches 47 tags 13 MiB
Commit graph

1627 commits

Author SHA1 Message Date
im85288
8e512896a0 update music db version for leia 2017-11-19 19:58:35 +00:00
angelblue05
c0012582c8 Fix plugin paths & Attempt to fix photos 
Emby removed photos library. Now it's homevideo and photos. Had to tweak
a few things.
Update plugin patha to properly encode naming.
 2017-11-08 22:42:48 -06:00
angelblue05
72d36d382b merge --develop 2017-11-08 20:58:59 -06:00
im85288
7be8c49b14 add support for latest kodi 18 music db changes 2017-11-04 14:08:12 +00:00
angelblue05
2a67cb2da5 Add a retry to detect playback 2017-11-02 22:34:55 -05:00
angelblue05
a4e12da8fe Add refresh boxsets option 2017-11-02 22:34:41 -05:00
angelblue05
b130f7646a Fixed server not falling back correctly 
Reduce timeout
 2017-11-02 22:34:26 -05:00
angelblue05
17211df01e Allow server without port 2017-11-02 22:34:10 -05:00
angelblue05
a3d996bc6c Fix freezing issue at startup 2017-10-10 00:40:20 -05:00
angelblue05
0435ab5b98 Fix typo 2017-10-04 17:47:30 -05:00
angelblue05
88dd33d4ce Fixed few bugs in playback 
video res not having values, audio url missing ?, support new server
setting that disables subs extraction
 2017-10-04 17:35:40 -05:00
angelblue05
2003367a21 Fix video detection in monitor 2017-10-04 17:34:25 -05:00
angelblue05
6be4ffca3d Offline mode for views 2017-10-04 17:34:00 -05:00
angelblue05
9f355989a6 Fixed connecting to server 2017-10-04 17:33:40 -05:00
angelblue05
c1fa4f0ac2 Temp fix series pooling for non admins 2017-09-04 01:40:05 -05:00
angelblue05
8d00a9ade2 Support series pooling 
Still requires a manual sync to apply...
 2017-09-03 14:10:04 -05:00
angelblue05
7767f515b9 Support new event PlayPause 2017-09-03 14:08:52 -05:00
angelblue05
7e5de4d06e Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop 2017-09-03 14:00:43 -05:00
EGrishin
6c4031158e Add SetRepeatMode feature (#101) 2017-08-25 02:22:12 -05:00
angelblue05
37cb909f46 use diff endpoint to validate server online 2017-08-12 20:10:06 -05:00
angelblue05
d1054896bc Add extra check (fix) 
Called wrong class
 2017-08-09 05:06:46 -05:00
angelblue05
8858860015 Add extra check (new bug in krypton??) 
Something in Kodi is triggering on play while hovering widgets.
 2017-08-08 21:17:32 -05:00
angelblue05
7e38a743d7 Fix server name encoding 2017-08-08 21:17:32 -05:00
Marcin W
d4ea2666fa Polish translation - update (#100) 2017-08-08 18:15:51 -05:00
angelblue05
3c9a684942 Fix first artist [missing tag] in krypton 2017-08-04 17:56:21 -05:00
angelblue05
708d3d7f39 Change server online to welcome message 2017-07-28 21:22:40 -05:00
angelblue05
fdce20d172 Fix for new cleanonupdate verification 2017-07-28 20:44:40 -05:00
andreas-woelfl
82c02594cb add resolution limit (#90) 2017-07-28 20:43:48 -05:00
angelblue05
41d56b53c3 Fix error with direct stream music 2017-07-28 17:12:52 -05:00
angelblue05
23b5b93bdd Add warning for clean on update 2017-07-28 02:11:41 -05:00
angelblue05
82ab2f2311 Add recently added filter 
To ignore playcount, now supports

plugin://plugin.video.emby/?id=Tag&mode=recentepisodes&limit=25&filters=playcount
 2017-07-27 22:51:24 -05:00
angelblue05
b6346a49cf Failsafe for artwork 
In case key exists but value is None. Prevent invalid artwork url.
 2017-07-27 18:46:58 -05:00
angelblue05
6147475629 Fix music library compare 
Ignore views
 2017-07-27 18:42:32 -05:00
angelblue05
030e557829 Update websocket url 
For reverse proxy
 2017-07-27 18:41:56 -05:00
angelblue05
299a0bd8f9 Fix network creds 
Convert backslash to ; for domain\username
 2017-07-27 18:07:00 -05:00
Marcin W
37a7ea47d7 Polish translation (#97) 2017-07-20 17:27:32 -05:00
angelblue05
1f2eeae8fc Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop 2017-07-09 00:35:37 -05:00
angelblue05
78655ccb28 Fix subtitles defaulting to srt 
Will now use the codec provided by server (srt, ass, ssa)
 2017-07-09 00:35:33 -05:00
Sebastian S
71da2bf777 Fixed uniqueID and ratingID issues (#95) 
* Fixed uniqueID and ratingID issues

* cleanup
 2017-06-27 02:28:06 -05:00
angelblue05
03e8b2ec86 Fix encoding 2017-06-24 22:04:05 -05:00
angelblue05
4a3be4d628 Add showtitle and episodeno to label2 
for listitem
 2017-06-24 22:03:55 -05:00
angelblue05
21e7a9cada Fix music extension/Fix music playback report 2017-06-18 23:14:03 -05:00
marcelveldt
b07d820806 basic support for Kodi Leia 2017-06-10 16:18:37 +02:00
angelblue05
4ed87e877c Fix playback for 4k force transcode 2017-05-29 23:13:56 -05:00
angelblue05
232daf8dbc Support open guide command 2017-05-09 02:58:59 -05:00
angelblue05
119ecaa39c Fix watched bug 
Try to catch kodi_id returning -1 and try to read the data returned by
Kodi in that situation.
 2017-05-07 18:32:34 -05:00
angelblue05
c46a64e579 Revert "Fix watched bug" 
This reverts commit b3aca0542e.
 2017-05-07 18:19:55 -05:00
angelblue05
b3aca0542e Fix watched bug 
Getting the playback info from the video dialog as playback is started
seems to fail more often than not (returns kodi_id = -1, item_type =
None) when the data passed by Kodi contains the right info.
 2017-05-07 16:41:21 -05:00
Shaun
5322058652 add api_key to streaming urls 2017-05-06 10:08:04 +10:00
sualfred
1b4f4e0b26 cleanup 2017-04-27 08:27:43 +02:00
sualfred
5952c37bfa Fixed wrong episode uniqueids in the UNIQUEID and RATING table. 
This will solve the problem with metadata updates of Emby
 2017-04-20 18:32:08 +02:00
agentxan
35911c7507 missing dbid parameter 
Fix missing metadata for resume play from kodi widgets if using addon
playback
 2017-04-04 16:57:47 -05:00
xnappo
e0b5cd1fdb Fix encoding issue in context menu. 2017-04-03 21:51:25 -05:00
agentxan
9fe0e61651 Update kodimonitor.py 2017-03-27 11:31:26 -05:00
agentxan
7f0d037531 Update kodimonitor.py 2017-03-11 17:13:50 -06:00
shaun
72c76adbf8 dont worry about server details if the url does nto have server and user id placeholders in it 2017-02-05 22:50:01 +11:00
shaun
ee01e7cb5e Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop 2017-02-05 11:00:49 +11:00
shaun
e90919e6b6 less metric logging for download function 2017-02-05 11:00:20 +11:00
Michal Kuncl
ed575378b5 another typo :-( 2017-02-04 13:00:35 +01:00
Michal Kuncl
18bd1601af Typo fix 2017-02-04 12:49:17 +01:00
Michal Kuncl
f4b00801fb Add Czech Language 2017-02-04 12:40:09 +01:00
shaun
c8b1e738c6 refine download function, more exceptions 2017-02-04 10:42:22 +11:00
shaun
f7c79e366e wrap the set window prop for file name in a try 2017-02-02 07:00:31 +11:00
im85288
66eb53dc08 add storing current filename to window property to support external addons 2017-01-30 16:05:00 +00:00
sfaulds
4096e0ad5c small fix for server details being missing, stop crash and just try connection 
dont return None for server details being missing, throw as we need to get to the botton of this
 2017-01-30 16:05:41 +11:00
sualfred
50658294d7 Fixed broken DTS-HD_ma and DTS-HD_hra flags 2017-01-25 11:31:42 +01:00
sfaulds
f1aaed636d throw doanload error 2017-01-25 10:14:48 +11:00
shaun
ce46fb7015 on all emby DB connection create check the emby tables 2017-01-15 10:46:14 +11:00
shaun
706f903299 do the action and on except set the default 2017-01-14 11:38:00 +11:00
sfaulds
38a5edee63 do the emby tables check flag reset earlier 2017-01-12 09:08:52 +11:00
sfaulds
1f34e043ec abort download if server is not set correctly. 2017-01-11 13:14:55 +11:00
sfaulds
b235046ea6 some items dont return any data for tracks 2017-01-11 12:12:10 +11:00
Shaun
39ccf258fa Merge pull request #76 from armills/hi10p-transcode 
Ensure transcoding for hi10p videos when requested
 2017-01-10 10:55:40 +11:00
shaun
00edbf610b -retry start() on threads as slow systems can sometimes take a few seconds to release old threads 
-check json parsing for errros and return
-if no runtime then use zero
 2017-01-07 19:19:39 +11:00
shaun
4298db5f90 check for item name none 2017-01-04 19:25:52 +11:00
shaun
6a6578b711 check the view_list is not none 2017-01-03 16:40:49 +11:00
shaun
cb5fe7a354 when we first run for any user we need to check the emby db tables, this resets this window value on user profile switching 2017-01-03 16:40:26 +11:00
shaun
cf6380ef1f some messages dont have data 2017-01-03 16:39:29 +11:00
im85288
749dd8575c bring back jarvis compatibility 2017-01-01 17:45:57 +00:00
im85288
450c2a6ba6 bring back jarvis compatibility 2017-01-01 16:59:34 +00:00
im85288
b572d60cd9 bring back jarvis compatibility 2017-01-01 16:58:11 +00:00
im85288
cb30feba46 support add/update krypton ratings 2017-01-01 16:06:40 +00:00
im85288
e72a3070e3 more krypton ratings 2016-12-31 17:14:28 +00:00
im85288
835e95d3fd more krypton ratings 2016-12-31 16:30:11 +00:00
im85288
aceecdfe5e add episodes/tvshows uniqueid/rating 2016-12-31 12:47:12 +00:00
im85288
87501eedea start of kodi uniqueid 2016-12-29 21:04:22 +00:00
im85288
863919d696 start of kodi ratings 2016-12-29 18:55:31 +00:00
angelblue05
6a1b574631 Fix direct play theme 2016-12-20 02:12:58 -06:00
angelblue05
88889716da Modify on-wake logic 2016-12-15 19:16:16 -06:00
angelblue05
3e08f5ab8a Fix startup process 2016-12-15 17:51:30 -06:00
angelblue05
aaffb1eaad Add Italian translation 2016-12-05 19:05:42 -06:00
angelblue05
8b3c05cc6b Fix compare issue 2016-12-05 18:20:02 -06:00
angelblue05
9f1cf14cf6 Change to throttle 2016-12-03 03:11:43 -06:00
sfaulds
f793f709ef a few more places we need to check for exceptions 2016-12-01 15:28:42 +11:00
angelblue05
4c9408b640 Reduce logging 2016-11-30 17:27:39 -06:00
sfaulds
e2fa93a6c4 add handeling of exceptions for some downloadUrl func calls 2016-12-01 09:21:36 +11:00
angelblue05
62610f5e0d Fix retention 2016-11-30 14:26:26 -06:00
angelblue05
8a295347f8 Fix fast sync exception catching 
As it will no longer apply typeerror/keyerror exceptions
 2016-11-30 14:21:54 -06:00
angelblue05
69e56acc81 Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop 2016-11-30 14:13:55 -06:00
angelblue05
71d3cb3c2d Adjust userclient exceptions 2016-11-30 14:13:52 -06:00
angelblue05
c1c0ad6d56 Quick adjust for emby backup 2016-11-30 14:08:19 -06:00
shaun
52752f4fc1 fix lang 2016-11-28 19:03:27 +11:00
sfaulds
ef4696ff2f if fast sync server plugin fails fall back to full sync and tell the user 2016-11-28 18:23:49 +11:00
angelblue05
a9aad8fabc Url encode strm files 2016-11-25 16:03:21 -06:00
shaun
615e541513 remove the internal_exception.ExceptionWrapper class 2016-11-22 23:05:16 +11:00
sfaulds
4aef5d7551 check LocalTrailerCount as a number 
dont log metrics for 400 errors as they are mostly server issues
 2016-11-21 11:51:00 +11:00
Adam Mills
989824a58a Ensure transcoding for hi10p videos when requested 2016-11-18 19:52:19 -05:00
shaun
62c284fdd7 add come verification to values passed into functions and returned from download calls 
dont log profile change exception
bump ver
 2016-11-19 10:08:36 +11:00
sfaulds
ec28018c61 consume read time oout errors 
wrap fix in try/except
 2016-11-18 13:42:46 +11:00
sfaulds
5d06f04d1d check url after replace to see if it look ok 2016-11-17 16:55:44 +11:00
sfaulds
5b86aa1ca9 add exception and notification when not logged in 2016-11-17 07:07:49 +11:00
sfaulds
aef40c4e8a use an exception class to surface exceptions that we dont want to log to the metrics logging system 2016-11-14 19:10:22 +11:00
sfaulds
23522ac75e add some checking arround starting a new thread, it looks like some systems are slow to release resources and need some time so give them that time. 2016-11-14 12:24:07 +11:00
sfaulds
631e6d5f13 fix typo 2016-11-14 11:09:30 +11:00
sfaulds
ea3676eec0 Surface download issue exceptions where appropriate instead of consuming them 2016-11-14 11:00:26 +11:00
shaun
1a8cbd7f99 check the client is not none before close 2016-11-13 14:47:06 +11:00
shaun
0cf8f07daf refactor the downloadutils a little 
move emby DB verify to the database class and run it for the first time an emby db con is created
refactor the play class playback started function a little
 2016-11-13 10:39:14 +11:00
shaun
7a9e29c9b7 turn testing off 2016-11-12 19:12:16 +11:00
shaun
5d35897a47 Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop 2016-11-12 11:45:36 +11:00
shaun
6b5b955d43 add full trace for file and line numbers 2016-11-12 11:45:24 +11:00
sfaulds
27f9985601 move the verify emby DB to the service entry 2016-11-11 14:44:48 +11:00
sfaulds
4575191093 add LocationTypes to API call 2016-11-11 13:33:06 +11:00
angelblue05
9cd28f94ab Revert offline fix 
Apparently offline is being returned regardless, so something else must
be causing the kodi database being wiped. Probably the server is sending
remove event?
 2016-11-10 15:16:51 -06:00
angelblue05
237ee0d810 Fix virtual episodes and return offline 2016-11-10 14:36:07 -06:00
sfaulds
5cc3847e47 looks like platform is throwing an exception on some systems so catch it 2016-11-10 16:09:23 +11:00
angelblue05
294ed1d995 Try to have offline items returned 
To prevent Kodi database from being wiped if server marks content as
offline.
 2016-11-09 19:15:20 -06:00
sfaulds
26a4d07246 only set progress if we could get the position 2016-11-10 11:49:38 +11:00
sfaulds
774700bdc8 add OS and Python version logging 2016-11-09 10:16:28 +11:00
angelblue05
a8452d2e81 Fix typo 2016-11-08 08:14:39 -06:00
angelblue05
54f0f37d7e Fix typo 2016-11-08 07:10:21 -06:00
angelblue05
6d0b2b96bc Change DatabaseConn to return the cursor instead 2016-11-07 17:32:40 -06:00
angelblue05
fed57ef56b remove unused import 2016-11-07 08:36:32 -06:00
angelblue05
caead29793 Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop 2016-11-07 08:35:42 -06:00
angelblue05
776f5c2560 Fix typo 2016-11-07 08:35:38 -06:00
shaun
61d8a66df6 re throw all DB errors 2016-11-07 22:27:25 +11:00
angelblue05
8704be627d Remove old method 2016-11-06 14:50:37 -06:00
angelblue05
aab9750b40 Move method to embydb 
to avoid opening a new db conn
 2016-11-06 14:49:37 -06:00
angelblue05
83f88eef33 Don't call private function. Use public video_database to get the path. 2016-11-06 10:37:03 -06:00
shaun
904860031d add conn id to log 
use import database and full name space to access DatabaseCon class
 2016-11-06 20:34:27 +11:00
shaun
cb224ce4a7 use actual module name 2016-11-06 10:40:11 +11:00
shaun
e689b29e18 remove logging, only log in TEST mode which needs to be turned on with a code change. 2016-11-06 10:38:33 +11:00
angelblue05
48405f6215 Fix bug 2016-11-05 17:36:52 -05:00
angelblue05
5b6a53f58b Update views.py 2016-11-05 16:39:01 -05:00
angelblue05
82c31e0672 Don't import DatabaseConn initialized 
This creates import loops. It's always better to initialize them within
the class' __init__
 2016-11-05 16:15:07 -05:00
angelblue05
16df4d6404 New views.py 
Combines maintainsViews from librarysync and videonodes and playlist
creation. Still need to move deletion from utils.
 2016-11-05 13:36:46 -05:00
angelblue05
1d8d01b5f8 Update boxset title 2016-11-05 05:53:24 -05:00
angelblue05
3e1edb9a66 Fix some studios conversion 2016-11-05 04:57:03 -05:00
shaun
c0be7300e4 Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop 2016-11-05 20:44:39 +11:00
shaun
8bd44bd408 only do DB Connection if needed for each action 2016-11-05 20:44:12 +11:00
angelblue05
c211a26a35 Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop 2016-11-05 02:17:02 -05:00
angelblue05
8b41046a61 Prep for views 2016-11-05 02:16:59 -05:00
shaun
b55b4d0b96 remove old kodiSQL function 
use DatabaseCon for DB file paths
switch last few DB Cons to use the new DatabaseCon context class
 2016-11-05 14:18:39 +11:00
shaun
881b3f8e70 use new DatabaseCon context class 2016-11-05 13:19:57 +11:00
shaun
a58b644062 use the new DatabaseCon context class 
use closing with for cursor
 2016-11-05 11:51:17 +11:00
shaun
b3214a9250 use new DatabaseCon context object for play websocket play actions 2016-11-05 11:31:40 +11:00
shaun
d3ce04ab10 move DB reset function to the databse file 
use the new DB connection context for all DB reset actions
 2016-11-05 11:15:28 +11:00
shaun
4701041d99 use the new context Db connection class 
use closing helper to auto close cousor when it goes out of context
 2016-11-05 10:20:09 +11:00
shaun
a763cd37c9 use with to close cursor 
use settings for isolation in connect
dont re raise the exception in the __exit__
 2016-11-05 09:19:28 +11:00
angelblue05
9783b5aec2 Update database.py 2016-11-04 12:13:07 -05:00
angelblue05
012b83f48b Fix typo 2016-11-04 12:12:27 -05:00
angelblue05
e9fb760fa3 Only rollback for database locked 
raise error for everything else, we should put in place a file that will
keep itemids we had to rollback on. To review later.
 2016-11-04 06:45:39 -05:00
angelblue05
ee80e2c763 Only commit db when changes 2016-11-04 06:39:49 -05:00
delphiactual
83ab855999 Nest emby video nodes logically (#55) 
* Nest emby video nodes logically

* Node cleanup
 2016-11-04 05:14:35 -05:00
angelblue05
4f7c63d5df Raise errors other than database is locked 
Remove old code
 2016-11-04 05:03:44 -05:00
angelblue05
7ec6574ade Rename objects functions 
To stop using super()
 2016-11-04 02:21:17 -05:00
angelblue05
e06f138d5d Update database.py 2016-11-04 01:28:02 -05:00
angelblue05
11af93ccc2 Update database commit 2016-11-03 23:45:37 -05:00
angelblue05
d0ea742904 Update database prep 2016-11-03 20:38:01 -05:00
angelblue05
df5d309dc5 Database prep 2016-11-03 20:36:05 -05:00
sfaulds
464b1d4c79 Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop 2016-11-03 16:46:50 +11:00
sfaulds
aa99b1a3c3 switch to use hashlib 2016-11-03 16:46:22 +11:00
angelblue05
fd3c21d6c8 Fix typo screensaver 2016-11-02 21:24:58 -05:00
angelblue05
7f2eb13f9a Merge remote-tracking branch 'origin/develop' into develop 2016-11-02 21:24:47 -05:00
angelblue05
80a554a91b Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2016-11-02 21:19:30 -05:00
sfaulds
e34734931d add wrapper fun for logging errors 2016-11-02 15:11:04 +11:00
sfaulds
ca6d90969d metric loggin throttling 2016-11-02 09:26:23 +11:00
shaun
1554a52bf7 throttling is once every 5 min for an error 2016-11-02 07:08:33 +11:00
shaun
d7728afea0 add throttling to error metric logging 
add back in consumption of exception in function wrapper
 2016-11-01 20:48:24 +11:00
angelblue05
817ad63007 Update French translation 2016-11-01 03:38:43 -05:00
shaun
523a653ba5 remove redundant frunction wrapper 2016-11-01 11:23:34 +11:00
shaun
066ec81e16 re thorw exception in wrapper 2016-11-01 10:54:38 +11:00
angelblue05
ea4059b6d0 Hotfix (#72) 
* Fix external subtitles

* Fix index error

* Fix credentials encoding

* Fix music var reference
 2016-10-31 06:30:09 -05:00
angelblue05
85d054f33a Hotfix (#71) 
* Fix typos

* Indicate unicode dict

* Fix artistid

* Attempt to fix encoding
 2016-10-29 03:15:16 -05:00
angelblue05
ba22e26c06 2.3.0 (#70) 2016-10-28 00:02:47 -05:00
im85288
d582888ffb update video db version for krypton 2016-08-06 16:20:15 +01:00
marcelveldt
01800c0c3b fix for krypton compatability 2016-08-06 15:43:04 +02:00
xnappo
133773d5b6 Krypton prep 2016-07-31 12:15:38 -05:00
angelblue05
dc15d4d832 2.2.19 (#52) 
Fix typo in logging
 2016-07-29 04:12:30 -05:00
angelblue05
541afbb989 2.2.18 (#51) 
Fix logging error (#51)
 2016-07-25 17:36:43 -05:00
angelblue05
e197208d3e 2.2.17 (#50) 
* Add temporary setting to disable external subs for direct stream
* Fix crash when sleeping/waking up device
* Use the logging module. Moved logging to it's own file.
* Version bump 2.2.17
* Update README.md
 2016-07-24 22:39:40 -05:00
angelblue05
f89d5c96f6 Transform database locked into a settings 
Temporary settings, because it slows down the process since it's
auto-committing. Not everyone has database locked crashes. Permanent fix
is being worked on in the database branch.
 2016-07-19 02:08:35 -05:00
angelblue05
d5baf0ceed Fix typo 2016-07-18 17:56:39 -05:00
angelblue05
cfb94b7bd0 Temp fix for database being locked 2016-07-18 15:47:42 -05:00
angelblue05
02ab4abe51 Fix not saving watched status 
If delete after watched was enabled.
 2016-07-18 14:42:33 -05:00
angelblue05
77b99210c1 Add error mode to logging 2016-07-17 18:27:54 -05:00
angelblue05
da7685b03f Try to fix import strptime bug 
Clean up of downloadutils and utils.
 2016-07-16 10:02:50 -05:00
angelblue05
06d71cf00d Fix typo 2016-07-15 19:17:32 -05:00
angelblue05
8b83ae8a00 Clean up downloadUtils 2016-07-15 19:02:30 -05:00
angelblue05
213f42f4a5 Update downloadUtils requests 
Code reduction,  fix connections not being released.
 2016-07-15 18:01:59 -05:00
angelblue05
15ac7fd0ca Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2016-07-04 14:22:24 -05:00