~sandipkishore/openshot:master

Last commit made on 2021-08-25
Get this branch:
git clone -b master https://git.launchpad.net/~sandipkishore/openshot
Only sandip can upload to this branch. If you are sandip please log in for upload directions.

Branch merges

Branch information

Name:
master
Repository:
lp:~sandipkishore/openshot

Recent commits

ee4e20c... by JacksonRG <email address hidden>

Merge pull request #4344 from OpenShot/release-20210819

Merge 2.6.0 Release Into Master

6e636e8... by Jonathan Thomas

Fixing a max length error on deploy/publish script with GitHub API, and adding better errors for GitHub specific issues.

377a8f4... by Jonathan Thomas

Adding check for empty $REQUEST_UUID on Mac builds

5a505d1... by Jonathan Thomas

Merge pull request #4335 from OpenShot/fix-reggresion-clip-move

Fix a regression in multi-drag for Clips/Transitions

5f19032... by Jonathan Thomas

Removing unneeded digest (i think), to prevent an Angular error when we have subsequent applyJsonDiff calls very close together (i.e. slice a clip)

39809ed... by Jonathan Thomas

Fix a regression from https://github.com/OpenShot/openshot-qt/pull/4230, which broke multi-select drag and drop for clips and transitions.

ed0e8c5... by Jonathan Thomas

Merge pull request #4333 from OpenShot/fixing-libopenshot-warning-message

Fixing libopenshot version warning message + Sentry.io fixes

114b5eb... by Jonathan Thomas

Merge branch 'fixing-libopenshot-warning-message' of github.com:OpenShot/openshot-qt into fixing-libopenshot-warning-message

 Conflicts:
 src/classes/json_data.py

fd7b7f5... by Jonathan Thomas

Fixing spelling error and changing Blender log to warning instead of error, since this is a perfectly valid outcome (with the wrong version of blender)

846362a... by Jonathan Thomas

Merge pull request #4334 from OpenShot/sentry_fixes

Sentry fixes