fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-01-03 15:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,101 Commits 1 Branch 0 Tags
73fe772b70646cbef59dc44eabc984e5ca0ebef1
Commit Graph

36 Commits

Author SHA1 Message Date
Jeremy Borgman
73fe772b70 resolving merge conflicts 2021-01-08 10:19:53 -06:00
Jeremy Borgman
c84b6df7d3 fixing clag format check 2021-01-05 17:01:12 -06:00
Yuriy Puchkov
f2bb47ac01 MacOS - remove 'src/' from 'src/flameshot' on starting from DMG 2020-12-15 13:48:33 +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
Jeremy Borgman
2bae14416e always trigger CI on PR 
(cherry picked from commit 3acd61fdec)
 2020-10-27 16:48:49 +02:00
Jeremy Borgman
3acd61fdec always trigger CI on PR 2020-10-25 21:25:10 -05:00
Jeremy Borgman
62466d6581 Preparing for upstream merge 2020-10-20 06:53:59 -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
Ahmed Zetao Yang
2f133cab32 chore(CI): using environment files to manage environment (#1073) 
* chore(CI): using environment files to manage environment

* using Environment Files, due to the `set-env` command is deprecated and will be disabled soon
* https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
* https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files

* docs: add flathub store badge
 2020-10-15 08:02:27 -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
Jeremy Borgman
cc34ede2c7 matching flatpak files to flathub repo 2020-10-13 21:48:59 -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
Ahmed Zetao Yang
c5b6fe3957 fix: checkout of head commit during PR creation 
* according to https://github.com/actions/checkout/issues/61#issuecomment-561363340
 2020-10-10 11:57:35 -05:00
Ahmed Zetao Yang
eae9c97b23 chore(CI): checkout the head commit instead of using the default merge ref 2020-10-10 08:16:39 -05:00
Jeremy Borgman
22ae116f29 testing app image fix 2020-10-08 20:09:56 -05:00
Yuriy Puchkov
8d32a50901 Ubuntu 18.04 build fix for 4 digits version 2020-10-02 14:29:57 +03: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
11ceeaca89 chore(CI): provide artifacts for linux and windows 2020-09-25 20:11:01 -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
borgmanJeremy
58b09bf259 bumped version for 0.8.1 patch release (#968) 
* bumped versio for 0.8.1 patch release

* Updated debian log and bumped windows version

* bumped CI version

* Applied patch by @hosiet
 2020-09-23 19:57:12 -05:00
Ahmed Zetao Yang
7edb10a218 fix: create a clean environment to build ubuntu-18.04 package 2020-09-23 11:57:29 -05:00
Ahmed Zetao Yang
def8ce21bb Enable deb packaging for ubuntu 18.04 (#959) 
* chore: update rpm packaging dependencies version

* chore: update debian dependencies version & changelog

* chore: enable deb packaging for ubuntu 18.04
 2020-09-23 08:02:51 -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
Jeremy Borgman
c997666b0f testing windows ci 2020-09-12 10:14:41 -05:00
Ahmed Zetao Yang
f9c036c9be chore: remove github actions artifact & make actions more elegant. 
- add hicolor-icon-theme(default fallback theme for FreeDesktop.org icon themes) for appimage
- remove github actions artifact
- fix some typos
 2020-09-09 07:32:18 -05:00
Ahmed Zetao Yang
fbdeccd065 feat: deb, rpm, appimage, flatpak, snap are all packed automatically 
- support opensuse leap 15.2
- add appimage packing, packed with new tool
- add flatpak packing
- add snap packing
 2020-09-08 11:13:27 -05:00
Ahmed Zetao Yang
308be25c51 feat: add deb & rpm packing 2020-09-07 10:06:03 -05:00
Jeremy Borgman
fb2f00ca73 added actions on PR 2020-09-04 20:48:47 -05:00
Jeremy Borgman
5dba3de778 Added ubuntu CI and fixed issue uncovered during CI. Also added clang-format 2020-09-04 20:40:45 -05:00