Commit Graph

1588 Commits

Author SHA1 Message Date
Frank Dana
195bc207c1 Merge branch 'develop' into ferdnyc-patch-1 2020-03-27 16:50:52 -04:00
FeRD (Frank Dana)
43c689236c Merge remote-tracking branch 'upstream/develop' into origin-develop 2020-03-14 01:57:47 -04:00
Frank Dana
816118b6f6 CMake: Use GNUInstallDirs for install paths (#457) 2020-03-12 09:35:00 -04:00
Frank Dana
e19291a362 Travis: Drop extra FFmpeg 3.4 GCC job (#463) 2020-03-12 09:32:26 -04:00
Jonathan Thomas
629517fe4a Merge pull request #459 from OpenShot/timeline-reader-improvements
Adding ability for a Clip to auto-detect and instantiate a Timeline Reader
2020-03-11 15:04:39 -05:00
Frank Dana
4058dde300 ReaderBase_Tests: 100% internal coverage (#462) 2020-03-10 23:56:27 -04:00
Jonathan Thomas
bf55eec233 Merge pull request #460 from OpenShot/stale-bot
Adding stale bot for github issue management (libopenshot)
2020-03-10 20:32:33 -05:00
Jonathan Thomas
a21e3283c1 Updating auto-stale conditions (90 days warning, 10 days to respond, only issues, ignore assigned issues) 2020-03-10 17:46:49 -05:00
Jonathan Thomas
4ea362380a Adding support for proper absolute/canonical path detection and replacement 2020-03-10 17:35:21 -05:00
Jonathan Thomas
de42a90f5a Adding stale bot for github issue management 2020-03-09 18:22:41 -05:00
Jonathan Thomas
8b3167a99a Adding ability for a Clip to auto-detect and instantiate a Timeline Reader from the *.osp file type. Added new Timeline constructor, to auto load UTF-8 JSON file, and regex convert all paths to absolute. Fixed a dead lock issue when a Timeline loads another Timeline. 2020-03-09 16:49:06 -05:00
Jonathan Thomas
f1e5c9c8a2 Merge pull request #454 from OpenShot/merge-master-to-develop1
Merge master into develop (and bump version to -dev2)
2020-03-03 03:00:23 -06:00
Jonathan Thomas
efe0728f2f Bump version to -dev2 (merge master back to develop) 2020-03-03 02:34:57 -06:00
Jonathan Thomas
4d7b389103 Merge branch 'master' into merge-master-to-develop1 2020-03-03 02:34:03 -06:00
Jonathan Thomas
d0e884df78 Merge pull request #452 from OpenShot/release-20200229
Release branch for libopenshot 0.2.5 (SO 19)
v0.2.5
2020-03-03 02:00:06 -06:00
Jonathan Thomas
1ced9d49f9 Merge branch 'release-20200229' of github.com:OpenShot/libopenshot into release-20200229 2020-03-02 23:50:28 -06:00
Jonathan Thomas
4d7b4072c3 Fixing abs -> fabs regression. Not sure how this worked before. 2020-03-02 23:50:10 -06:00
Frank Dana
7fbd44a0fa ColorShift: Use one-word name in EffectInfo (#453) 2020-03-02 23:14:20 -05:00
FeRD (Frank Dana)
0910f22359 Merge branch 'colorshift-name-sync' into release-20200229 2020-03-02 22:50:04 -05:00
FeRD (Frank Dana)
325c73abd7 ColorShift: Use one-word name in EffectInfo 2020-03-02 22:47:05 -05:00
Frank Dana
b724f2ef07 Merge pull request #400 from ferdnyc/add-features
CMake: Add Features for docs, unit tests
2020-03-01 20:38:30 -05:00
Frank Dana
600e8844ee Merge branch 'develop' into add-features 2020-03-01 19:50:52 -05:00
Jonathan Thomas
c7fe363f2b Fix ColorShift classname in EffectInfo::CreateEffect 2020-02-29 19:21:43 -06:00
Jonathan Thomas
8d78242571 Release branch for 0.2.5 (SO 19) 2020-02-29 17:30:36 -06:00
Jonathan Thomas
8b78ddf945 Merge pull request #451 from OpenShot/bump-version
Bump version to 0.2.5-dev1 (and libopenshot-audio dependency to 0.2.0)
2020-02-29 16:35:20 -06:00