Commits · develop · World / OpenPaperwork / paperwork

05 May, 2021 5 commits
- Merge branch 'testing' into develop · 05de246b
  Jerome Flesch authored May 05, 2021
  
  05de246b
- Merge branch 'master' into testing · d230571e
  Jerome Flesch authored May 05, 2021
  
  d230571e
- Flatpak: Specify the branch of Paperwork's repository to use · 25fd4683
  Jerome Flesch authored May 05, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  25fd4683
- Merge branch 'fix-readme' into 'develop' · c8534332
  Jerome Flesch authored May 05, 2021
```
Readme: Fix "mixed content" warning

See merge request !834
```
  c8534332
- Readme: Fix "mixed content" warning · 4974429c
  David Auer authored May 05, 2021
  
  4974429c
04 May, 2021 8 commits
- Merge branch 'testing' into develop · 73d6b533
  Jerome Flesch authored May 04, 2021
  
  73d6b533
- Merge branch 'master' into testing · 99e9fadf
  Jerome Flesch authored May 04, 2021
  
  99e9fadf
- flatpak/Makefile: Fix 'make clean' · a26e66cb
  Jerome Flesch authored May 04, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  a26e66cb
- Merge branch 'testing' into develop · 136e97ed
  Jerome Flesch authored May 04, 2021
```
# Conflicts:
#	work.openpaper.Paperwork.json
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  136e97ed
- Flatpak/testing: Fix branch · a4b116e1
  Jerome Flesch authored May 04, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  a4b116e1
- Merge branch 'master' into testing · ff3967bb
  Jerome Flesch authored May 04, 2021
  
  ff3967bb
- Flatpak/Makefile: Fix repository path · 11186e54
  Jerome Flesch authored May 04, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  11186e54
- CI|Flatpak: Always download data.tar.gz at the root of the repository · 4b57b7ad
  Jerome Flesch authored May 04, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  4b57b7ad
03 May, 2021 6 commits
- Merge branch 'testing' into develop · 731eac44
  Jerome Flesch authored May 03, 2021
```
# Conflicts:
#	flatpak/develop.json
#	flatpak/master.json
#	work.openpaper.Paperwork.json
```
  731eac44
- Merge branch 'master' into testing · 4f1b331f
  Jerome Flesch authored May 03, 2021
  
  4f1b331f
- Flatpak: Move manifest where Gnome Builder expects it. · b2c5ce8c
  Jerome Flesch authored May 03, 2021
```
Note that it is still not buildable with Gnome Builder
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  b2c5ce8c
- Merge branch 'testing' into develop · 16e4080a
  Jerome Flesch authored May 03, 2021
  
  16e4080a
- Merge branch 'master' into testing · 7ae44673
  Jerome Flesch authored May 03, 2021
  
  7ae44673
- Revert "Flatpak: update Gnome runtime for master and testing" · cb2aa817
  Jerome Flesch authored May 03, 2021
```
This reverts commit 637ad861.
```
  cb2aa817
27 Apr, 2021 2 commits
- README: Fix image 'settings.png' ratio · 2b954378
  Jerome Flesch authored Apr 27, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  2b954378
- README: Fix image 'suggestions.png' ratio · d5136310
  Jerome Flesch authored Apr 27, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  d5136310
21 Apr, 2021 17 commits
- GTK: settings: calibration: take into account that the image displayed by Cairo is limited in size · 0130d69c
  Jerome Flesch authored Apr 21, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  0130d69c
- Merge branch 'testing' into develop · 2b7ada2b
  Jerome Flesch authored Apr 21, 2021
```
# Conflicts:
#	flatpak/develop.json
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  2b7ada2b
- Merge branch 'master' into testing · b0032fd2
  Jerome Flesch authored Apr 21, 2021
  
  b0032fd2
- Flatpak: Update Sane to 1.0.32 · fbf659b7
  Jerome Flesch authored Apr 21, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  fbf659b7
- Backend: pillow_to_surface: also take into account Cairo limitation when... · 2b0e7b61
  Jerome Flesch authored Apr 21, 2021
```
Backend: pillow_to_surface: also take into account Cairo limitation when computing the area to draw on screen
Also limit the image dimension to 16k, otherwise for some unknown reason, Cairo doesn't draw the image at all (but no exceptions are raised)
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  2b0e7b61
- Merge branch 'testing' into develop · b2534945
  Jerome Flesch authored Apr 21, 2021
  
  b2534945
- Merge branch 'master' into testing · c57d38df
  Jerome Flesch authored Apr 21, 2021
  
  c57d38df
- CI: run apt-get update before trying to install Paperwork dependencies · 7c04a36c
  Jerome Flesch authored Apr 21, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  7c04a36c
- Merge branch 'testing' into develop · 87c73af3
  Jerome Flesch authored Apr 21, 2021
  
  87c73af3
- Merge branch 'master' into testing · 7adb0fac
  Jerome Flesch authored Apr 21, 2021
  
  7adb0fac
- Backend: pillow_to_surface(): Fix my stupidity ... · 5ac48078
  Jerome Flesch authored Apr 21, 2021
```
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  5ac48078
- Merge branch 'testing' into develop · b662fd68
  Jerome Flesch authored Apr 21, 2021
  
  b662fd68
- Merge branch 'master' into testing · 7f63a2ed
  Jerome Flesch authored Apr 21, 2021
  
  7f63a2ed
- CI: Remove set_apt_proxy.sh script · 21dec9ce
  Jerome Flesch authored Apr 21, 2021
```
It's useless now that I have an optical fiber Internet access at home \o/
```
  21dec9ce
- Merge branch 'testing' into develop · 9fb66e20
  Jerome Flesch authored Apr 21, 2021
  
  9fb66e20
- Merge branch 'master' into testing · cec29ca6
  Jerome Flesch authored Apr 21, 2021
  
  cec29ca6
- Backend: Cairo: pillow_to_surface(): Cairo doesn't accept images with a dimension higher than 32k · 8491f1cc
  Jerome Flesch authored Apr 21, 2021
```
And some scanners returned weird long images
Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
```
  8491f1cc
05 Apr, 2021 2 commits
- Merge branch 'testing' into develop · 3d89fc17
  Jerome Flesch authored Apr 05, 2021
```
# Conflicts:
#	.gitlab-ci.yml
```
  3d89fc17
- Merge branch 'master' into testing · 63fd6d86
  Jerome Flesch authored Apr 05, 2021
  
  63fd6d86