21429 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Kaminsky	b73cd5b79f	daily dev 20230906	2023-09-06 02:37:36 +02:00
Tobias Kaminsky	2d34e76329	Merge remote-tracking branch 'origin/master' into dev	2023-09-06 02:31:01 +02:00
Andy Scherzinger	bec30b499c	Merge pull request #11925 from nextcloud/build.gradle ... update build.gradle	2023-09-05 21:32:59 +02:00
ZetaTom	a470c12d57	Clean up comments ... Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>	2023-09-05 13:33:39 +02:00
Nextcloud bot	a5067af472	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-05 02:41:42 +00:00
Nextcloud bot	fcab52634a	Fix(l10n): Update Transifex configuration ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-05 02:41:15 +00:00
Tobias Kaminsky	ed109eaa31	daily dev 20230905 ... Update 3rd-party dependencies	2023-09-05 02:36:29 +02:00
Tobias Kaminsky	3440fb9547	Merge remote-tracking branch 'origin/master' into dev	2023-09-05 02:31:12 +02:00
Andy Scherzinger	68c64d61b2	Merge pull request #11940 from nextcloud/chore/noid/screenshotUpdate ... Updated screenshot for #11938	2023-09-04 19:08:13 +02:00
Andy Scherzinger	730717c106	Updated screenshot for #11938 ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2023-09-04 19:07:41 +02:00
Andy Scherzinger	57326ea20f	Merge pull request #11938 from nextcloud/fix/imagedetail-addresses ... Improve address appearance in ImageDetailFragment	2023-09-04 18:40:43 +02:00
Andy Scherzinger	e9d14e1831	Add empty new line at the file end ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2023-09-04 18:39:29 +02:00
ZetaTom	fc5994c243	Move photo pin drawable to xml layout ... Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>	2023-09-04 18:21:40 +02:00
ZetaTom	7212b092d6	Improve appearance of addresses in ImageDetailFragment ... Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>	2023-09-04 18:21:36 +02:00
Andy Scherzinger	e1df0b9198	Merge pull request #11939 from nextcloud/dependabot/github_actions/gradle/gradle-build-action-2.8.0 ... Build(deps): Bump gradle/gradle-build-action from 2.7.1 to 2.8.0	2023-09-04 13:57:47 +02:00
dependabot[bot]	cfa726ad04	Build(deps): Bump gradle/gradle-build-action from 2.7.1 to 2.8.0 ... Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.7.1 to 2.8.0. - [Release notes](https://github.com/gradle/gradle-build-action/releases) - [Commits](243af859f8...ef76a971e2) --- updated-dependencies: - dependency-name: gradle/gradle-build-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-09-04 11:23:56 +00:00
Nextcloud bot	c62145e2f7	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-04 02:51:14 +00:00
Nextcloud bot	0da5b2ab75	Fix(l10n): Update Transifex configuration ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-04 02:50:46 +00:00
Nextcloud bot	266e27f9dd	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-03 02:40:34 +00:00
Nextcloud bot	3ce80fb54f	Fix(l10n): Update Transifex configuration ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-03 02:40:07 +00:00
Tobias Kaminsky	fe855fc907	daily dev 20230903	2023-09-03 02:35:59 +02:00
Tobias Kaminsky	8254405794	Merge remote-tracking branch 'origin/master' into dev	2023-09-03 02:30:59 +02:00
Andy Scherzinger	aa9b8c5bb4	Merge pull request #11934 from nextcloud/repo-sync/android-config/master ... 🔄 synced file(s) with nextcloud/android-config	2023-09-02 21:44:45 +02:00
nextcloud-android-bot	2365bd6e87	🔄 synced local '.github/workflows/' with remote 'config/workflows/' ... Signed-off-by: nextcloud-android-bot <android@nextcloud.com>	2023-09-02 03:07:09 +00:00
Nextcloud bot	f04b0397fe	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-02 02:41:11 +00:00
Nextcloud bot	478f529651	Fix(l10n): Update Transifex configuration ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-02 02:40:43 +00:00
Tobias Kaminsky	b8e5113b5c	daily dev 20230902	2023-09-02 02:36:22 +02:00
Tobias Kaminsky	a0726615f2	Merge remote-tracking branch 'origin/master' into dev	2023-09-02 02:31:09 +02:00
Nextcloud bot	1539651b80	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-01 02:45:26 +00:00
Nextcloud bot	47621628d5	Fix(l10n): Update Transifex configuration ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-09-01 02:44:57 +00:00
Nextcloud bot	9d038ddaf5	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-08-31 02:52:46 +00:00
Nextcloud bot	9f05df997f	Fix(l10n): Update Transifex configuration ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-08-31 02:52:19 +00:00
Nextcloud bot	0fac4705a1	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-08-30 17:09:49 +00:00
Nextcloud bot	eca6f8a907	Fix(l10n): Update Transifex configuration ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-08-30 17:09:19 +00:00
Nextcloud bot	f2a15c0ee7	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-08-30 17:06:53 +00:00
Nextcloud bot	fa86f5445d	Fix(l10n): Update Transifex configuration ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-08-30 17:06:24 +00:00
Andy Scherzinger	db9c071f48	Merge pull request #11932 from nextcloud/bugfix/noid/translationString ... Rename string to ensure transifex sync works	2023-08-30 19:02:44 +02:00
Andy Scherzinger	a0c7219401	rename string to ensure transifex sync works ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2023-08-30 19:01:29 +02:00
Andy Scherzinger	09b2f198f1	Merge pull request #11931 from nextcloud/nextMajor27 ... Bump master to 3.27 alpha	2023-08-30 16:10:13 +02:00
Nextcloud bot	e0b9488a30	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-08-30 13:44:29 +00:00
tobiasKaminsky	a663f26ed8	Bump master to 3.27 alpha ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2023-08-30 15:30:43 +02:00
Nextcloud bot	c05f9a23e8	Fix(l10n): Update Transifex configuration ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-08-30 13:25:58 +00:00
Tobias Kaminsky	c00e614df4	Merge pull request #11852 from nextcloud/synced_folder_upload_subfolderoptions_pr ... Extra options for uploading subfolders	2023-08-30 14:35:34 +02:00
tobiasKaminsky	f32cb61f59	rebased ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2023-08-30 12:10:01 +02:00
Andy Scherzinger	920c69dc15	remove unused variables ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2023-08-30 11:30:21 +02:00
Andy Scherzinger	32b696bd6e	Rename header of Auto upload settings to just "Auto upload" ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2023-08-30 11:30:21 +02:00
Dean Birch	d90e06f9d9	Fix unit tests with SubFolderRule in constructor ... Signed-off-by: Dean Birch <dean.birch0@gmail.com>	2023-08-30 11:30:21 +02:00
Dean Birch	768171c37b	Hide subfolder options when not using subfolders ... Instead of greying out the subfolder rules when not active, hide them. Also reverts changes to make a function out of getAlpha. Signed-off-by: Dean Birch <dean.birch0@gmail.com>	2023-08-30 11:30:21 +02:00
Dean Birch	605aa1489d	Update en localization of use subfolders summary ... Signed-off-by: Dean Birch <dean.birch0@gmail.com>	2023-08-30 11:30:21 +02:00
Dean Birch	13b61e82d6	Convert java to kotlin and add header ... Signed-off-by: Dean Birch <dean.birch0@gmail.com>	2023-08-30 11:30:21 +02:00