Yuriy Puchkov
|
2bc84e91f3
|
Merge branch 'master_nc' into merge-upstream-0.8.3
# Conflicts:
# .github/workflows/Linux-pack.yml
# CMakeLists.txt
|
2020-10-02 14:24:05 +03:00 |
|
Yurii Puchkov
|
46fa3de069
|
Merge pull request #46 from namecheap/merge-upstream-with-cicd-fix
Merge upstream with cicd fix
|
2020-10-02 03:56:10 -07:00 |
|
Yuriy Puchkov
|
01da6acf56
|
Fix - github CI/CD, SSL for Windows
|
2020-10-02 13:37:11 +03:00 |
|
Yuriy Puchkov
|
8e92ea5ab4
|
Merge 0.8.3 upstream
|
2020-10-02 10:15:56 +03:00 |
|
Alex Pantechovskis
|
55bed077ca
|
Remove outdated translation table and link the instruction repo
|
2020-10-01 18:56:52 -05:00 |
|
Salvador Recuero
|
f00f994c2d
|
Fix misspelling
"Flmaeshot".
|
2020-10-01 18:55:31 -05:00 |
|
Yuriy Puchkov
|
51a9beeedd
|
Fix - github CI/CD, SSL for Windows
|
2020-10-01 23:06:48 +03:00 |
|
heis2201
|
675df1aea4
|
Added/Updated German translation
Added/Updated German translation
|
2020-10-01 07:42:04 -05:00 |
|
Mehrad Mahmoudian
|
4f2f6bbe9e
|
Reordered the pre-built repositories orders
Having the operating systems together.
|
2020-10-01 07:41:35 -05:00 |
|
Mehrad Mahmoudian
|
1034fcff3a
|
Removed the OpenSUSE comminuty repo information
|
2020-10-01 07:41:35 -05:00 |
|
Tiago Rinaldi
|
ead84c502c
|
Update CONTRIBUTING.md
Add pt_BR translation credits
|
2020-10-01 07:41:13 -05:00 |
|
Alex P
|
abdeee9a16
|
open imgur upload in screen center
|
2020-09-30 19:27:49 -05:00 |
|
Ahmed Zetao Yang
|
60c290c540
|
feat: update windows rc file
|
2020-09-30 10:58:48 -05:00 |
|
Ahmed Zetao Yang
|
4ab28d960c
|
chore: use flameshot icon as tray notification icon
* this need Qt >= 5.9, see https://doc.qt.io/qt-5.9/qsystemtrayicon.html#showMessage-1
|
2020-09-30 10:58:48 -05:00 |
|
Jeremy Borgman
|
5292b894f2
|
Moved style override to after app creation
|
2020-09-30 10:58:33 -05:00 |
|
Mehrad Mahmoudian
|
35e709c80c
|
added some brief information about systray
|
2020-09-30 09:37:56 -05:00 |
|
Yuriy Puchkov
|
24c55279d6
|
README for S3 storage
|
2020-09-29 15:31:04 +03:00 |
|
Jeremy Borgman
|
ecfaa2359b
|
Fixed readme
|
2020-09-28 19:33:36 -05:00 |
|
Martin-Eckleben
|
d349cb5f9d
|
black and white plus and minus icons
|
2020-09-28 19:02:19 -05:00 |
|
Tiago Rinaldi
|
938bf8815d
|
Add Brazilian portuguese translation
|
2020-09-28 19:01:15 -05:00 |
|
Jeremy Borgman
|
ceb51a90bd
|
Added releasing info for 0.8.3
|
2020-09-28 09:24:35 -05:00 |
|
Jeremy Borgman
|
931ac154e7
|
Fixed issue with ctrl s not saving text
|
2020-09-28 08:53:12 -05:00 |
|
hexyoungs
|
ca57215172
|
refactor: remove duplicated code in PR#982
|
2020-09-28 08:52:33 -05:00 |
|
hexyoungs
|
37fa206df2
|
fix: #994
fix wrong icon color caused by wrong mainColor
|
2020-09-28 08:52:33 -05:00 |
|
hexyoungs
|
01bc618dcc
|
refactor: ColorUtils::colorIsDark
make it more clear
|
2020-09-28 08:52:33 -05:00 |
|
hexyoungs
|
f2101a3296
|
fix: #994
|
2020-09-28 08:52:33 -05:00 |
|
33kk
|
8a962c25a1
|
Fix side panel button color
|
2020-09-28 08:51:22 -05:00 |
|
Yuriy Puchkov
|
e0523acafe
|
S3 storage - amazon server side (no full documentation yet)
|
2020-09-28 16:20:05 +03:00 |
|
Yuriy Puchkov
|
05cbd9660f
|
Remove old CI code
|
2020-09-28 16:07:04 +03:00 |
|
Yuriy Puchkov
|
fc86f473cd
|
Update Ukrainian and Russian translations
|
2020-09-28 15:18:52 +03:00 |
|
Yuriy Puchkov
|
9f26384003
|
Set default storage based on config.ini file (s3 if creds exist otherwise imgur)
|
2020-09-28 11:04:58 +03:00 |
|
Jeremy Borgman
|
991da44968
|
Fixed snap on ubuntu 20.04 (needed unity7) -S
|
2020-09-27 18:57:45 -05:00 |
|
pafri
|
9df7c45d62
|
Update Internationalization_cs.ts
|
2020-09-27 10:14:36 -05:00 |
|
Jeremy Borgman
|
3d266834f7
|
Increased delay by 20% per feedback
|
2020-09-26 20:16:04 -05:00 |
|
Jeremy Borgman
|
8aa137b35c
|
lowered hover delay to 0.5 s
|
2020-09-26 20:16:04 -05:00 |
|
Ahmed Zetao Yang
|
11ceeaca89
|
chore(CI): provide artifacts for linux and windows
|
2020-09-25 20:11:01 -05:00 |
|
Yuriy Puchkov
|
819c365f85
|
Move storage upload configuration to separate tab, later it can be uses for a plugin manager
|
2020-09-25 18:32:21 +03:00 |
|
Jeremy Borgman
|
f5d581c89f
|
bolded font in circle
|
2020-09-25 08:36:25 -05:00 |
|
hexyoungs
|
ac038474ce
|
feat: using luminance to determine text color
of circlecounttool
|
2020-09-25 08:14:00 -05:00 |
|
Yuriy Puchkov
|
d0c8cea61f
|
Move storage upload configuration to separate tab, later it can be uses for a plugin manager
|
2020-09-25 15:08:14 +03:00 |
|
Yuriy Puchkov
|
34bfe5a6c0
|
Code refactoring - remove configenterprise for s3
|
2020-09-25 10:50:46 +03:00 |
|
Yuriy Puchkov
|
9826558063
|
Fix issue of merge upstream repo to Namecheap one
|
2020-09-25 08:59:15 +03:00 |
|
Peter Cai
|
e1214e23e5
|
correct position of QScreen geometry on HiDPI multi-headed setup
|
2020-09-24 18:17:43 -05:00 |
|
Yuriy Puchkov
|
d4d3b9eae0
|
Merge branch 'master-flameshotorg' into master_nc_merge_upstream
# Conflicts:
# .travis.yml
# appveyor.yml
# data/graphics.qrc
# data/img/app/keyboard.svg
# data/img/material/black/delete.png
# data/img/material/black/delete.svg
# data/img/material/black/filepath.svg
# data/img/material/black/shortcut.svg
# data/img/material/white/filepath.svg
# data/img/material/white/shortcut.svg
# data/translations/Internationalization_hu.ts
# data/translations/Internationalization_ka.ts
# external/Qt-Color-Widgets/src/color_wheel.cpp
# external/singleapplication/singleapplication.cpp
# flameshot.pro
# src/cli/commandlineparser.cpp
# src/config/buttonlistview.cpp
# src/config/configwindow.cpp
# src/config/configwindow.h
# src/config/geneneralconf.cpp
# src/config/geneneralconf.h
# src/config/uicoloreditor.cpp
# src/config/uicoloreditor.h
# src/core/controller.cpp
# src/core/globalshortcutfilter.cpp
# src/main.cpp
# src/third-party/Qt-Color-Widgets/src/color_utils.cpp
# src/tools/abstractactiontool.h
# src/tools/abstractpathtool.h
# src/tools/arrow/arrowtool.cpp
# src/tools/arrow/arrowtool.h
# src/tools/blur/blurtool.cpp
# src/tools/capturetool.h
# src/tools/circle/circletool.cpp
# src/tools/circle/circletool.h
# src/tools/copy/copytool.cpp
# src/tools/copy/copytool.h
# src/tools/exit/exittool.cpp
# src/tools/exit/exittool.h
# src/tools/imgur/imguruploader.cpp
# src/tools/launcher/applaunchertool.cpp
# src/tools/launcher/applaunchertool.h
# src/tools/launcher/applauncherwidget.cpp
# src/tools/launcher/openwithprogram.cpp
# src/tools/line/linetool.cpp
# src/tools/line/linetool.h
# src/tools/marker/markertool.cpp
# src/tools/marker/markertool.h
# src/tools/move/movetool.cpp
# src/tools/pencil/penciltool.cpp
# src/tools/pencil/penciltool.h
# src/tools/pin/pintool.cpp
# src/tools/pin/pintool.h
# src/tools/pin/pinwidget.cpp
# src/tools/pixelate/pixelatetool.h
# src/tools/rectangle/rectangletool.cpp
# src/tools/rectangle/rectangletool.h
# src/tools/redo/redotool.cpp
# src/tools/redo/redotool.h
# src/tools/save/savetool.cpp
# src/tools/save/savetool.h
# src/tools/selection/selectiontool.cpp
# src/tools/selection/selectiontool.h
# src/tools/sizeindicator/sizeindicatortool.cpp
# src/tools/sizeindicator/sizeindicatortool.h
# src/tools/storage/imgur/imguruploader.h
# src/tools/storage/imgur/imguruploadertool.cpp
# src/tools/storage/imgur/imguruploadertool.h
# src/tools/text/textconfig.cpp
# src/tools/text/texttool.cpp
# src/tools/text/texttool.h
# src/tools/toolfactory.cpp
# src/tools/toolfactory.h
# src/tools/undo/undotool.cpp
# src/tools/undo/undotool.h
# src/utils/confighandler.cpp
# src/utils/confighandler.h
# src/utils/dbusutils.cpp
# src/utils/screenshotsaver.cpp
# src/utils/screenshotsaver.h
# src/widgets/capture/buttonhandler.cpp
# src/widgets/capture/buttonhandler.h
# src/widgets/capture/capturebutton.cpp
# src/widgets/capture/capturebutton.h
# src/widgets/capture/capturewidget.cpp
# src/widgets/capture/capturewidget.h
# src/widgets/capture/colorpicker.cpp
# src/widgets/capturelauncher.cpp
# src/widgets/infowindow.cpp
# src/widgets/infowindow.h
# src/widgets/panel/sidepanelwidget.cpp
# src/widgets/panel/utilitypanel.cpp
# src/widgets/panel/utilitypanel.h
# translations/Internationalization_ca.ts
# translations/Internationalization_de_DE.ts
# translations/Internationalization_es.ts
# translations/Internationalization_fr.ts
# translations/Internationalization_ja.ts
# translations/Internationalization_nl.ts
# translations/Internationalization_pl.ts
# translations/Internationalization_pt_br.ts
# translations/Internationalization_ru.ts
# translations/Internationalization_sk.ts
# translations/Internationalization_sr.ts
# translations/Internationalization_tr.ts
# translations/Internationalization_uk.ts
# translations/Internationalization_zh_CN.ts
# translations/Internationalization_zh_TW.ts
|
2020-09-24 18:52:49 +03:00 |
|
Jeremy Borgman
|
e298d56f32
|
Updated per feedback
|
2020-09-24 10:26:55 -05:00 |
|
Jeremy Borgman
|
86cf5819a3
|
added releasing checklist
|
2020-09-24 10:26:55 -05:00 |
|
Ahmed Zetao Yang
|
dfcc9cb96b
|
chore(CI): use Qt 5.15.1 env
|
2020-09-24 07:53:57 -05:00 |
|
Ahmed Zetao Yang
|
71817a1729
|
chore(CI): use VERSION info in the yaml files based on the current git tag
|
2020-09-24 07:53:57 -05:00 |
|
Jeremy Borgman
|
0d5386edd4
|
Changed clang format to new agreement
|
2020-09-24 07:53:28 -05:00 |
|
Jose Riha
|
2cbccc3d0a
|
Update Slovak translation (#971)
|
2020-09-24 07:52:59 -05:00 |
|