Skip to content

Move Develop To Master #3379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 1,883 commits into from
Closed

Move Develop To Master #3379

wants to merge 1,883 commits into from

Conversation

@marinofaggiana
Copy link
Member

No description provided.

marinofaggiana and others added 30 commits January 15, 2025 12:10
@marinofaggiana
color
04254b7 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
clean
b5d9867 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
cod
5f1859e 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
cod
9f25c3f 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
cod
6a715d7 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
downloadPreview
5c2511a 
Signed-off-by: Marino Faggiana <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
c6cbd82 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
New version
dea86a0 
Signed-off-by: Marino Faggiana <[email protected]>
@mpivchev
Fix login poll timer not cancelling
c021fdb 
Signed-off-by: Milen Pivchev <[email protected]>
@marinofaggiana
E2EE force refresh after create dir
f859d50 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
version 6.2.3
43fbd94 
Signed-off-by: Marino Faggiana <[email protected]>
@mpivchev
Additional checks for timer
f663eab 
Signed-off-by: Milen Pivchev <[email protected]>
@mpivchev
Merge branch 'develop' of https://github.com/nextcloud/ios into develop
7906689
@nextcloud-bot
Fix(l10n): Update translations from Transifex
4be292a 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
menu FIX
f0c7a2f 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
Merge remote-tracking branch 'origin/master' into develop
e5228a5 
Signed-off-by: Marino Faggiana <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
9af7d7d 
Signed-off-by: Nextcloud bot <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
6aab75a 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
Recommended review NC 31 (#3275)
ee8f7a6 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
Version 6.2.4
a1c7cdd 
Signed-off-by: Marino Faggiana <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
710e432 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
fix error
ee83103 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
fix appearanceInterfaceStyle
92a8864 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
build 1
215154d 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
added new dictionary
932ee76 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
fix timer
35f7e89 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
Max request/download/upload concurrent parameter (#3276)
2469352 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
improvements (#3277)
803ecff 
Signed-off-by: Marino Faggiana <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
b88ec4f 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
fix and new build
e2102cb 
Signed-off-by: Marino Faggiana <[email protected]>
mpivchev and others added 26 commits March 15, 2025 07:32
@mpivchev
Remove old code for Nextcloud 17 or lower (#3363)
192e28f 
* Remove code for NC17 and lower

Signed-off-by: Milen Pivchev <[email protected]>

* String

Signed-off-by: Milen Pivchev <[email protected]>

* Change var

Signed-off-by: Milen Pivchev <[email protected]>

---------

Signed-off-by: Milen Pivchev <[email protected]>
@marinofaggiana
New assistant button (#3362)
bb3132a 
* added assistantButton

Signed-off-by: Marino Faggiana <[email protected]>

* NCMainNavigationController Improved

Signed-off-by: Marino Faggiana <[email protected]>

* NCMoreNavigationController

Signed-off-by: Marino Faggiana <[email protected]>

* Media assistant button

Signed-off-by: Marino Faggiana <[email protected]>

* Improved media bar

Signed-off-by: Marino Faggiana <[email protected]>

* Improved media bar

Signed-off-by: Marino Faggiana <[email protected]>

* cod

Signed-off-by: Marino Faggiana <[email protected]>

* fix priority

Signed-off-by: Marino Faggiana <[email protected]>

* fix Assistant icon

Signed-off-by: Marino Faggiana <[email protected]>

* fix

Signed-off-by: Marino Faggiana <[email protected]>

* fix

Signed-off-by: Marino Faggiana <[email protected]>

* fix

Signed-off-by: Marino Faggiana <[email protected]>

* NCNotification in present

Signed-off-by: Marino Faggiana <[email protected]>

* fix

Signed-off-by: Marino Faggiana <[email protected]>

* improved

Signed-off-by: Marino Faggiana <[email protected]>

* fix

Signed-off-by: Marino Faggiana <[email protected]>

* remove option directory on top

Signed-off-by: Marino Faggiana <[email protected]>

* show description improvements

Signed-off-by: Marino Faggiana <[email protected]>

* cleaning

Signed-off-by: Marino Faggiana <[email protected]>

* clean

Signed-off-by: Marino Faggiana <[email protected]>

* Version 6.5.0

Signed-off-by: Marino Faggiana <[email protected]>

---------

Signed-off-by: Marino Faggiana <[email protected]>
Co-authored-by: Marino Faggiana <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
21357ea 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
clean old code
4e28d24 
Signed-off-by: Marino Faggiana <[email protected]>
@mpivchev
Fix compile
49fcf59 
Signed-off-by: Milen Pivchev <[email protected]>
@mpivchev
Fix compile 2
f3fe296 
Signed-off-by: Milen Pivchev <[email protected]>
@marinofaggiana
Search reload (#3367)
e773a2b 
* cod

Signed-off-by: Marino Faggiana <[email protected]>

* cod

Signed-off-by: Marino Faggiana <[email protected]>

* new build

Signed-off-by: Marino Faggiana <[email protected]>

---------

Signed-off-by: Marino Faggiana <[email protected]>
Co-authored-by: Marino Faggiana <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
7b6c010 
Signed-off-by: Nextcloud bot <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
450a39a 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
Improvements code (#3370)
fd1596f 
* improvements

Signed-off-by: Marino Faggiana <[email protected]>

* new build

Signed-off-by: Marino Faggiana <[email protected]>

---------

Signed-off-by: Marino Faggiana <[email protected]>
Co-authored-by: Marino Faggiana <[email protected]>
@marinofaggiana
File provider extension (#3371)
329fe1a 
* cod & fix

Signed-off-by: Marino Faggiana <[email protected]>

* cleaning

Signed-off-by: Marino Faggiana <[email protected]>

---------

Signed-off-by: Marino Faggiana <[email protected]>
Co-authored-by: Marino Faggiana <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
c401021 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
remove old queue (#3373)
520a31d 
Signed-off-by: Marino Faggiana <[email protected]>
Co-authored-by: Marino Faggiana <[email protected]>
@marinofaggiana
Nc operation delete file or folder (#3374)
fc5f98e 
* cod

Signed-off-by: Marino Faggiana <[email protected]>

* cleaning

Signed-off-by: Marino Faggiana <[email protected]>

* cod

Signed-off-by: Marino Faggiana <[email protected]>

* build 3

Signed-off-by: Marino Faggiana <[email protected]>

---------

Signed-off-by: Marino Faggiana <[email protected]>
Co-authored-by: Marino Faggiana <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
bb0a2f6 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
fix
1acaa2d 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
bug fix
03329ae 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
build 4
ed9f7f7 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
update share - metadata (#3375)
2625a48 
* step 1

Signed-off-by: Marino Faggiana <[email protected]>

* fix

Signed-off-by: Marino Faggiana <[email protected]>

---------

Signed-off-by: Marino Faggiana <[email protected]>
Co-authored-by: Marino Faggiana <[email protected]>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
3d3f4ef 
Signed-off-by: Nextcloud bot <[email protected]>
@marinofaggiana
close version
3767bd3 
Signed-off-by: Marino Faggiana <[email protected]>
@marinofaggiana
Merge remote-tracking branch 'origin/master' into develop
829a368 
Signed-off-by: Marino Faggiana <[email protected]>

# Conflicts:
#	Nextcloud.xcodeproj/project.pbxproj
#	iOSClient/Files/NCFilesNavigationController.swift
#	iOSClient/Login/NCLogin.swift
#	iOSClient/Main/NCMainTabBarController.swift
#	iOSClient/Networking/NCNetworking+AsyncAwait.swift
#	iOSClient/Networking/NCNetworking+WebDAV.swift
#	iOSClient/Networking/NCNetworkingProcess.swift
#	iOSClient/Supporting Files/af.lproj/Localizable.strings
#	iOSClient/Supporting Files/an.lproj/Localizable.strings
#	iOSClient/Supporting Files/ar.lproj/Localizable.strings
#	iOSClient/Supporting Files/ast.lproj/Localizable.strings
#	iOSClient/Supporting Files/az.lproj/Localizable.strings
#	iOSClient/Supporting Files/be.lproj/Localizable.strings
#	iOSClient/Supporting Files/bg_BG.lproj/Localizable.strings
#	iOSClient/Supporting Files/bn_BD.lproj/Localizable.strings
#	iOSClient/Supporting Files/br.lproj/Localizable.strings
#	iOSClient/Supporting Files/bs.lproj/Localizable.strings
#	iOSClient/Supporting Files/ca.lproj/Localizable.strings
#	iOSClient/Supporting Files/cs-CZ.lproj/Localizable.strings
#	iOSClient/Supporting Files/cy_GB.lproj/Localizable.strings
#	iOSClient/Supporting Files/da.lproj/Localizable.strings
#	iOSClient/Supporting Files/de.lproj/Localizable.strings
#	iOSClient/Supporting Files/el.lproj/Localizable.strings
#	iOSClient/Supporting Files/en-GB.lproj/Localizable.strings
#	iOSClient/Supporting Files/en.lproj/Localizable.strings
#	iOSClient/Supporting Files/eo.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-419.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-AR.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-CL.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-CO.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-CR.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-DO.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-EC.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-GT.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-HN.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-MX.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-NI.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-PA.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-PE.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-PR.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-PY.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-SV.lproj/Localizable.strings
#	iOSClient/Supporting Files/es-UY.lproj/Localizable.strings
#	iOSClient/Supporting Files/es.lproj/Localizable.strings
#	iOSClient/Supporting Files/et_EE.lproj/Localizable.strings
#	iOSClient/Supporting Files/eu.lproj/Localizable.strings
#	iOSClient/Supporting Files/fa.lproj/Localizable.strings
#	iOSClient/Supporting Files/fi-FI.lproj/Localizable.strings
#	iOSClient/Supporting Files/fo.lproj/Localizable.strings
#	iOSClient/Supporting Files/fr.lproj/Localizable.strings
#	iOSClient/Supporting Files/ga.lproj/Localizable.strings
#	iOSClient/Supporting Files/gd.lproj/Localizable.strings
#	iOSClient/Supporting Files/gl.lproj/Localizable.strings
#	iOSClient/Supporting Files/he.lproj/Localizable.strings
#	iOSClient/Supporting Files/hi_IN.lproj/Localizable.strings
#	iOSClient/Supporting Files/hr.lproj/Localizable.strings
#	iOSClient/Supporting Files/hsb.lproj/Localizable.strings
#	iOSClient/Supporting Files/hu.lproj/Localizable.strings
#	iOSClient/Supporting Files/hy.lproj/Localizable.strings
#	iOSClient/Supporting Files/ia.lproj/Localizable.strings
#	iOSClient/Supporting Files/id.lproj/Localizable.strings
#	iOSClient/Supporting Files/ig.lproj/Localizable.strings
#	iOSClient/Supporting Files/is.lproj/Localizable.strings
#	iOSClient/Supporting Files/it.lproj/Localizable.strings
#	iOSClient/Supporting Files/ja-JP.lproj/Localizable.strings
#	iOSClient/Supporting Files/ka-GE.lproj/Localizable.strings
#	iOSClient/Supporting Files/ka.lproj/Localizable.strings
#	iOSClient/Supporting Files/kab.lproj/Localizable.strings
#	iOSClient/Supporting Files/km.lproj/Localizable.strings
#	iOSClient/Supporting Files/kn.lproj/Localizable.strings
#	iOSClient/Supporting Files/ko.lproj/Localizable.strings
#	iOSClient/Supporting Files/la.lproj/Localizable.strings
#	iOSClient/Supporting Files/lb.lproj/Localizable.strings
#	iOSClient/Supporting Files/lo.lproj/Localizable.strings
#	iOSClient/Supporting Files/lt_LT.lproj/Localizable.strings
#	iOSClient/Supporting Files/lv.lproj/Localizable.strings
#	iOSClient/Supporting Files/mk.lproj/Localizable.strings
#	iOSClient/Supporting Files/mn.lproj/Localizable.strings
#	iOSClient/Supporting Files/mr.lproj/Localizable.strings
#	iOSClient/Supporting Files/ms_MY.lproj/Localizable.strings
#	iOSClient/Supporting Files/my.lproj/Localizable.strings
#	iOSClient/Supporting Files/nb-NO.lproj/Localizable.strings
#	iOSClient/Supporting Files/ne.lproj/Localizable.strings
#	iOSClient/Supporting Files/nl.lproj/Localizable.strings
#	iOSClient/Supporting Files/nn_NO.lproj/Localizable.strings
#	iOSClient/Supporting Files/oc.lproj/Localizable.strings
#	iOSClient/Supporting Files/pl.lproj/Localizable.strings
#	iOSClient/Supporting Files/ps.lproj/Localizable.strings
#	iOSClient/Supporting Files/pt-BR.lproj/Localizable.strings
#	iOSClient/Supporting Files/pt-BR.lproj/Localizable.stringsdict
#	iOSClient/Supporting Files/pt-PT.lproj/Localizable.strings
#	iOSClient/Supporting Files/ro.lproj/Localizable.strings
#	iOSClient/Supporting Files/ru.lproj/Localizable.strings
#	iOSClient/Supporting Files/sc.lproj/Localizable.strings
#	iOSClient/Supporting Files/si.lproj/Localizable.strings
#	iOSClient/Supporting Files/sk-SK.lproj/Localizable.strings
#	iOSClient/Supporting Files/sl.lproj/Localizable.strings
#	iOSClient/Supporting Files/sq.lproj/Localizable.strings
#	iOSClient/Supporting Files/sr.lproj/Localizable.strings
#	iOSClient/Supporting Files/[email protected]/Localizable.strings
#	iOSClient/Supporting Files/sv.lproj/Localizable.strings
#	iOSClient/Supporting Files/sw.lproj/Localizable.strings
#	iOSClient/Supporting Files/ta.lproj/Localizable.strings
#	iOSClient/Supporting Files/th_TH.lproj/Localizable.strings
#	iOSClient/Supporting Files/tk.lproj/Localizable.strings
#	iOSClient/Supporting Files/tr.lproj/Localizable.strings
#	iOSClient/Supporting Files/ug.lproj/Localizable.strings
#	iOSClient/Supporting Files/uk.lproj/Localizable.strings
#	iOSClient/Supporting Files/ur_PK.lproj/Localizable.strings
#	iOSClient/Supporting Files/uz.lproj/Localizable.strings
#	iOSClient/Supporting Files/vi.lproj/Localizable.strings
#	iOSClient/Supporting Files/zh-Hans.lproj/Localizable.strings
#	iOSClient/Supporting Files/zh-Hant-TW.lproj/Localizable.strings
#	iOSClient/Supporting Files/zh_HK.lproj/Localizable.strings
#	iOSClient/Supporting Files/zu_ZA.lproj/Localizable.strings
@nextcloud-bot
Fix(l10n): Update translations from Transifex
e5a25da 
Signed-off-by: Nextcloud bot <[email protected]>
@mpivchev @marinofaggiana
Auto upload via Albums: Improvements (#3360)
e0dc628 
* Revert "rollback (#3310)"

This reverts commit 9554b4e.

* Add photos timeframe

Signed-off-by: Milen Pivchev <[email protected]>

* Strings

Signed-off-by: Milen Pivchev <[email protected]>

* Auto upload changes

- Select timeframe
- Remove unneeded toggle
- Fix duplicate photos

Signed-off-by: Milen Pivchev <[email protected]>

* Small fixes

Signed-off-by: Milen Pivchev <[email protected]>

* Handle permissoins

Signed-off-by: Milen Pivchev <[email protected]>

* Fix thumbnail not showing for shared albums

Signed-off-by: Milen Pivchev <[email protected]>

* Fix albums not populating on permission granted

Signed-off-by: Milen Pivchev <[email protected]>

* Refactor

Signed-off-by: Milen Pivchev <[email protected]>

* PR fixes

Signed-off-by: Milen Pivchev <[email protected]>

* Padding, asset count

Signed-off-by: Milen Pivchev <[email protected]>

* Experiments

Signed-off-by: Milen Pivchev <[email protected]>

* PR fixes

Signed-off-by: Milen Pivchev <[email protected]>

* Add some UI tests

Signed-off-by: Milen Pivchev <[email protected]>

* cleaning old code

Signed-off-by: Marino Faggiana <[email protected]>

* cleaning code

Signed-off-by: Marino Faggiana <[email protected]>

* Fix

Signed-off-by: Milen Pivchev <[email protected]>

* WIP

Signed-off-by: Milen Pivchev <[email protected]>

* Refactor

Signed-off-by: Milen Pivchev <[email protected]>

* Refactor

Signed-off-by: Milen Pivchev <[email protected]>

* WIP

Signed-off-by: Milen Pivchev <[email protected]>

* fix create directory

Signed-off-by: Marino Faggiana <[email protected]>

* create folder improvements

Signed-off-by: Marino Faggiana <[email protected]>

* cleaning

Signed-off-by: Marino Faggiana <[email protected]>

* cleaning

Signed-off-by: Marino Faggiana <[email protected]>

* WIP

Signed-off-by: Milen Pivchev <[email protected]>

* WIP

Signed-off-by: Milen Pivchev <[email protected]>

* code improvements

Signed-off-by: Marino Faggiana <[email protected]>

* WIP

Signed-off-by: Milen Pivchev <[email protected]>

* code improvements

Signed-off-by: Marino Faggiana <[email protected]>

---------

Signed-off-by: Milen Pivchev <[email protected]>
Signed-off-by: Marino Faggiana <[email protected]>
Co-authored-by: Marino Faggiana <[email protected]>
@mpivchev
Add toggles for auto upload settings
e17525c 
Signed-off-by: Milen Pivchev <[email protected]>
@marinofaggiana
Merge remote-tracking branch 'origin/master' into develop
0549d14 
Signed-off-by: Marino Faggiana <[email protected]>

# Conflicts:
#	iOSClient/Supporting Files/et_EE.lproj/Localizable.strings
#	iOSClient/Supporting Files/pt-BR.lproj/Localizable.strings
@marinofaggiana marinofaggiana requested review from i2h3 and mpivchev March 26, 2025 14:35
@marinofaggiana
Copy link
Member Author

already merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mpivchev mpivchev Awaiting requested review from mpivchev

@i2h3 i2h3 Awaiting requested review from i2h3

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@marinofaggiana @nextcloud-bot @mpivchev @i2h3 @zero0cool0 @s-kaliberda @rakekniven @nickvergessen