Merge lp:~belohoub/owncloud-sync/UBsync into lp:owncloud-sync/ubsync
| Status: | Superseded | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp:~belohoub/owncloud-sync/UBsync | ||||||||||||||||
| Merge into: | lp:owncloud-sync/ubsync | ||||||||||||||||
| Diff against target: |
2348 lines (+1867/-45) 25 files modified
BUILD.md (+40/-0) Owncloud-Sync/Main.qml (+1/-0) Owncloud-Sync/Owncloud-Sync.pro (+6/-6) Owncloud-Sync/UBsync.accounts (+4/-0) Owncloud-Sync/components/FileBrowser.qml (+2/-2) Owncloud-Sync/components/PopupStatusBox.qml (+28/-9) Owncloud-Sync/lib/aarch64-linux-gnu/OWNCLOUD_COPYING (+339/-0) Owncloud-Sync/lib/aarch64-linux-gnu/OWNCLOUD_ChangeLog (+1255/-0) Owncloud-Sync/lib/aarch64-linux-gnu/OWNCLOUD_VERSION (+1/-0) Owncloud-Sync/lib/aarch64-linux-gnu/bin/sync-exclude.lst (+42/-0) Owncloud-Sync/ui/AboutPage.qml (+2/-2) Owncloud-Sync/ui/AccountSettingsPage.qml (+10/-5) Owncloud-Sync/ui/Accounts.qml (+16/-1) Owncloud-Sync/ui/SyncServicePage.qml (+13/-0) Owncloud-Sync/ui/SyncSettingsPage.qml (+10/-1) Owncloud-Sync/ui/WebdavFileBrowser.qml (+1/-0) OwncloudSync/daemoncontroller.cpp (+4/-0) OwncloudSync/daemoncontroller.h (+1/-0) OwncloudSync/servicecontrol.cpp (+38/-13) OwncloudSyncd/owncloudsyncd.cpp (+19/-3) OwncloudSyncd/owncloudsyncd.h (+3/-0) README.md (+14/-0) UBsync.pro (+4/-0) clickable.json (+11/-0) manifest.json.in (+3/-3) |
||||||||||||||||
| To merge this branch: | bzr merge lp:~belohoub/owncloud-sync/UBsync | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| slash | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2021-03-17.
This proposal has been superseded by a proposal from 2021-04-18.
Commit message
multiarch support: +arm64; owncloud account added to be able to use owncloud system account for those who created/use owncloud, not nextcloud account (a natural approach for owncloud users).
Description of the change
- clickable.json added
- arm64 version of owncloudcmd is 2.5.3; arm32 remains unchanged
- arch detection and paths to owncloudcmd changed in OwncloudSyncd/
- arch detection and paths for libs added to OwncloudSync/
- included support for owncloud account in ubuntu-touch (up to now, only nextcloud account was used, even those behave equaly from the UBsync point of view)
- build instructions
- multiarch version detection added to support smooth upgrade from 32-bit 0.5 version in open-store
- many additionally minor fixes and little enhancements: majority of them removes/replaces missleading graphics and texts (reported in telegram group)
- both 32-bit and 64-bit versions were tested at least by two users
Especially 32-bit version and the upgrade procedure NEEDS TESTING!
Unmerged revisions
- 30. By Jan Belohoubek <email address hidden>
-
minor fixes
- 29. By Jan Belohoubek <email address hidden>
-
several UI fixes
- 28. By Jan Belohoubek <email address hidden>
-
dark theme readability issues
- 27. By Jan Belohoubek <email address hidden>
-
minor fixes
- 26. By Jan Belohoubek <email address hidden>
-
Unconfigured/
enabled accounts are now represented in the app - 25. By Jan Belohoubek <email address hidden>
-
Help page, minor fixes
- 24. By Jan Belohoubek <email address hidden>
-
minor fixes
- 23. By Jan Belohoubek <email address hidden>
-
log errors cleanup
- 22. By Jan Belohoubek <email address hidden>
-
model fixes
- 21. By Jan Belohoubek <email address hidden>
-
minor fixes
Look good to me,
Thank you !