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 |
|
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 |
|
Yuriy Puchkov
|
01da6acf56
|
Fix - github CI/CD, SSL for Windows
|
2020-10-02 13:37:11 +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
|
71817a1729
|
chore(CI): use VERSION info in the yaml files based on the current git tag
|
2020-09-24 07:53:57 -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
|
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 |
|