borgmanJeremy
|
67a3fd99f0
|
working on analysis (#2015)
* working on analysis
* removing MSVC analysis since it is not working well with Qt MOC
|
2021-10-29 09:10:43 -05:00 |
|
Jeremy Borgman
|
acb9a08e2c
|
removed loop that occured when screenshot failed to save.
|
2021-02-25 10:33:03 -06:00 |
|
Jeremy Borgman
|
73fe772b70
|
resolving merge conflicts
|
2021-01-08 10:19:53 -06:00 |
|
Cranky Supertoon
|
bdaf110a09
|
add packaging stuff for macOS
|
2021-01-04 13:05:35 -06:00 |
|
Yuriy Puchkov
|
293525f5b6
|
Fix - MacOS capture area, full screen mode, system tray area, etc
|
2020-11-24 07:39:51 -08:00 |
|
Yuriy Puchkov
|
3c260add45
|
Update .gitignore
|
2020-10-27 17:17:39 +02: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
|
e5813d2230
|
Fixed memory leak and enabled sanatizers
|
2020-09-11 11:38:35 -05:00 |
|
Jeremy Borgman
|
cb50a282e8
|
Added flatpak support
|
2020-09-02 14:31:37 -05:00 |
|
Jeremy Borgman
|
f5013df306
|
First pass at converting from qmake to cmake.
|
2020-07-10 20:10:14 -05:00 |
|
Yuriy Puchkov
|
46a42b4526
|
Make S3 bucket configurable
|
2020-06-30 15:37:05 +03:00 |
|
Jeremy Borgman
|
9bb556acff
|
added circle counter and fixed issue with latest qt
|
2020-06-11 15:26:34 -05:00 |
|
Carlos Hernandez
|
38d08504eb
|
snapcraft files added (#120)
* Ignore snapcraft build files
* Ignroe flameshot tarball created by snapcraft
* Adding snapcraft files
* Clean snap build.
|
2018-03-20 14:38:54 +01:00 |
|
lupoDharkael
|
f6aaffe306
|
Add qm files to gitignore
|
2018-01-18 18:37:36 +01:00 |
|
Dharkael
|
79e10ef6d6
|
Initial commit
|
2017-05-10 21:44:51 +02:00 |
|