Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update latest from dev #1

Merged
merged 82 commits into from
Oct 4, 2018
Merged
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
553fb7e
Bump to 2.4.2
jonoomph Jun 30, 2018
aecaf4a
Merge pull request #1755 from OpenShot/feature/bump-version
jonoomph Jun 30, 2018
0d4f66f
Remove inefficient clear canvas code
DylanC Aug 14, 2018
6426a92
Remove duplicated line of code
DylanC Aug 14, 2018
6d6b01f
Fix the waveform not being drawn after completion
DylanC Aug 14, 2018
fc1df5b
ClosePath and remove duplicate beginPath for performance
DylanC Aug 14, 2018
a4cbba2
Merge pull request #1995 from DylanC/audio_wave
DylanC Aug 17, 2018
fa9e669
Improve audio rendering
DerGenaue Aug 24, 2018
407a111
Merge pull request #2029 from DerGenaue/patch-1
DylanC Aug 26, 2018
d600d16
Fix secondsToZoom to work correctly for exact matches
DerGenaue Aug 28, 2018
9be860c
Improve Title duplication counting
DerGenaue Aug 28, 2018
962978a
Merge pull request #2040 from DerGenaue/patch-1
DylanC Aug 30, 2018
f4edef2
Merge branch 'develop' into patch-2
DylanC Aug 30, 2018
4719578
Merge pull request #2042 from DerGenaue/patch-2
DylanC Aug 31, 2018
05a2350
Square icon
ferdnyc Sep 4, 2018
da52a77
Tag screenshots with pixel dimensions
ferdnyc Sep 4, 2018
ab9a1b9
Addditional contact URLs
ferdnyc Sep 4, 2018
a005ab7
Update license and name
ferdnyc Sep 4, 2018
49624e3
Flesh out description/summary
ferdnyc Sep 4, 2018
dbd0fe6
Typo in summary tag
ferdnyc Sep 4, 2018
566881e
Merge pull request #2060 from ferdnyc/square-icon
DylanC Sep 4, 2018
e683eff
Merge branch 'develop' into appdata-edits
DylanC Sep 4, 2018
4764b1a
Merge pull request #2059 from ferdnyc/appdata-edits
DylanC Sep 4, 2018
440b13e
More framerates for Youtube-HD preset
ferdnyc Sep 7, 2018
aaf020f
More framerates for Vimeo-HD preset
ferdnyc Sep 7, 2018
c018967
Optimize icon svg file
ferdnyc Sep 11, 2018
e930538
Add 256x256 PNG icon to xdg/ dir
ferdnyc Sep 11, 2018
b75d29b
Add 512x512 pixel icon
ferdnyc Sep 11, 2018
51621c5
Move PNG icons to `xdg/icon/` subtree
ferdnyc Sep 11, 2018
f090dc3
Install icons to freedesktop paths from setup.py
ferdnyc Sep 11, 2018
1899bd0
Travis CI Integration, Zoom fixes, and undo/redo fixes (#2084)
jonoomph Sep 11, 2018
d8e888b
Merge branch 'develop' into youtube-framerate
DylanC Sep 12, 2018
fa11ca9
Merge branch 'develop' into icon-install
DylanC Sep 12, 2018
861c63f
Merge pull request #2073 from ferdnyc/youtube-framerate
DylanC Sep 12, 2018
8bc1f40
Merge branch 'develop' into icon-install
DylanC Sep 12, 2018
85b433b
Merge pull request #2083 from ferdnyc/icon-install
DylanC Sep 12, 2018
0ed917d
scripts: Add shebangs and make executable
ferdnyc Sep 12, 2018
b982593
Drop src/locale/README file as outdated
ferdnyc Sep 12, 2018
c4eb48d
Move OpenShot.pot to language dir
ferdnyc Sep 12, 2018
d02fea0
Move translation scripts to src/language/
ferdnyc Sep 12, 2018
b96a431
Update generate_translations for new path
ferdnyc Sep 12, 2018
c9a36e3
Update test_translations, add show_translations
ferdnyc Sep 12, 2018
b2527ce
Remove locale dir
ferdnyc Sep 12, 2018
6d65172
Remove locale dir from build-mac-dmg.sh
ferdnyc Sep 12, 2018
17c42fe
Copy QT translations to language/ in freeze.py
ferdnyc Sep 12, 2018
058ace6
update AUTHORS reference to translations path
ferdnyc Sep 12, 2018
a6d69d5
Update packaged QT translation file path
ferdnyc Sep 12, 2018
fb5afb5
Also package qtbase_*.qm translation files
ferdnyc Sep 12, 2018
a3c5b97
locale => translation, in a comment
ferdnyc Sep 12, 2018
073ac20
Stupid typo
ferdnyc Sep 12, 2018
515d088
Stupider typo
ferdnyc Sep 12, 2018
02b8f6a
show_translations.py fixes
ferdnyc Sep 12, 2018
1502082
Updating name of experimental setting for multiple thread safety. Als…
jonoomph Sep 15, 2018
a11b872
Bumping version to 2.4.3 (libopenshot dependency to 0.2.1)
jonoomph Sep 15, 2018
2f0c8d1
Preventing libopenshot check on unittests
jonoomph Sep 16, 2018
b297484
Merge pull request #2103 from ferdnyc/no-locale
DylanC Sep 16, 2018
4f8f558
Fixed split keep both sides (right side position was incorrect)
jonoomph Sep 16, 2018
2faf7d8
Updating default project type to 720p 30 FPS, and sample rate 44100
jonoomph Sep 17, 2018
2033873
Disable OMP thread concurrency during Export, to make exports as safe…
jonoomph Sep 17, 2018
6b7b56a
Add "release-candidate" to filename for daily RC builds, so they don'…
jonoomph Sep 17, 2018
3cc472f
Reverting a change from @DylanC (from commit 6a09742eb67d80eab6d212a2…
jonoomph Sep 17, 2018
cace754
Updating translations
jonoomph Sep 17, 2018
4b4172d
Updating contributors and supporters (Thank You!)
jonoomph Sep 17, 2018
06db243
Merge branch 'develop' into release, and update language translations…
jonoomph Sep 19, 2018
544de45
Adding translation POT file and generated resource file (openshot_lan…
jonoomph Sep 19, 2018
946dc0d
Bumping libopenshot dependency version to 0.2.2 (to include a fix for…
jonoomph Sep 22, 2018
90fdc53
Merge branch 'master' into release
jonoomph Sep 22, 2018
b90557d
Merge pull request #2134 from OpenShot/release
jonoomph Sep 22, 2018
f2fac8c
Merge pull request #2135 from OpenShot/master
jonoomph Sep 22, 2018
8b79f7f
Simplify version number and file name logic in build server (especial…
jonoomph Sep 22, 2018
d0a09f2
Bumping version to 2.4.3-dev1 (for development reasons)
jonoomph Sep 22, 2018
cc6e998
Merge pull request #2136 from OpenShot/simplify-buildserver-version
jonoomph Sep 22, 2018
42ed592
appdata: v2.4.3
eszlari Sep 23, 2018
f2c369f
Merge pull request #2138 from eszlari/patch-1
DylanC Sep 23, 2018
a81486d
Common log format for param changes
ferdnyc Sep 27, 2018
d58fbf1
Label logged values with context
ferdnyc Sep 27, 2018
0d6c060
Log arg to onBlenderVersionError
ferdnyc Sep 27, 2018
7d610bb
Only log if image is detected
ferdnyc Sep 27, 2018
78899aa
Don't import QWebView, never used
ferdnyc Sep 30, 2018
973d647
Merge pull request #2171 from ferdnyc/title-editor-nowebkit
DylanC Sep 30, 2018
1eca866
Merge branch 'develop' into blender-logs
ferdnyc Oct 1, 2018
3c51e7c
Merge pull request #2159 from ferdnyc/blender-logs
DylanC Oct 2, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bumping version to 2.4.3 (libopenshot dependency to 0.2.1)
  • Loading branch information
jonoomph committed Sep 15, 2018
commit a11b872a730978e014d14bab076b0d779b870152
4 changes: 2 additions & 2 deletions src/classes/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

from PyQt5.QtCore import QDir

VERSION = "2.4.2-dev1"
MINIMUM_LIBOPENSHOT_VERSION = "0.2.0"
VERSION = "2.4.3"
MINIMUM_LIBOPENSHOT_VERSION = "0.2.1"
DATE = "20180630000000"
NAME = "openshot-qt"
PRODUCT_NAME = "OpenShot Video Editor"
Expand Down