benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,212 Commits 1 Branch 0 Tags
da8f2840e68f326db2bc84e12f66b30faa2d6fc9
Commit Graph

40 Commits

Author SHA1 Message Date
Yuriy Puchkov
45f8752188 fix after mergin - CMakeLists.txt for MacOS 2021-02-17 18:46:12 +02:00
Jeremy Borgman
67952f06ab Moved SSL check to be windows specific 2021-02-16 10:10:21 -06:00
Jeremy Borgman
92b9379d69 Made changes after review of merge 2021-01-15 17:54:56 -06:00
Jeremy Borgman
73fe772b70 resolving merge conflicts 2021-01-08 10:19:53 -06:00
Jeremy Borgman
76ad9e5a6f first pass at adding logging framework 2021-01-05 17:01:12 -06:00
Yuriy Puchkov
162b864353 MacOS - Global shortcuts 2020-12-17 12:25:08 +02:00
Yuriy Puchkov
6ff18e74dd Get updates url from the current git remote 2020-12-14 08:39:09 +02:00
Yuriy Puchkov
ea11797d07 MacOS - add Application link to the package 2020-12-02 12:47:11 +02:00
Yurii Puchkov
bad270cce4 MacOS dmg package build (cmake only, no CI yet) 2020-11-27 02:00:12 -08:00
Ahmed Zetao Yang
65f28de250 fix: enforce utf-8 charset when building flameshot 2020-11-02 09:34:42 -06:00
Jeremy Borgman
8211b6aff0 updated qtsingleapplication to v3.1.5 2020-10-31 20:05:06 -05:00
Yuriy Puchkov
472d0dca29 Merge branch 'flameshot-org-master' into bugfix/RND-664-flameshot-update-history-widget-on-new-capture 2020-10-16 15:05:12 +03:00
Jeremy Borgman
2d4cd76e85 Updated CMAKE for new translation 2020-10-16 05:47:58 -05:00
Yuriy Puchkov
654455e9ac Merge branch 'flameshot-org-master' into merge-from-upstream 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	appveyor.yml
#	data/graphics.qrc
#	src/tools/imgur/imguruploader.cpp
 2020-10-15 15:44:49 +03:00
Jeremy Borgman
ce331924a4 organizing files 2020-10-14 11:08:12 -05:00
borgmanJeremy
f11073bc00 fixing icon regression (#1051) 
* fixing icon regression

* fixed symlink
 2020-10-12 08:40:35 -05:00
Yuriy Puchkov
c92f8e3014 Merge branch 'flameshot-org-master' into bugfix/memory-leak 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
 2020-10-11 20:49:15 +03:00
borgmanJeremy
8ff94a95a8 Cleaned up flatpak build for flathub submission (#1040) 
* Cleaned up flatpak build for flathub submission. Fixed app-id and other assets to match dbus naming.

* fixed missing updates

* fixing build issues
 2020-10-10 13:04:19 -05:00
Yuriy Puchkov
0a31d2d94d Merge branch 'flameshot-org-master' into feature/RND-656-flameshot-ability-to-lock-switching-between-s3-and-imgur-and-use-s3-only 
# Conflicts:
#	data/translations/Internationalization_eu.ts
 2020-10-06 16:13:45 +03:00
Porrumentzio
2bc3d82666 Updated Basque translation (#1027) 
* Added Basque translation

* Changed translation code from eu_ES to eu

* Updated Basque translation

* Modified CMakeLists.txt to fit the new Basque translation code
 2020-10-03 18:50:48 -05:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Yuriy Puchkov
51a9beeedd Fix - github CI/CD, SSL for Windows 2020-10-01 23:06:48 +03:00
Ahmed Zetao Yang
60c290c540 feat: update windows rc file 2020-09-30 10:58:48 -05:00
Alexander Kapshuna
23ae6c1579 Add zsh completion support 
Both bash and zsh completions could be supported using single file.
 2020-09-13 10:45:29 -05:00
Boyuan Yang
f18f186b46 Fix windows build badge and typos 
* Drop qmake build-dependency from CI, they should not be installed
  since we have switched to CMake.
* Update README.md badges to reflect recent Windows CI updates.
* Set doc badge to point to flameshot.org website.
* Fix a typo in src/CMakeLists.txt.
 2020-09-13 09:22:37 -05:00
Ahmed Zetao Yang
53a9d44c46 Windows packaging & merge two workflow yaml files (#898) 
* chore: add win setup assets & using CPack

* chore: add windows packaging & merge the previous cmake-windows.yml into build_cmake.yml
 2020-09-13 07:49:04 -05:00
Ahmed Zetao Yang
daf74afa8c fix: the language code should be underscore '_' not '-' 2020-09-11 23:42:19 +08:00
Ahmed Zetao Yang
f34d050e2b chore: update cmakelists.txt due to some translations changes 2020-09-11 23:17:33 +08:00
Jeremy Borgman
1662744a66 Merged various translation PRs and regenerated ts files 2020-09-09 19:23:04 -05:00
Ahmed Zetao Yang
961ce5f732 fix: add opensuse support & correct appstream metainfo xml 
- support opensuse leap >= 15.0
- correct appstream metainfo xml name & its content, see https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#sect-Quickstart-DesktopApps
 2020-09-08 11:13:27 -05:00
borgmanJeremy
ff6d4587e8 Cmake needs to install flameshot.appdata.xml (#857) 
* Cmake needs to install flameshot.appdata.xml

* fixing rpm
 2020-09-07 16:03:21 -05:00
Yangjin Cho
6f6c9219e9 Update CMakeLists.txt 2020-09-07 13:58:42 +09:00
RieL
c5de313624 Enable Korean translation 
1. Changed Qt Linguist language code from kr to ko
2. Enabled Korean translation by editing src/CMakeList.txt

It worked well on manjaro linux 18.0 with Korean translated.
 2020-09-07 12:52:38 +09:00
Jeremy Borgman
f34def6794 changed blur class name to pixelate to match implementation 2020-09-05 11:27:00 -05:00
Boyuan Yang
4541c79cdc Avoid hardcoded app version 
Use ${PROJECT_VERSION} from CMake to provide the project version
information instead of hardcoding.
 2020-09-04 21:04:51 -05:00
Boyuan Yang
a8fb73b668 Use ${CMAKE_INSTALL_PREFIX} to provide APP_PREFIX 
Currently the value of $prefix is hardcoded in the source code.
This is not a good choice given we have switched to CMake and
that CMake provides the builtin variable ${CMAKE_INSTALL_PREFIX}
to provide this information.

This patch uses the value of ${CMAKE_INSTALL_PREFIX} to populate
flameshot's internal variable APP_PREFIX as well as using it
in generating the org.flameshot.Flameshot.service file with
a proper $prefix value (via CMAKE_INSTALL_FULL_BINDIR as provided
by GNUInstallDirs).
 2020-09-04 20:43:35 -05:00
borgmanJeremy
c0e2e48db4 Fix CMake Package and DBUS Names (#819) 
* Fix CMake Packaging to properly package assets.
 2020-09-04 19:29:37 -05:00
Jeremy Borgman
286db9ff69 Fixed translations and added feedback from PR 2020-09-03 11:51:18 -05:00
Jeremy Borgman
3e226651db Added cmake install directions 2020-09-02 12:20:21 -05:00
Jeremy Borgman
f5013df306 First pass at converting from qmake to cmake. 2020-07-10 20:10:14 -05:00