7023 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
linsui	9b0ef544bb	add ndk r23b	2021-11-29 11:28:43 +00:00
Hans-Christoph Steiner	a391ac0d0f	Merge branch 'fix_human_size' into 'master' ... Parse single digit sizes Closes #946 See merge request fdroid/fdroidserver!1050	2021-11-29 11:20:39 +00:00
Jochen Sprickerhof	a5deaa80d8	Parse single digit sizes ... Closes: #946	2021-11-27 21:44:47 +01:00
Hans-Christoph Steiner	cd69692424	Merge branch 'TheLastProject-master-patch-73771' into 'master' ... Add NSFW to allowed anti-features See merge request fdroid/fdroidserver!1000	2021-11-25 13:25:24 +00:00
Sylvia van Os	3779481519	Renamed to NSFW as per https://gitlab.com/fdroid/admin/-/issues/252	2021-11-25 13:10:29 +00:00
Sylvia van Os	ec194ef6e6	Add AdultContent to allowed anti-features	2021-11-25 13:10:29 +00:00
Hans-Christoph Steiner	62e63b600b	Merge branch 'drop_wiki' into 'master' ... Drop code for the old wiki See merge request fdroid/fdroidserver!1043	2021-11-24 17:29:57 +00:00
Jochen Sprickerhof	36a7847525	Suppress --wiki in fdroid build ... This was already done for fdroid update in 00c2cc969.	2021-11-24 18:16:07 +01:00
Jochen Sprickerhof	32d2330bb5	Always write VM status ... Before this the status.json only contained VM information with fdroid build --wiki --server, after this a fdroid build --server is enough.	2021-11-24 18:16:07 +01:00
Jochen Sprickerhof	b6f1f4231a	Drop code for the old wiki	2021-11-24 18:16:07 +01:00
Hans-Christoph Steiner	6952a23c47	Merge branch 'Add-github-actions' into 'master' ... Added Github actions/workflow to the nightly CI See merge request fdroid/fdroidserver!1032	2021-11-24 07:54:57 +00:00
Ward Vanlerberghe	1c65fd8496	Added Github actions/workflow to the nightly CI	2021-11-24 07:54:57 +00:00
Hans-Christoph Steiner	1031106dee	Merge branch 'gradle-release-checksums.py' into 'master' ... update to gradle v7.3 See merge request fdroid/fdroidserver!1046	2021-11-22 13:46:10 +00:00
fdroid-bot	9a68c4aefc	gradle v7.3	2021-11-22 07:57:10 +00:00
Hans-Christoph Steiner	823a7c6aae	Merge branch 'fix_new_html5lib' into 'master' ... Simplify index.html for new html5lib See merge request fdroid/fdroidserver!1044	2021-11-22 07:56:30 +00:00
Jochen Sprickerhof	656c707636	Simplify index.html for new html5lib ... Newer html5lib (used in html5print in the test_make_website) strip the empty value, as it is valid html.	2021-11-19 18:34:23 +01:00
Jochen Sprickerhof	80e608a119	Merge branch 'fix_ci' into 'master' ... [CI] install python3-matplotlib from apt See merge request fdroid/fdroidserver!1045	2021-11-19 17:30:54 +00:00
Jochen Sprickerhof	6756f842e4	[CI] install python3-matplotlib from apt	2021-11-19 18:17:36 +01:00
Hans-Christoph Steiner	5aa12ea50a	Merge branch 'fix_ssh' into 'master' ... Add newline in ssh_config See merge request fdroid/fdroidserver!1039	2021-11-04 09:29:27 +00:00
Jochen Sprickerhof	ae9a1df1aa	Add newline in ssh_config ... Otherwise both options end on the same line and are not used.	2021-11-04 09:10:57 +00:00
Hans-Christoph Steiner	c26345214f	Merge branch 'ndk-unzip' into 'master' ... NDK-Install: handle symbolic links correctly See merge request fdroid/fdroidserver!1023	2021-11-03 08:30:33 +00:00
Gaurav Ujjwal	aead3310bd	NDK Install: Handle symlinks present in NDK zip	2021-11-03 08:13:21 +00:00
Jochen Sprickerhof	b12ece1eba	Merge branch 'ci' into 'master' ... [CI] install python3-pil from apt in servergitmirrors See merge request fdroid/fdroidserver!1035	2021-10-23 13:15:21 +00:00
Jochen Sprickerhof	46abffa0fa	[CI] install python3-pil from apt in servergitmirrors ... New version would need to be compiled, otherwise.	2021-10-23 15:02:57 +02:00
Jochen Sprickerhof	1033d6e163	Merge branch 'dry_run' into 'master' ... Improve rewritemeta --help See merge request fdroid/fdroidserver!1034	2021-10-23 12:45:57 +00:00
Jochen Sprickerhof	b8285ebd0e	[CI] Install python3-pil from apt ... New version would need to be compiled, otherwise.	2021-10-23 14:33:06 +02:00
Jochen Sprickerhof	e5dcf532b4	Improve rewritemeta --help	2021-10-23 14:08:07 +02:00
Jochen Sprickerhof	e036f31613	Merge branch 'git_prune' into 'master' ... git prune branches in case of failure See merge request fdroid/fdroidserver!1026	2021-10-14 12:42:38 +00:00
Jochen Sprickerhof	fa3cceb8e8	git prune branches in case of failure ... git branches can be namespaces like directories on a filesystem and are represented like that. Due to that there can't be a branch with the same name as a namespace, i.e. foo and foo/bar. If upstream moves from a branch to namespace, we need to prune the old branch before fetching the new one. This broke organic maps: From https://github.com/organicmaps/organicmaps * [new branch] android/huawei -> origin/android/huawei error: cannot lock ref 'refs/remotes/origin/fixes/all': 'refs/remotes/origin/fixes' exists; cannot create 'refs/remotes/origin/fixes/all' ! [new branch] fixes/all -> origin/fixes/all (unable to update local ref) e2ac324b95..320a1db39b master -> origin/master * [new tag] 2021.10.09-2-android -> 2021.10.09-2-android error: some local refs could not be updated; try running 'git remote prune origin' to remove any old, conflicting branches	2021-10-14 12:42:29 +00:00
Jochen Sprickerhof	e8b7a648b7	Merge branch 'fix_ci' into 'master' ... Fix servergitmirrors ci See merge request fdroid/fdroidserver!1029	2021-10-14 12:42:13 +00:00
Jochen Sprickerhof	972bfe346f	Fix servergitmirrors ci	2021-10-14 14:40:31 +02:00
Jochen Sprickerhof	724153a587	Merge branch 'tweak_logging' into 'master' ... [checkupdates] Tweak logging See merge request fdroid/fdroidserver!1025	2021-10-14 12:23:26 +00:00
Jochen Sprickerhof	45a20ab365	[checkupdates] Tweak logging ... - Increase severity of version mismatch. - Don't log that the process is done.	2021-10-14 12:11:01 +00:00
Hans-Christoph Steiner	78eb2d94c4	Merge branch 'ignore_windows_ci' into 'master' ... Ignore failing Windows CI See merge request fdroid/fdroidserver!1028	2021-10-14 12:09:44 +00:00
Jochen Sprickerhof	23bd62c31c	[CI] fetchsrclibs use apt cffi	2021-10-14 13:55:51 +02:00
Jochen Sprickerhof	60532f0912	Ignore failing Windows CI	2021-10-14 13:40:19 +02:00
Jochen Sprickerhof	8a089691ea	Merge branch 'genodeftest-master-patch-82391' into 'master' ... Doc: Clarify wording example for config.yml See merge request fdroid/fdroidserver!1024	2021-10-13 13:44:27 +00:00
Christian Stadelmann	a0a86aa5ec	Clarify wording example for config.yml ... Note: The old wording was applicable to the python version of this config file only.	2021-10-02 08:13:48 +00:00
Hans-Christoph Steiner	bd079c9311	Merge branch 'NoahAndrews-master-patch-97157' into 'master' ... Handle error when parsing WebView icon Closes #903 See merge request fdroid/fdroidserver!1018	2021-10-01 15:01:21 +00:00
Noah Andrews	75989ff59a	Handle error when parsing WebView icon ... Fixes #903	2021-10-01 16:44:28 +02:00
Hans-Christoph Steiner	da10acfe2c	update: add test with APK for icon_id related exceptions	2021-10-01 16:44:14 +02:00
Hans-Christoph Steiner	80d238180b	Merge branch 'obfusk-master-patch-85387' into 'master' ... scanner: add com.google.mlkit to NON_FREE_GRADLE_LINES See merge request fdroid/fdroidserver!1021	2021-10-01 13:11:16 +00:00
Felix C. Stegerman	dbfbc4163c	scanner: add com.google.mlkit to NON_FREE_GRADLE_LINES	2021-10-01 13:10:45 +00:00
Felix C. Stegerman	5b86242dde	Merge branch 'triple-t-flavours' into 'master' ... copy_triple_t_store_metadata(): handle subdir + flavor Closes fdroiddata#2487 See merge request fdroid/fdroidserver!1022	2021-09-29 21:53:26 +00:00
Felix C. Stegerman	c2ed538ea4	copy_triple_t_store_metadata(): handle subdir + flavor	2021-09-29 21:36:11 +00:00
Hans-Christoph Steiner	311e6a14f1	Merge branch 'black' into 'master' ... Add CI job "black" for code format checks See merge request fdroid/fdroidserver!998	2021-09-29 18:00:06 +00:00
FestplattenSchnitzel	ef20e1b329	Add CI job "black" for code format checks ... The CI job will fail, if a file needs to be reformatted. Only files already well formatted will be checked at the moment.	2021-09-25 15:45:37 +00:00
Hans-Christoph Steiner	c71c2465d3	tests: silence the linters	2021-09-20 10:51:54 +02:00
Hans-Christoph Steiner	cc666907a3	Merge 'fix-ndk-long-form-version' into 'master' ... * fix-ndk-long-form-version: test whether NDK version parsing is working properly Fix invalid key error due to NDK versions in "revision" form (e.g. 21.4.7075529) fdroid/fdroidserver!1020	2021-09-20 10:20:07 +02:00
Hans-Christoph Steiner	d6fd165444	test whether NDK version parsing is working properly	2021-09-20 10:18:16 +02:00