1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-04-03 09:11:33 +02:00

Compare commits

..

710 Commits

Author SHA1 Message Date
Camila San
b1667f48d3 Fix context menu wording.
Signed-off-by: Camila San <hello@camila.codes>
2019-09-13 23:50:49 +02:00
Bani Azarael
33f9ae827f Revert to "Refactor for hardcoded strings"
2be6d1a4fe645df34f369bf467ecdd201daeccf9
2019-09-13 23:48:19 +02:00
Bani Azarael
ef4541f834 Refactor for hardcoded strings 2019-09-13 23:33:08 +02:00
Bani Azarael
1b6a9bf128 Get logical drives available on Windows 2019-09-13 23:18:36 +02:00
Bani Azarael
7956f2846b Fix duplicate files
Add an ignored list for not creation
2019-09-13 23:18:00 +02:00
Bani Azarael
12a5f2d16a Change VolName on Windows 2019-09-13 23:17:26 +02:00
Bani Azarael
817e92ab7a Unmount when removing account 2019-09-13 22:45:03 +02:00
Bani Azarael
f4cd3b95c5 Fix logout on Windows 2019-09-13 22:41:33 +02:00
Bani Azarael
a106f89d29 Improvements for VfsWindows 2019-09-13 22:35:49 +02:00
Bani Azarael
322b2fe3a5 Indent lines | Remove unused variables and qDebug 2019-09-13 21:52:22 +02:00
Bani Azarael
33520fdee8 Add changes to moveFileAtPath on Windows 2019-09-13 21:51:49 +02:00
Camila San
706cfe88d0 Fixes syncing in sub directories.
Signed-off-by: Camila San <hello@camila.codes>
2019-02-04 15:10:29 +01:00
Camila San
653c10be86 Fixes deleting of files in sub folder.
Signed-off-by: Camila San <hello@camila.codes>
2019-01-28 10:59:42 +01:00
Camila San
b38b821480 Fix wording.
See PR #1043.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-25 14:07:19 +01:00
Bani Azarael
723b8907f2 Show enabled ContextMenu for Mac
* Add relative path for database
* Enable items on context menu
2019-01-24 15:38:21 -06:00
zkoria
27d639a986 test Clean local folder case. 2019-01-24 12:47:39 -06:00
Camila San
8499df8a7c Fixes conflicting files.
Signed-off-by: Camila San <hello@camila.codes>
2019-01-24 10:19:40 +01:00
Camila San
80ba3adc33 Does not change the file mode when user touches it.
- Always sync the file but do not change mode.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-22 20:12:04 +01:00
zkoria
c149465f80 update socketapi.cpp 2019-01-21 22:50:10 -06:00
Camila San
cd1c5922d1 Fixes syncing of files in sub directories.
- Paths were being set in the wrong way in the local file tree.
- TODO: refactor it. It can be done better.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-22 01:50:44 +01:00
zkoria
483630667b update socketapi.cpp 2019-01-21 16:44:40 -06:00
Camila San
f746c74bf8 Makes sure to set all files touched by the user to offline.
- After setting to offline, sync it.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-21 00:06:52 +01:00
zkoria
63a591b5fd activate CleanLocalFolder case. 2019-01-18 13:45:22 -06:00
zkoria
8ba1fdb642 update Sync Icons for Win (2). 2019-01-18 03:45:36 -06:00
zkoria
5bb63b93cc update Sync Icons for Win. 2019-01-17 19:54:36 -06:00
Camila San
1c1111fb7b Fixes syncing of files in directories.
- Folders that are set to online get their files ignored by the sync
engine.
- Minor change: remove qdebug message from csync.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-17 13:32:27 +01:00
Camila San
cd6225d418 Fixes deleting of files in the server.
- Also correctly add calls for syncing in the correct places.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-17 00:36:53 +01:00
Camila San
848993baab Merge branch 'filestreaming-v5' of https://github.com/nextcloud/desktop into filestreaming-v5 2019-01-16 13:27:54 +01:00
Camila San
06b32222a4 Only syncs offline files.
- Checks if files are offline before downloading it.
- Updates last access once syncing is done.
- In vfs_windows calls for syncing only where is needed: openfile,
delete and write (WIP)

Signed-off-by: Camila San <hello@camila.codes>
2019-01-16 01:27:51 +01:00
Camila San
37028c7e19 Only syncs offline files.
- Checks if files are offline before downloading it.
- Updates last access once syncing is done.
- In vfs_windows calls for syncing only where is needed: openfile,
delete and write (WIP)

Signed-off-by: Camila San <hello@camila.codes>
2019-01-15 22:42:17 +01:00
Camila San
3536c55ae4 Fixes syncing files in subfolders.
Signed-off-by: Camila San <hello@camila.codes>
2019-01-15 20:34:14 +01:00
Camila San
f337125818 Removes last slash from path to folder.
- Extra slash in the end was causing error when trying to open and read
dir on Windows.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-15 16:15:29 +01:00
zkoria
80dfe2a703 fixpath 2019-01-14 12:57:11 -06:00
Camila San
c89d3d97bc To test: fixes wrong file path.
- For the database we needed to use the relative path to the file.
- Fixes path before we do requests to the sync engine.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-14 17:36:06 +01:00
zkoria
9035995cda Tranfor virtual path to real path. 2019-01-11 13:17:22 -06:00
zkoria
e7470fd57b Sync Icons for Win 2019-01-10 18:25:18 -06:00
zkoria
aba6ebece7 End points createFile, moveFile, createDirectory, moveDirectory 2019-01-10 11:39:48 -06:00
Bani Azarael Mejia Flores
ffa35c183c Sync Icons for Mac 2019-01-03 16:25:42 -06:00
Camila San
f848e21768 Do not overwrite the instruction given by FUSE.
- The instruction given by fuse was overwritten with 'new'.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-03 09:48:34 -08:00
Camila San
8ca06ff0ec Fixes crash on the first run.
- SyncJournalDb instance was null when _syncJournalDb variable was
created in SyncWrapper.

Signed-off-by: Camila San <hello@camila.codes>
2019-01-03 06:17:28 -08:00
Camila San
b886bb9c15 Uses local discovery method for opening local directory.
Signed-off-by: Camila San <hello@camila.codes>
2018-12-28 17:16:06 +01:00
Camila San
181bbebd6f Fixes check if file gets excluded by _csync_detect_update on Windows.
- The code os commented out because of the changes made to search the
file in the folder.

Signed-off-by: Camila San <hello@camila.codes>
2018-12-24 14:06:54 -08:00
Camila San
98c8fa21c9 Fixes exception "directory or file invalid" on Windows.
- Refactores solution to get file information on Windows.
- Do not update the local tree again after finishing sync.

Signed-off-by: Camila San <hello@camila.codes>
2018-12-24 07:10:09 -08:00
Camila San
6eb4986e11 Replaces Qt::DirectConnection for Qt::QueuedConnection.
- The sync engine needed to run in the main thread not in the FUSE
thread.

Signed-off-by: Camila San <hello@camila.codes>
2018-12-18 06:49:24 -08:00
Camila San
c19ecb3c8b Replaces timeout value for ULONG_MAX in discovery remote phase.
Signed-off-by: Camila San <hello@camila.codes>
2018-12-07 15:13:52 +01:00
Camila San
4d8dfae25f Removes logic that cleaned up trail slash in the beginning of the path.
It wasn't necessary.

Signed-off-by: Camila San <hello@camila.codes>
2018-12-07 15:13:28 +01:00
Camila San
dbe3b662db Removes repeated call to schedule sync.
Signed-off-by: Camila San <hello@camila.codes>
2018-12-06 14:28:04 +01:00
Roeland Jago Douma
4d57f27c51 Do not fetch activities if they are not enabled
Fixes #788
Fixes #834

If the activity app is not enabled we should not try to fetch the
activities at all.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-06 14:18:35 +01:00
Hitss
79a2b0488f 2 Update windows trigger openFile. 2018-12-05 11:04:26 +01:00
Hitss
73e79fd40f Update windows trigger openFile. 2018-12-05 11:04:06 +01:00
Camila San
59ed4f3fa7 Checks if current thread can call sync start timer otherwise calls start sync directly.
Signed-off-by: Camila San <hello@camila.codes>
2018-12-02 13:51:43 -08:00
Camila San
6b050b9c50 Checks only for the given filename in the directory when adding file to local tree.
Signed-off-by: Camila San <hello@camila.codes>
2018-12-02 13:48:32 -08:00
Hitss
e100ae15d2 Update, windows-dokan FindFiles accept rootDirectory cachedFiles. 2018-11-30 01:32:09 -08:00
Camila San
bcb0f2cd62 Adds function to look for file in the folder when adding it the local
file tree.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-26 08:45:20 -08:00
Camila San
ff62968cb8 Sets up syncing on fuse for Windows.
- Adds signals for triggering syncing for fuse operations.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-26 08:43:36 -08:00
Camila San
d9ca247db3 Uses FolderMan functions to prepare folder for syncing.
And then calls the sync.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-26 08:42:39 -08:00
Camila San
9235c7cc7f Fixes comments in VfsMac.
Signed-off-by: Camila San <hello@camila.codes>
2018-11-26 07:37:24 -08:00
Camila San
3344e18cf0 Adds syncwrapper.cpp to CMakelists.txt for Windows.
Signed-off-by: Camila San <hello@camila.codes>
2018-11-26 07:34:22 -08:00
Camila San
9667421cff Handles release file at path instruction.
- TODO: remote discovery times out leading the sync engine to think that there are new files instead of syncing them correctly.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-25 12:10:23 +01:00
Camila San
8db3b4b790 It checks if path given to local discovery is a directory and then checks for files under it.
Signed-off-by: Camila San <hello@camila.codes>
2018-11-24 22:08:21 +01:00
Camila San
7a842d14ad Uses only signal/slot to connect fuse drive operation to the sync engine.
- Uses QMutex + QWaitCondition to handle requestes to the sync engine.
- Refactores most of the SyncWrapper.
- Defines time out for the remote discoveryphase (TODO).

Signed-off-by: Camila San <hello@camila.codes>
2018-11-22 22:28:50 +01:00
Camila San
ea0a49be67 Removes unused QThread for fuse.
Signed-off-by: Camila San <hello@camila.codes>
2018-11-14 22:47:26 +01:00
Camila San
15f7b7641c Comments out the use of time controller local discovery.
- Also call sync engine startSync with a direct connection.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-14 22:47:26 +01:00
Jesús Deloya
1392b81e49 Merge of conflicting files 2018-11-14 10:00:32 -06:00
Jesús Deloya
d13c0ce6f2 Fix for exluding finder process on openfileatpath 2018-11-14 09:49:59 -06:00
Camila San
5f974b91ac Refactores selective sync.
- Integrates sync with currrent FUSE code - still needs fixing.
- Fixes return of getProcessName function by using QString.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 21:41:15 +01:00
Camila San
22ee266f4d Refactores selective sync.
- Integrates sync with currrent FUSE code - still needs fixing.
- Fixes return of getProcessName function by using QString.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 19:05:56 +01:00
Camila San
9fc90a5aeb Fixes libproc.h header missing and file encoding.
UTF-8 should be the deault encoding.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 14:42:06 +01:00
Camila San
363d16d02f Adds update local tree function to SyncEngine.
Also removes unused code for start syncing with fuse.
Now it is using the same StartSync function as before.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 13:38:25 +01:00
Camila San
1fa89d0d76 Removes logic to not queue task if file is not offline.
The filtering out of online files is done in csync now.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 13:38:25 +01:00
Camila San
afbaef3f75 Adds update local tree function to SyncWrapper/Folder/SyncEngine/csync.
Fuse -> SyncWrapper -> Folder -> SyncEngine -> csync.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 13:38:19 +01:00
Camila San
144852b023 Adds function to update or insert files in the local file tree.
It uses the same logic used previously to do the local discovery.
This time it process one single file: csync_update_file -> csync_vio_opendir (only to get the handle) ->
csync_vio_read_file (creates csync_file_stat_t) -> csync_walker -> _csync_detect_update.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 12:09:32 +01:00
Camila San
7f147d414e First attempt to use selective sync correctly by skipping local discovery.
It skips local discovery. It uses the information that fuse provides about the local files instead.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 12:09:32 +01:00
Camila San
522068a45f It syncs all files set to OFFLINE.
This version still uses the timer and the usual discovery to sync files to the cache.
Forcing sync is also possible via the UI. Since we still have 0 byte files created in the cache,
the sync engine interprets them as conflict.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 12:09:25 +01:00
Camila San
196ff7d692 Interrupt search for files in path once the path is found in the Fuse drive.
Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 11:40:33 +01:00
Camila San
5a0b954308 Sets SyncMode and SyncModeDownload for the fuse drive files once the list is retrived.
Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 11:40:33 +01:00
Camila San
5dfc577347 It checks file syncmode before queueing it for download.
Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 11:40:33 +01:00
Camila San
ed8a9b3d03 Removes option to add more folders to sync.
Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 11:40:32 +01:00
Camila San
b3c07d4b27 Removes unused var in OwncloudSetupWizard::slotAssistantFinished.
Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 11:40:32 +01:00
Camila San
0bca618c08 Allows the adding of only one folder.
FolderMan uses only _currentSyncFolder.

Signed-off-by: Camila San <hello@camila.codes>
2018-11-13 11:40:25 +01:00
Hitss
2e7955ee15 Fix multiples call OpenFile from Finder. 2018-11-12 17:38:38 -06:00
Bani Azarael
e253499d42 Remove unused library 2018-11-01 15:50:42 -06:00
Bani Azarael
389ad46eee Fix for OpenFile in compressed files 2018-11-01 15:47:48 -06:00
Bani Azarael
600f35f777 Fix Check selection option contextual menu FS 2018-10-24 14:17:59 -05:00
Bani Azarael
967653d081 Check selection option contextual menu FS 2018-10-24 14:12:49 -05:00
Jonathan Ponciano Vera
2e4c531604 Code to umount dokan-windows drive on close 2018-10-17 12:05:40 -05:00
Bani Azarael
b683f7c893 Update hidden directory sync from Dokan-Windows 2018-10-12 17:22:28 -05:00
Bani Azarael
6b2c6c8aec Revert Fix shorten login 2018-10-12 15:05:30 -05:00
Bani Azarael
0206911639 Fix shorten login 2018-10-12 12:51:47 -05:00
Jonathan Ponciano Vera
30fb13efca Update dokan lib for windows. 2018-10-11 18:02:22 -05:00
Jonathan Ponciano Vera
0a4476a1fc Merge branch 'filestreaming' of https://github.com/nextcloud/desktop into filestreaming 2018-10-11 17:59:28 -05:00
Jonathan Ponciano Vera
6dff1bafcc Endpoints functions for use case windows. 2018-10-11 17:59:09 -05:00
Camila San
5335995f0e Skips folder configuration when adding an user.
Signed-off-by: Camila San <hello@camila.codes>
2018-10-11 23:10:56 +02:00
Camila San
189812d05a Fixes header and assert for syncjournaldb instance.
Signed-off-by: Camila San <hello@camila.codes>
2018-10-11 15:51:07 +02:00
Camila San
14c3aeac52 Adds OpenSSL initialization that it was commented out.
Signed-off-by: Camila San <hello@camila.codes>
2018-10-10 16:40:36 +02:00
Camila San
2c922e80a7 Fixes CMake find_package for OpenSSL.
Signed-off-by: Camila San <hello@camila.codes>
2018-10-10 15:51:14 +02:00
Camila San
552c8c703c Fixes header in dokanLib/public.h.
Signed-off-by: Camila San <hello@camila.codes>
2018-10-10 15:49:34 +02:00
Akula
cbc5ab2a30 Full update for filestreaming Windows 2018-09-18 16:52:56 -05:00
Jesús Deloya
b2964c14d5 Next cloud icons on mounted file system for mac 2018-09-13 16:56:23 -05:00
Jesús Deloya
306a5d1fd4 Windows integration 2018-09-12 17:57:53 -05:00
Jesús Deloya
be35a173b2 Merge with main branch to compile 2018-09-12 16:26:08 -05:00
Jesús Deloya
5b6ce89f51 Correction of pkgproject name 2018-09-12 15:15:07 -05:00
Jesús Deloya
5b21683bc8 Error fixes 2018-09-11 17:26:11 -05:00
Jesús Deloya
6c80f9ed1e Error corrections 2018-09-10 13:03:05 -05:00
Jesús Deloya
55aa3d8d78 Error corrections 2018-09-10 12:04:02 -05:00
Jesús Deloya
534f246a83 Merge branch 'filestreaming' of https://github.com/nextcloud/desktop into filestreaming 2018-09-07 10:14:54 -05:00
Jesús Deloya
3728ba5388 Changes for current version of nextcloud 2018-09-07 10:14:43 -05:00
Jonathan Ponciano Vera
0d59aee335 fix for contextmenu 2018-09-05 17:58:35 -05:00
Jesús Deloya
45745e7dc7 Virtual File System for windows 2018-09-05 16:49:10 -05:00
Jesús Deloya
1f456061b6 Last updates for file streaming, including file cache view 2018-09-05 16:16:10 -05:00
Jesús Deloya
28760f7b1b syncjournal db modification for syncmode table 2018-08-22 11:30:23 -05:00
Jesús Deloya
eeb455c54f OSXFuse integration to use a cache folder to sync server files. 2018-08-03 15:35:43 -05:00
Camila Ayres
e0f49971f9 Merge pull request #525 from nextcloud/feature/132/about_dialog
Add legal notice button to about dialog
2018-08-02 22:32:56 +02:00
Roeland Jago Douma
c4d7f97e00 Add legal notice button to about dialog
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-02 22:17:11 +02:00
Roeland Jago Douma
30fc87daea Merge pull request #344 from nextcloud/fix-share-dialog
Fix share dialog
2018-08-02 22:13:30 +02:00
Roeland Jago Douma
aa4ff0c083 Fix include order
Because why not :S

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-02 21:19:57 +02:00
Camila San
9d087b920b Inserts ShareDialogStartPage in the correct position in the share dialog.
- With the new UI this had to be adapted.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 20:23:26 +02:00
Camila San
2cd32261a2 Checks if share link exists before settings password.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 20:22:37 +02:00
Camila San
8e0398426d Replaces 'more' (3 dots) png icon for svg in buttons of the share
dialog.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 20:21:11 +02:00
Camila San
44865e0107 Adjustes sizes and margins in the share dialog and its widgets.
- Adds TODO's in commented out code.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
c2c2fe3ce3 Changes Share User/Group widget UI to match the server share UI.
- Display list of permissions in the tool button menu.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
25ff932a0b Fixes edit permission on share link for files and folders.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
5b7970fed7 Updates client.qrc with new icon 'copy' for share link menu options.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
b14aa11c29 Changes share link layout so it looks like the UI on the server.
- Adds icons to Share link and to save password on share dialog.
- Changes wording of the menu options for sharing link.
- Adds functionality to the new menu (mostly permissions).
- More widget size and size policy adjustments.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:16 +02:00
Camila San
a19904657a Switches order of widgets in share dialog: share link comes first.
- First text input to search for users,then share link and then the list
of users.
- Adjusts size and scroll bar for sharees list.
- Adds option 'can share' to 3 dots menu in share user/group widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:52:28 +02:00
Camila San
7aff1e27c0 Fixes share users/groups widget.
- Existing sharees where not being displayed.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:52:28 +02:00
Camila San
55b0b46bb6 Changes size, size policy, content and margins of the share dialog and its widgets.
- Adds select with permissions to share dialog on the user/group search.
- Changes order of widgets, removes excess of text and do not display empty widgets.
- Share user/group widget: replaces combo box for tool button with permissions.
- Using Fixed as size policy it gives a much smoother user experience
when windows size dinamically changes.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:52:27 +02:00
Camila San
4ecfab4bf3 Improves share dialog.
- Removes the tabs: adds items to a vertical layout.
- Fix spacing and alignment.
- Removes extra text.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:48:42 +02:00
Nextcloud bot
34acc095c7 [tx-robot] updated from transifex 2018-08-02 00:48:46 +00:00
Camila Ayres
00e2d4ef93 Merge pull request #523 from nextcloud/fix-navigation-apps
Fixes crash on mac OS and linux.
2018-08-01 15:45:06 +02:00
Camila Ayres
2fd6f3583b Merge branch 'master' into fix-navigation-apps 2018-08-01 15:20:33 +02:00
Nextcloud bot
49be437bfa [tx-robot] updated from transifex 2018-08-01 00:46:14 +00:00
Camila San
0ac532f5c9 Fixes crash on mac OS and linux.
- The crash was happening when the user could not connect and it would
crash on trying to retrieve and display the navigation apps.
- Checks AccountStatePtr earlier in the function
slotNavigationAppsFetched.
- Cast of pointer stored in QVariant to QMenu was not done correctly -
qvariant_cast works best for user type defined or QMetaType known to
QVariant.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-01 00:28:25 +02:00
Roeland Jago Douma
5be1bcd8b0 Merge pull request #439 from nextcloud/feature/noid/register
Providers integration
2018-07-31 14:21:51 +02:00
Julius Härtl
bc96ec8ae1 Fix styling
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-31 13:35:37 +02:00
Julius Härtl
3159a36f25 Make build optional
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-31 13:35:36 +02:00
Julius Härtl
156605c2fa Use proper URL
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-31 13:35:36 +02:00
Julius Härtl
18f1452b04 Add slideshow images
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-31 13:35:36 +02:00
Julius Härtl
295750555d Allow to use provider registration with flow auth
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-31 13:35:35 +02:00
Nextcloud bot
60bc5c378c [tx-robot] updated from transifex 2018-07-31 00:48:58 +00:00
Roeland Jago Douma
fa5026bba7 Merge pull request #491 from nextcloud/fix-activities-v2
Fix activities v2
2018-07-30 22:39:08 +02:00
Camila San
32bb1ca449 Aligns copy button to the left in the activity widget.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
a149660ae9 Enables again alternate row color in the activity list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
524a3d4c6a Returns default icon when no status matches any of the check for SyncFileItem::Status.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
90a2d5a3e7 Aligns text correcty when not all text has content in the activity list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
156b4cf284 Aligns time vertically on the bottom of the notification action text when there is no message.
- Minor fix: gives less space for long text that needed ellipses which
was not showing and set right margin because otherwise text was not
painted correctly and completly.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
ee612bda3a Fixes crash when folder it is not set in the activity list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:03 +02:00
Camila San
a1cab471e8 Comments out slotProgressInfo.
- Added TODO.
- It seems to be working only in some cases.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
f294cf1b93 Changes icons for errors and warnings in the activity list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
31892f5337 Changes background color to white for the Activity list widget.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
e9dbee0df5 Removes alternate color on the rows of Activity Widget.
- Also fixes the click on each activity: the user had to click twice -
one to select the row and then one click to open file manager or
browser.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
9cbf5aa783 Changes icons for actions in Activity List.
- For folder (open file manager) and close (dismiss
notification).

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
36a73432bc Implements ActivityWidget::slotProgressInfo.
- Attempts to implement slot as it was in the old IssuesWidget.
- It should clean up the activity list when needed -  e.g. when file
conflict was solved.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
b2834e047d Refactores ActivityListModel::removeFromActivityList.
- Fixes crash when dismissing notification - notification was being
removed from the wrong list.
- Minor changes: removes AccountStatePtr where it was needed anymore now
that ActivityListModel has an _accountState, it doesn't need to be
checked for each activity/notification.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f63434b856 Stores folder in ActivityData.
- The information is needed on ActivityWidget::slotProgressInfo.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
7bc9275a8c Separates types of errors: SyncErrorType and SyncFileItemType.
- This follows what the enums already being used SynResult::Status and
SyncFileItem::Status.
- Do not display buttons for FileErrorTypes - since they are errors on
local syncing, there is nothing to do in the server.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
7b1569df81 Removes static const from activity widget.
- It didn't need to be static.
- It crashed on Windows (Visual Studio 15 2017 Win64).

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f85825dee4 Adds header and forward declaration of 'QMouseEvent' to ActivityItemDelegate.
To fix compiling for Qt5.7 (drone error).

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
3673603e5a Fixes buttons clickable area in the activities list.
- Their size was not correctly calculated so it was hard to filter the
clicks on the list. User had to click multiple times before clicking on
the right acceptable area.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
9f9be7814c Adjust space between action/buttons in the toolbar.
- Minor: cleans up code used for debug.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
938c99ec42 Fixes and improves 'copy to clipboard' output.
- With the merging of activities and notifications the copy to clipboard
function got broken. Had to put it back as it was before.
- The output text from the clipboard was almost unreadeable. Ajusted the
space between texts and used separator '-' instead of ','.
- Minor: cleans up comments.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
4a6b7854f5 Adds 'Join' string for call notifications.
- Stores object_type from the api response to check if notification is a
call so the primary button text and action is 'Join'.
- Puts strings into consts.
- Minor change: Improves comments on ActivityListModel.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
00effb0e2f Adds 'accept' button for remote share notifications.
- Stores object_type form the api response to check if notification is
remote_share, so the primary button text is 'accept' instead of 'more
information'.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f0ca5dbded Fix settings dialog for mac.
- Fixes adding/removing accounts with separator in the toolbar -
accounts were not added in the right order and removing was not
including the separator.
- Fixes button sizes in the activities list - the buttons were too small
for the text.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
11484d5588 Removes Protocol and Issues widget files and references.
- Minor changes:
 - Improves comments and qCWarning  messages
 - Removes commented out code.
 - adds TODO's.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
ab3c6da5d7 Gives full path to file to open in file manager.
- The path to the file wa being stored in the wrong activity property.
It was in the action link when it should be in the file.
- Minor: comments out the display of issues and protocol widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f402b1d9e4 Changes icons for opening in file manager and to dismiss notification.
- The icons used before were not really clear on what their function
was.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
ec51428e4d Fixes the url for the button 'more information'.
- The url for the browser was not full path to the file.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
64d635a046 Fixes the color of the font.
- It was too light when the row was selected.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
9de3985021 Small fixes.
- Align progress indicator to the center.
- Moves unused code.
- Removes unused labels.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
a9cd3b3a6d Merges errors and protocols into notifications/activities.
- Errors will always be on top, then Notifications comes next and then Activities for last.
- Adds 2 new types of Activity: NotificationType and ErrorType.
- ActivityListModel and ActivityWidget stores AccountState to connect user and widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
d0c72dd642 Makes space smaller bewteen user/activities and network/settings menu.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
9ad2a980ce Moves the separator to between accounts.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
7e8b5f34d7 Fixes the text length for activities.
- Activities from the server don't have buttons to interact with so
their content can use the full lenght of the row.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
918ccb1ed3 Removes row when notification is dismissed.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
e3c7a5a2ff Changes Activity list view icons, buttons and drawing.
- Displays the notification icon when available.
- Adds dismiss button with an icon.
- Handles buttons actions in the list view.
- Changes what is painted first (activityitemdelegate) for each row in
the activity list.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
00a73b5ded Adds class to retrieve icons.
- This is an attempt to cache the icons.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
49377976db Removes notification row from the view when clicking on Dismiss.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
ef4a30fcb9 Displays a menu once the user clicks on the button in the notifications.
- In activityitemdelegate the mouse events are filtered (ActivityItemDelegate::editorEvent) to check if the user clicked
on a button in the list of activities/notifications. Then a signal is emitted to ActivityWidget that does the rest:
show submenu when there are more options, open browser, open file manager, send request to server.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
9ad01f0819 Fixes order of the notifications: latest on top.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
7fa5e41e8d Only displays buttons if it is a notification and adjust space left.
- Do not display buttons for activities.
- Adds correctly text and button in the space left depending on the widget size.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
4e4a0da3b7 Returns the activity type to the list view.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
2350b41dc3 List model returns the list of actions for each activity.
- The list of possible actions (server requests( was not being used in
the activityitemdelegate. This is needed to be able to draw the primary
action buttons and other options for each notification in the view.)
- Minor changes:
  - Uses different icons for activities and notifications in the list view.
  - Align elements in the list view of notifications/activities properly.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
d1f4f8a558 Correctly removes actions - account, separator and settings widget from toolbar when account is removed.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
a6331c7a75 Fixes widget stack visibility when switching actions.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
22a6303c9d Adds space bewteen different accounts and activity.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
1b1468a9c6 Each user has its own list of activities.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
b13f77c0fb Adds one activity widget for each user.
- ActivityListModel and ActivityWidget stores an AccountState to connect user and widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
8e0c036fc3 Aligns Network and General to the right.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
75c2613b1b Displays activity and notification messages in the list view.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
908870ccde Adds notifications to the Activities list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:57 +02:00
Roeland Jago Douma
30a4f1edd7 Merge pull request #510 from ivaradi/beta-ppa
Use the beta PPA for builds (re #402)
2018-07-30 20:34:05 +02:00
Roeland Jago Douma
9722fbc151 Merge pull request #507 from doits/allow_macos_gpu_switching
allow to switch to the integrated gpu on MacOS
2018-07-30 20:33:41 +02:00
Roeland Jago Douma
7fccae7875 Merge pull request #509 from ivaradi/artful-cosmic
Stop building for Artful, enable Cosmic
2018-07-30 20:32:56 +02:00
Nextcloud bot
d49aadaf76 [tx-robot] updated from transifex 2018-07-30 00:50:31 +00:00
Nextcloud bot
adb6606e6f [tx-robot] updated from transifex 2018-07-29 00:48:28 +00:00
Nextcloud bot
e0a1b00d3e [tx-robot] updated from transifex 2018-07-28 00:47:08 +00:00
István Váradi
c2ceb173b1 Merge branch 'master' into beta-ppa 2018-07-27 21:00:01 +02:00
István Váradi
5f74baabeb Merge branch 'master' into artful-cosmic 2018-07-27 20:59:44 +02:00
Nextcloud bot
c38fa06754 [tx-robot] updated from transifex 2018-07-27 00:48:48 +00:00
István Váradi
d63bcb4d4b Use the beta PPA for builds (re #402) 2018-07-26 20:19:18 +02:00
István Váradi
dd9e12fe43 Start building for cosmic 2018-07-26 20:08:48 +02:00
István Váradi
8e92f87694 Stop building for artful 2018-07-26 20:07:36 +02:00
Markus Doits
2335688b68 allow to switch to the integrated gpu on MacOS
without that key, the client automatically runs on the dedicated gpu (if
present). now it allows the system to use the integrated one.

closes #501
2018-07-25 09:35:53 +02:00
Nextcloud bot
69b6f5a019 [tx-robot] updated from transifex 2018-07-25 00:46:45 +00:00
Roeland Jago Douma
1af353cb2f Merge pull request #503 from ivaradi/libgnome-keyring0
Add a dependency on libgnome-keyring0 on Bionic
2018-07-24 13:26:05 +02:00
István Váradi
d228aa8644 Merge branch 'master' into libgnome-keyring0 2018-07-23 14:50:37 +02:00
Nextcloud bot
7f829a88bf [tx-robot] updated from transifex 2018-07-23 00:46:53 +00:00
István Váradi
df9cc8396a Add a dependency on libgnome-keyring0 on Bionic 2018-07-22 20:33:45 +02:00
Nextcloud bot
df4fb880c2 [tx-robot] updated from transifex 2018-07-22 00:52:57 +00:00
Nextcloud bot
e45a37df73 [tx-robot] updated from transifex 2018-07-20 00:46:28 +00:00
Nextcloud bot
b0ec091e04 [tx-robot] updated from transifex 2018-07-19 00:45:48 +00:00
Nextcloud bot
0c44b32843 [tx-robot] updated from transifex 2018-07-18 00:45:39 +00:00
Camila Ayres
720960f0be Merge pull request #497 from nextcloud/readme-updates
Updates the README with build instructions.
2018-07-16 12:35:23 +02:00
Camila Ayres
2511105cce Adds link to wiki page 'System requirements' to README. 2018-07-16 11:31:34 +02:00
Camila Ayres
7e63fd535e Updates the README with build instructions.
- Adds a shorter version of how to build the client but the extended version will be kept on the Wiki.
- Makes the instructions available if you clone the repo and work offline.
2018-07-16 11:09:05 +02:00
Nextcloud bot
0898ada696 [tx-robot] updated from transifex 2018-07-16 00:45:09 +00:00
Nextcloud bot
dce17b4bd3 [tx-robot] updated from transifex 2018-07-15 00:45:32 +00:00
Nextcloud bot
edf28d9191 [tx-robot] updated from transifex 2018-07-13 00:48:03 +00:00
Camila Ayres
d70e2d5c02 Merge pull request #490 from nextcloud/nickvergessen-patch-1
Link IRC to webchat so people without a client can do something.
2018-07-11 09:37:53 +02:00
Joas Schilling
dd154c7505 Link IRC to webchat so people without a client can do something
Also note that github doesn't render irc:// links, so it just showed the name
2018-07-11 09:04:03 +02:00
Nextcloud bot
716f88e222 [tx-robot] updated from transifex 2018-07-11 00:47:26 +00:00
Nextcloud bot
62708dea13 [tx-robot] updated from transifex 2018-07-10 09:12:30 +00:00
Nextcloud bot
4f164d1e23 [tx-robot] updated from transifex 2018-07-07 00:40:31 +00:00
Nextcloud bot
e6d46cba17 [tx-robot] updated from transifex 2018-07-06 00:41:45 +00:00
Roeland Jago Douma
e69d56a0cd Merge pull request #395 from nextcloud/upstream/pr/6388
OwnSql: Some refactoring
2018-07-04 13:34:44 +02:00
Camila Ayres
f1c4b76669 Merge branch 'master' into upstream/pr/6388 2018-07-04 10:12:42 +02:00
Nextcloud bot
41ca5388e9 [tx-robot] updated from transifex 2018-07-04 00:41:40 +00:00
Roeland Jago Douma
24efdd3b45 Fix E2E query
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 11:40:58 +02:00
Roeland Jago Douma
6c11c1aa73 Fix query
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 10:33:26 +02:00
Olivier Goffart
d114212333 OwnSql: Fixup after feedback for #6388 2018-07-03 10:33:26 +02:00
Olivier Goffart
779969f865 OwnSql: Put the SQL queries next to their use.
This avoid haivng to modify 4 places when we want to add a query
2018-07-03 10:33:26 +02:00
Olivier Goffart
518fb90757 OwnSql: Some refactoring
Use QByteArray for the query so we don't have to convert twice.
Automatically finish the query when the DB close, so we don't
have to call reset
2018-07-03 10:33:26 +02:00
Roeland Jago Douma
b309a1c8c4 Merge pull request #401 from nextcloud/upstream/pr/6456
Issues: Show link to conflicts doc if there are some #6396
2018-07-03 10:32:09 +02:00
Christian Kamm
4fa6fff1a9 Doc: Explaining conflict files and resolving them #6396 2018-07-03 10:18:20 +02:00
Christian Kamm
d549c77af6 Issues: Show link to conflicts doc if there are some #6396
The link url is themed.
2018-07-03 10:18:18 +02:00
Roeland Jago Douma
b527013ad8 Merge pull request #402 from ivaradi/master
Use the VERSION.cmake file to determine Ubuntu/Debian main package version
2018-07-03 10:17:42 +02:00
István Váradi
e6cc593516 Revert "Do not require exact version for WebEngine dependencies"
This reverts commit dcceec25c89e935b59c921ae22c66199f8642531.
2018-07-03 09:11:31 +02:00
István Váradi
dec5473eec The version is also read from the VERSION.cmake file 2018-07-03 09:11:31 +02:00
István Váradi
ced4cad329 Do not require exact version for WebEngine dependencies 2018-07-03 09:11:31 +02:00
Camila Ayres
b18c62dc41 Merge pull request #472 from nextcloud/feature/noid/loginflow_accept_language
Set Accept-language header for webview requests
2018-07-03 08:52:11 +02:00
Roeland Jago Douma
0d70b05b65 Set Accept-language header for webview requests
This way the server will properly translate it for you if it has
translations.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 07:45:02 +02:00
Nextcloud bot
44205359a5 [tx-robot] updated from transifex 2018-07-03 00:44:23 +00:00
Camila Ayres
2361076b75 Merge pull request #471 from nextcloud/fix/458/do_not_show_webview_by_default
Do not force to show the webview on construct
2018-07-02 22:22:40 +02:00
Camila Ayres
9627aad04c Merge branch 'master' into fix/458/do_not_show_webview_by_default 2018-07-02 22:01:03 +02:00
Roeland Jago Douma
cbf417664d Merge pull request #404 from nextcloud/upstream/pr/6491
Proxy settings: Fix bad behavior with empty host
2018-07-02 21:25:53 +02:00
Christian Kamm
70b5d54082 Proxy settings: Fix bad behavior with empty host
Fixes f6a075ef54 for #5885

When no host is given it shouldn't just *appear* that there is no
proxy, there actually shouldn't be a proxy set then.
2018-07-02 21:15:30 +02:00
Roeland Jago Douma
34d964fc80 Do not force to show the webview on construct
Should fix #458

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 20:09:30 +02:00
Roeland Jago Douma
93c6576bcb Merge pull request #470 from nextcloud/update-readme
Adds item about Code of Conduct in the README.
2018-07-02 19:48:07 +02:00
Camila San
4adade9818 More polishing the emojis markdown in the README.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:50:40 +02:00
Camila San
cb6506e3f1 More polishing the emojis markdown in the README.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:25:10 +02:00
Camila San
165b164e95 Fixes CoC links in the README.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:21:35 +02:00
Camila San
c437ffc95f Adds 'Code of Conduct' item to the README.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:17:32 +02:00
Roeland Jago Douma
9bb58550ff Merge pull request #469 from nextcloud/update-readme
Updates the README
2018-07-02 18:11:32 +02:00
Camila San
3bf8002708 README: changes emoji markup positions.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:06:59 +02:00
Camila San
74dedf636c README: trying some emoji markup.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 17:47:12 +02:00
Camila San
19f1513af0 Fixes link, put items in a list in the README.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 17:29:05 +02:00
Camila San
ee668eb6cd Changes the order of the content in the README.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 17:24:57 +02:00
Camila San
65cb94c316 Updates the README with info about the daily builds and how to compile the client.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 17:06:48 +02:00
Camila Ayres
178edb97bc Merge pull request #466 from nextcloud/fix_compile_warnings
Fix compile warnings
2018-07-02 13:50:04 +02:00
Roeland Jago Douma
08abc71acb gui Q_UNUSED
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 13:02:15 +02:00
Roeland Jago Douma
ce545b1e47 propage*encrypted Q_UNUSED
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 12:45:44 +02:00
Roeland Jago Douma
e871359453 Remove unneeded ;
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 11:03:58 +02:00
Roeland Jago Douma
b952fa64ee Restore logger installation
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 11:01:52 +02:00
Nextcloud bot
027565e571 [tx-robot] updated from transifex 2018-07-02 00:42:35 +00:00
Nextcloud bot
09e2a4af60 [tx-robot] updated from transifex 2018-07-01 00:44:43 +00:00
Julius Härtl
bc7ef87d18 Merge pull request #460 from nextcloud/no_trademark_text
Remove default trademark text
2018-06-29 22:56:28 +02:00
Roeland Jago Douma
d2b75cabb2 Remove default trademark text
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 21:36:18 +02:00
Nextcloud bot
85cee68f1d [tx-robot] updated from transifex 2018-06-29 00:46:29 +00:00
Roeland Jago Douma
70d7676794 Merge pull request #440 from nextcloud/fix/runtestsci
Run unit tests on drone
2018-06-28 21:55:15 +02:00
Roeland Jago Douma
97ea6c54bc Run tests on drone
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-28 14:50:35 +02:00
Camila Ayres
ff23e99a9a Merge pull request #389 from nextcloud/upstream/pr/6426
Theme: unify ownCloudTheme and Theme classes
2018-06-28 14:39:17 +02:00
Roeland Jago Douma
38b89a3fa0 Update testutility
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-28 13:37:02 +02:00
Roeland Jago Douma
6ab7e814a5 Fix tests to actually compile
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-28 13:37:02 +02:00
Roeland Jago Douma
595cbfaa16 Update urls
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-28 12:46:47 +02:00
Camila San
4c7b7dfcaa Restores previous text in the about section.
Signed-off-by: Camila San <hello@camila.codes>
2018-06-28 12:33:40 +02:00
Olivier Goffart
c5ace2338c Theme: unify ownCloudTheme and Theme classes
The goal is to avoid confusion described in issue #6422 by removing
duplicates between the Theme and owncloudTheme.

 - Use the about from ownCloudTheme everywhere
 - Create default applicationIcons() and condifFileName() that should work
   everywhere
 - trayFolderIcon was removed as it is not used
 - the helpUrl from the default Theme now points to the owncloud client
   documentation. Before there was no help entry by default for branded
   client if the function was not overriden.
 - Do not merge functions that would otherwise break compatibility with
   theme that did not override them. For example colors or customMedia.
2018-06-28 12:33:39 +02:00
Roeland Jago Douma
0c21e4945d Merge pull request #455 from nextcloud/fix/appimage/openssl
Fix/appimage/openssl
2018-06-27 23:26:44 +02:00
Roeland Jago Douma
cd0b638a80 Add openssl 1.0 to appimage as Qt needs it
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-27 23:14:10 +02:00
Roeland Jago Douma
8d70eab8fe Checkout depth of 1 for drone for faster cloning
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-27 23:13:56 +02:00
Roeland Jago Douma
5ce9aedb7a Merge pull request #452 from nextcloud/organize-windows-translation
Windows: moves translation files to /i18n.
2018-06-27 13:14:19 +02:00
Camila Ayres
acc65cdc4a Merge branch 'master' into organize-windows-translation 2018-06-27 12:29:56 +02:00
Nextcloud bot
c36dafa317 [tx-robot] updated from transifex 2018-06-27 00:46:34 +00:00
Camila San
e69a9c61d0 Windows: moves translation files to /i18n.
Signed-off-by: Camila San <hello@camila.codes>
2018-06-26 23:56:34 +02:00
Roeland Jago Douma
aa04f20ad6 Merge pull request #449 from nextcloud/ci/appimage
Build AppImage with Qt-5.11
2018-06-26 21:18:30 +02:00
Roeland Jago Douma
7ce9c22d2c Build AppImage with Qt-5.11
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-26 17:49:00 +02:00
Roeland Jago Douma
106756624a Merge pull request #448 from nextcloud/ci/clang
Add clang build to CI
2018-06-26 17:44:23 +02:00
Camila Ayres
e3815608ab Merge branch 'master' into ci/clang 2018-06-26 17:26:54 +02:00
Camila Ayres
959318adf0 Merge pull request #450 from nextcloud/deps/openssl
We require openssl 1.1
2018-06-26 17:26:16 +02:00
Roeland Jago Douma
c1bebd1253 We require openssl 1.1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-26 16:37:44 +02:00
Roeland Jago Douma
64255f8f09 Add clang build to CI
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-26 15:41:23 +02:00
Julius Härtl
84b7ed04e6 Merge pull request #446 from nextcloud/ci/qt510-qt511
Add Qt-5.10 and Qt-5.11 drone builds
2018-06-26 15:08:51 +02:00
Roeland Jago Douma
0a9185b88c Add Qt-5.10 and Qt-5.11 drone builds
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-26 13:08:34 +02:00
Nextcloud bot
5d96a0e6b6 [tx-robot] updated from transifex 2018-06-25 00:46:38 +00:00
Nextcloud bot
e290b1c353 [tx-robot] updated from transifex 2018-06-24 00:46:16 +00:00
Roeland Jago Douma
1235652cde Merge pull request #442 from nextcloud/fix/noid/appimage_webview
Fix webview appimage
2018-06-23 21:36:47 +02:00
Roeland Jago Douma
2c5e559df6 Bundle NSS because else 💥
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-23 21:29:16 +02:00
Roeland Jago Douma
e79591e52c Bump drone images
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-23 21:29:16 +02:00
Roeland Jago Douma
9eb950bdcf Merge pull request #438 from nextcloud/bugfix/413/hide-decrypt-option
Hide decrypt option since it does only work for empty folders
2018-06-23 21:20:46 +02:00
Julius Härtl
92480ec8fb Hide decrypt option since it does only work for empty folders
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-22 12:13:04 +02:00
Roeland Jago Douma
aff749da12 Merge pull request #437 from nextcloud/feature/150/e2e-indicator
Add indicator to e2e folders
2018-06-22 11:32:22 +02:00
Julius Härtl
e42f5648bd Add indicator to e2e folders
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-22 11:21:30 +02:00
Camila Ayres
73969e2515 Merge pull request #436 from nextcloud/feature/noid/e2e-mnemonic-dialog
Use custom mnemonic dialog.
2018-06-22 11:09:54 +02:00
Julius Härtl
655a43db10 Use custom mnemonic dialog
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-22 10:42:01 +02:00
Roeland Jago Douma
cf93b74028 Merge pull request #432 from nextcloud/feature/157/show_mnemonic
Add a button to E2E accounts to show the mnemonic
2018-06-22 10:15:07 +02:00
Roeland Jago Douma
48a6ef37b2 Add a button to E2E accounts to show the mnemonic
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-21 19:52:27 +02:00
Roeland Jago Douma
a742cbcdce Merge pull request #409 from nextcloud/upstream/pr/6556
Fix make doc-man in shadow build
2018-06-21 19:50:48 +02:00
Roeland Jago Douma
652dd8c812 Merge pull request #410 from nextcloud/upstream/windows-shell-integration
Windows Shell extention: Fix clicking on the menu entries
2018-06-21 19:42:04 +02:00
Olivier Goffart
0d0bff4bf5 Windows Shell extention: Fix clicking on the menu entries
Issue #6553
2018-06-21 19:21:07 +02:00
Camila Ayres
4d60dd6516 Merge pull request #431 from nextcloud/fix/webkit-osx
More fixes for the OSX daily builds.
2018-06-21 15:37:56 +02:00
Roeland Jago Douma
30b211381f More fixes for the OSX daily builds
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-21 15:22:53 +02:00
Nextcloud bot
9bfdb057cd [tx-robot] updated from transifex 2018-06-21 00:50:29 +00:00
Jan-Christoph Borchardt
ae6483862e Merge pull request #416 from nextcloud/bugfix/16/sync-state-icons
Add new sync state icons
2018-06-20 17:36:38 +02:00
Julius Härtl
b4306884c8 Update theme file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-20 16:27:17 +02:00
Julius Härtl
539823e64a Add new icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-20 16:06:20 +02:00
Julius Härtl
0e1302cca5 Remove icons from qrc file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-20 16:06:20 +02:00
Julius Härtl
4ba40a6ce1 Move information icon to warning icon
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-20 16:06:19 +02:00
Julius Härtl
38b4febde6 Remove unused icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-20 16:06:19 +02:00
Roeland Jago Douma
81d8a1ec6b Merge pull request #419 from nextcloud/fix/osx/no_thead_local
Thread local storage don't work properly on OSX
2018-06-20 15:15:15 +02:00
Roeland Jago Douma
9fe77ed7bf Merge pull request #430 from nextcloud/update_mac_deploy-at
Fix macdeployqt
2018-06-20 15:14:43 +02:00
Roeland Jago Douma
cbf3725814 Fix macdeployqt
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 13:05:41 +02:00
Nextcloud bot
bb480061e5 [tx-robot] updated from transifex 2018-06-20 00:48:25 +00:00
Nextcloud bot
a0ad05fb90 [tx-robot] updated from transifex 2018-06-19 00:48:37 +00:00
Nextcloud bot
10f08159bd [tx-robot] updated from transifex 2018-06-17 00:52:06 +00:00
Nextcloud bot
57657ae119 [tx-robot] updated from transifex 2018-06-16 00:52:48 +00:00
Camila Ayres
4aeec032fe Merge branch 'master' into fix/osx/no_thead_local 2018-06-15 10:29:24 +02:00
Nextcloud bot
990af6be2f [tx-robot] updated from transifex 2018-06-15 00:49:45 +00:00
Roeland Jago Douma
f7bf8c7577 Thread local storage don't work properly on OSX
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-14 21:26:07 +02:00
Roeland Jago Douma
f71c74e5aa Merge pull request #418 from nextcloud/fix/nextcloud_sparkle_key
Add our own dsa_pub.pem
2018-06-14 21:06:17 +02:00
Roeland Jago Douma
8b96ef53b9 Add our own dsa_pub.pem
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-14 20:59:27 +02:00
Roeland Jago Douma
2ce79717b2 Merge pull request #412 from nextcloud/upstream/nsis
NSIS: SVG imageformats plugin DLL
2018-06-13 19:52:40 +02:00
Markus Goetz
c04ae70cf5 NSIS: SVG imageformats plugin DLL #6515 2018-06-13 14:57:31 +02:00
Markus Goetz
ae36f36d56 NSIS: SVG DLL #6515 2018-06-13 14:57:30 +02:00
Nextcloud bot
4ad2955a75 [tx-robot] updated from transifex 2018-06-12 00:55:30 +00:00
Roeland Jago Douma
26bf407d62 Merge pull request #400 from nextcloud/upstream/pr/6481
SocketAPI: Allow opening share dialog if contents still syncing #4608
2018-06-11 19:43:01 +02:00
Christian Kamm
ca8f569371 SocketAPI: Remove SHARE_STATUS
It was never used by a shell integration.
2018-06-11 19:35:17 +02:00
Christian Kamm
2bec587d4d SocketAPI: Allow opening share dialog if contents still syncing #4608
With the previous changes the "Share..." action was shown but it didn't
work yet.
2018-06-11 19:35:16 +02:00
Roeland Jago Douma
f31d4ba341 Merge pull request #392 from nextcloud/upstream/pr/6413
Rename local discovery option for clarity
2018-06-11 15:25:03 +02:00
Christian Kamm
16ba0cf47e Blacklist: Add unittest #6411 2018-06-11 14:50:01 +02:00
Christian Kamm
d304fcbda7 Rename local discovery option for clarity
It's using full relative filepaths, not just dir paths.
2018-06-11 14:50:01 +02:00
Roeland Jago Douma
2cc94636cf Merge pull request #391 from nextcloud/upstream/pr/6417
Conflicts: Change tags to be more user friendly #6365
2018-06-11 14:48:47 +02:00
Christian Kamm
77fcff5bdf Conflicts: Change tags to be more user friendly #6365
From "_conflict-user-yyyymmdd-hhmmss"
to   " (conflicted copy user yyyy-mm-dd hhmmss)"
2018-06-11 14:40:40 +02:00
Nextcloud bot
a9d633c7ef [tx-robot] updated from transifex 2018-06-11 00:48:08 +00:00
Olivier Goffart
1b6cc36a61 Fix make doc-man in shadow build
Issue #6555
2018-06-10 16:07:22 +02:00
Nextcloud bot
e82fdee90c [tx-robot] updated from transifex 2018-06-10 00:49:25 +00:00
Nextcloud bot
0e00f9d0d3 [tx-robot] updated from transifex 2018-06-09 00:48:57 +00:00
Roeland Jago Douma
dc41f8a16e Fix windows build
* Reorder openssl header import
* not => !

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-08 16:53:56 +02:00
Roeland Jago Douma
7e98a1e802 Merge pull request #390 from nextcloud/upstream/pr/6377
Notify if an explicitly excluded folder is created #6222
2018-06-08 14:58:45 +02:00
Christian Kamm
e65caee9cf Notify if an explicitly excluded folder is created #6222 2018-06-08 14:49:26 +02:00
Nextcloud bot
1ba96d779b [tx-robot] updated from transifex 2018-06-08 00:49:17 +00:00
Roeland Jago Douma
d0a93ddfc4 Merge pull request #387 from nextcloud/upstream/accountwizard
AccountWizard: Reserve space for error label #6546
2018-06-07 15:39:55 +02:00
Christian Kamm
a1d6af60f0 AccountWizard: Reserve space for error label #6546 2018-06-07 15:32:52 +02:00
Roeland Jago Douma
a6179876c7 Merge pull request #385 from nextcloud/upstream/pr/6525
Credentials: Retry fetching from the keychain in case the keychain is…
2018-06-07 15:32:16 +02:00
Olivier Goffart
7c9ec4a55a Credentials: Retry fetching from the keychain in case the keychain is still starting
When owncloud is restored, at boot time, it might be started before the
crendential manager. So if we detect an error, wait 10 seconds and hopefully
it'd be loaded by then.

Issues: #4274, #6522
2018-06-07 15:18:40 +02:00
Roeland Jago Douma
81b0cdc9d2 Merge pull request #386 from nextcloud/upstream/owncloudsynclog
owncloudsynclog: 1 MB -> 10 MB #6420
2018-06-07 15:01:34 +02:00
Julius Härtl
689ab5b8b3 Merge branch 'master' into upstream/owncloudsynclog 2018-06-07 14:38:49 +02:00
Roeland Jago Douma
2a60141ef2 Merge pull request #383 from nextcloud/upstream/pr/6526
macOS: Don't use WAL for sqlite3 in /Volumes
2018-06-07 10:36:57 +02:00
Markus Goetz
3cd21e258e macOS: Don't use WAL for sqlite3 in /Volumes
For #6049
2018-06-07 10:22:07 +02:00
Roeland Jago Douma
a01c78a4ce Merge pull request #382 from nextcloud/upstream/pr/6530
SyncJournal: Check file existence even for open dbs #6049
2018-06-07 10:21:07 +02:00
Christian Kamm
8147963b24 SyncJournal: Explain added file-exists check 2018-06-07 09:50:09 +02:00
Christian Kamm
cc04ce9fe4 SyncJournal: Check file existence even for open dbs #6049
With WAL mode sqlite seems to occasionally crash when the
underlying filesystem goes away.
2018-06-07 09:50:09 +02:00
Roeland Jago Douma
a348ff3134 Merge pull request #381 from nextcloud/upstream/pr/6532
Upload: Adjust timeout for final job based on size #6527
2018-06-07 09:49:25 +02:00
Christian Kamm
5f793c151c Upload: Adjust timeout for final job based on size #6527
Some servers have virus scanners and the like that can delay the
response of the final chunked upload assembly significantly, often
breaking the current 5min (!) timeout. See owncloud/enterprise#2480
for details.
2018-06-07 09:38:16 +02:00
Roeland Jago Douma
b2a8eea875 Merge pull request #380 from nextcloud/upstream/pr/6533
Propagation: Connection closed is a normal error #6516
2018-06-07 09:35:32 +02:00
Christian Kamm
4fa762b5ce Propagation: Connection closed is a normal error #6516
Because it sometimes appears in conjunction with server bugs and we
don't want to halt all syncing for other files in these cases.
2018-06-07 09:12:46 +02:00
Roeland Jago Douma
f540c37ad3 Merge pull request #375 from nextcloud/upstream/pr/6523
PropagateUpload: Remove unused PropagateUploadFileCommon::abort
2018-06-07 09:11:45 +02:00
Olivier Goffart
14ff3534a8 Fix compilation warning
propagateuploadng.cpp:500:10: warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
2018-06-07 08:53:12 +02:00
Christian Kamm
3556482bce TestChunkingNG: Remove unneeded test code 2018-06-07 08:53:12 +02:00
Christian Kamm
d9640dd79e PropagateUpload: Fix miscount in abort() #6516
Previously it tried to abort even jobs that had already finished, which
was not going to work as they wouldn't emit finished() again.

Also, in some cases the abortCount would never go to zero and that case
wasn't well documented.
2018-06-07 08:53:12 +02:00
Christian Kamm
96126a53d3 PropagateUpload: Remove unused PropagateUploadFileCommon::abort 2018-06-07 08:53:10 +02:00
Nextcloud bot
e043840fd0 [tx-robot] updated from transifex 2018-06-07 00:47:40 +00:00
Roeland Jago Douma
448b0ebf63 Merge pull request #374 from nextcloud/upstream/pr/6519
ShareLink: Preserve password when unrelated ui changes #6512
2018-06-06 21:01:51 +02:00
Christian Kamm
898a530ba5 ShareLink: Preserve password when unrelated ui changes #6512 2018-06-06 20:56:34 +02:00
Roeland Jago Douma
04930768ee Merge pull request #370 from nextcloud/upstream/pr/6238
update supported linux platforms
2018-06-06 20:56:03 +02:00
Olivier Goffart
e2e6b06d6c Update installing.rst 2018-06-06 20:50:19 +02:00
Jürgen Weigert
caf21210a6 update supported linux platforms 2018-06-06 20:50:17 +02:00
Roeland Jago Douma
8189c50f51 Merge pull request #368 from nextcloud/upstream/sqlite-version
sqlite: Update bundled version to 3.23.1
2018-06-06 20:46:53 +02:00
Olivier Goffart
31ba483845 sqlite: Update bundled version to 3.23.1
For OS X and Windows.
2018-06-06 20:40:23 +02:00
Roeland Jago Douma
fb6e503f7b Merge pull request #367 from nextcloud/upstream/clang
Fix a bunch of warning with clang
2018-06-06 20:39:44 +02:00
Olivier Goffart
fbc1747168 Fix a bunch of warning with clang
The option -Wno-discarded-qualifiers only exists with GCC, clang warns that
it has no effects.

Also it warns when some virtual fuction are marked with override but not
all of them.
2018-06-06 20:31:14 +02:00
Roeland Jago Douma
075091d7e0 Merge pull request #365 from nextcloud/upstream/pr/6464
Logging: Avoid the word "Error"
2018-06-06 20:30:30 +02:00
Markus Goetz
367d0c39e8 Logging: Avoid the word "Error"
The old code printed "QNetworkReply::NoError"
2018-06-06 20:24:32 +02:00
Roeland Jago Douma
ba901503fc Merge pull request #364 from nextcloud/upstream/pr/6458
Network settings: If no proxy host given, show "no proxy" #5885
2018-06-06 20:23:49 +02:00
Christian Kamm
e1ab5f3811 Network settings: If no proxy host given, show "no proxy" #5885
What happens internally is that a proxy without a hostname gets treated
as no proxy.
2018-06-06 20:11:09 +02:00
Roeland Jago Douma
33b6d0473a Merge pull request #399 from nextcloud/upstream/pr/6333
Use std::chrono::milliseconds to represent milliseconds
2018-06-06 20:09:48 +02:00
Olivier Goffart
073a5184cb Use std::chrono::milliseconds to represent milliseconds 2018-06-06 17:26:53 +02:00
Julius Härtl
ea58a1038b Merge pull request #363 from nextcloud/upstream/pr/6468
More Button: Use SVG and fix size so it renders good in highdpi
2018-06-06 14:44:24 +02:00
Olivier Goffart
c4af4a5a85 More Button: Use SVG and fix size so it renders good in highdpi
When the more button was changed from using a text to an icon,
the size computation was not adjusted proerly to that of a button
with an icon.

And using svg allows it to be rendered correctly with high-dpi

It looks much much nicer now
2018-06-06 13:55:34 +02:00
Roeland Jago Douma
ad43d88fde Merge pull request #360 from nextcloud/upstream/pr/6428
Uploads: Don't delete unexisting chunks
2018-06-06 13:34:55 +02:00
Olivier Goffart
012c638d4e Uploads: Don't delete unexisting chunks
Since commit 4dc49ff3, we store an entry in the upload info table even
for non chunked uploads. However, if this fails we don't want to remove
non-existant stale chunks if the upload fails.

Without this commit, we would send a DELETE command to clean non-existant
chunks in the dav/uploads/ namespace.
2018-06-06 09:52:02 +02:00
Roeland Jago Douma
27e1efb8a3 Merge pull request #358 from nextcloud/upstream/pr/6434
SocketApi/Sharing: Add "copy public link" to menu #6356
2018-06-06 09:34:19 +02:00
Christian Kamm
de9fb7dc9a Silence warning by removing unnecessary this capture 2018-06-06 09:15:25 +02:00
Christian Kamm
550b845037 SocketApi/Sharing: Add "copy public link" to menu #6356
* The new menu option will fetch shares and create a new link share if
  no "context menu share" currently exists.
* Various cleanup of common operations in socketapi happened as well,
  in particular there's now FileData::get() that calculates all the
  relevant paths that are useful for most socketapi actions.
2018-06-06 09:15:23 +02:00
Roeland Jago Douma
d7ce92b017 Merge pull request #357 from nextcloud/upstream/notifications
Notifications: Lower hiding timeout
2018-06-05 21:45:37 +02:00
Markus Goetz
eb097cbffb Notifications: Lower hiding timeout
With the 4.5sec timeout, it was very easy to accidently hit the wrong notification
when the previous one dissapeared so late.
2018-06-05 21:24:56 +02:00
Roeland Jago Douma
4e4ec48bbc Merge pull request #356 from nextcloud/upstream/qunused
Q_UNUSED: Sprinkle around
2018-06-05 21:20:09 +02:00
Markus Goetz
de1032ebd7 Q_UNUSED: Sprinkle around 2018-06-05 20:45:51 +02:00
Roeland Jago Douma
27826ddee0 Merge pull request #355 from nextcloud/upstream/pr/6450
macOS: Implement new dynamic Finder menu items #6328
2018-06-05 20:45:11 +02:00
Markus Goetz
d3cbe63801 macOS: Implement new dynamic Finder menu items #6328 2018-06-05 20:40:40 +02:00
Roeland Jago Douma
5b0a1d4c79 Merge pull request #354 from nextcloud/upstream/pr/6444
macOS: Unload the Finder extension on exit #5382 #3819
2018-06-05 20:39:43 +02:00
Markus Goetz
648911f3ab macOS: Unload the Finder extension on exit #5382 #3819 2018-06-05 20:22:02 +02:00
Roeland Jago Douma
eda221227f Merge pull request #353 from nextcloud/upstream/pr/6448
Simple permanent logging
2018-06-05 20:21:25 +02:00
Christian Kamm
4a81ae75cf Logging: Add persistent auto-logdir option #6442 2018-06-05 20:07:53 +02:00
Christian Kamm
428cfc5e1c LogDir: Compress log when switching files #6442 2018-06-05 20:07:53 +02:00
Christian Kamm
9319b6594e LogDir: Go to new file on Problem/Abort too #6442 2018-06-05 20:07:53 +02:00
Roeland Jago Douma
a7b7344659 Merge pull request #352 from nextcloud/upstream/pr/6438
Folders: Use "Problem" icon for unresolved conflicts #6277
2018-06-05 20:07:00 +02:00
Christian Kamm
63c2474b70 Folders: Use "Problem" icon for unresolved conflicts #6277 2018-06-05 19:59:19 +02:00
Roeland Jago Douma
f9f1f8bda6 Merge pull request #351 from nextcloud/upstream/pr/6437
Share link: Update permission wording #6192
2018-06-05 19:58:40 +02:00
Christian Kamm
ed5e413751 Share link: Update permission wording #6192 2018-06-05 19:46:04 +02:00
Roeland Jago Douma
7c4c3b0493 Merge pull request #349 from nextcloud/upstream/macOS
macOS: build/installer changes
2018-06-05 13:39:36 +02:00
Roeland Jago Douma
4ddbb35d77 Fix debian patch
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-05 13:29:51 +02:00
Markus Goetz
16bf765818 macOS: Don't hardcode path in Installer source 2018-06-05 13:29:51 +02:00
Markus Goetz
5667408c58 macOS: Offer only standard installation in installer 2018-06-05 13:29:51 +02:00
Markus Goetz
a0e17ce221 create_mac.sh: Also name properly in source dir 2018-06-05 13:29:51 +02:00
Markus Goetz
3defc30e12 macosx.pkgproj; This is a .cmake preprocessed file 2018-06-05 13:29:51 +02:00
Roeland Jago Douma
3ce41c71c1 Merge pull request #350 from nextcloud/upstream/pr/6436
SyncJournalDb::setSelectiveSyncList: Always use a transaction
2018-06-05 11:30:24 +02:00
Olivier Goffart
613fd30021 SyncJournalDb::setSelectiveSyncList: Always use a transaction
Issue #6431
2018-06-05 11:15:51 +02:00
Roeland Jago Douma
0afcb23734 Merge pull request #331 from nextcloud/upstream/pr/6412
Blacklisting must prevent parent etag updates #6411
2018-06-05 10:18:53 +02:00
Christian Kamm
c57e4dcf03 Blacklisting must prevent parent etag updates #6411 2018-06-05 10:12:11 +02:00
Roeland Jago Douma
5309694b34 Merge pull request #394 from nextcloud/fix/master/info
Fix output add E2E again
2018-06-05 09:39:06 +02:00
Roeland Jago Douma
a0c458d937 Fix output add E2E again
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-05 09:02:41 +02:00
Roeland Jago Douma
a035b9b10b Merge pull request #393 from ivaradi/master
Re-encoded Ubuntu/Debian upload keys
2018-06-05 09:02:23 +02:00
István Váradi
92de0770bc Re-encoded Ubuntu/Debian upload keys 2018-06-05 08:34:41 +02:00
Roeland Jago Douma
2eb87e769c Merge pull request #330 from nextcloud/upstream/pr/6408
FolderStatusModel: fix potential assert
2018-06-05 08:19:01 +02:00
Olivier Goffart
f4f228de3e FolderStatusModel: fix potential assert
OCC::FolderStatusModel::slotUpdateDirectories: ASSERT: "parentInfo->_fetching" in file /home/olivier/kdegit/owncloud/mirall/src/gui/folderstatusmodel.cpp, line 599

This can happen if the structure of a folder is change while the user
expands the root folder. In this case, resetSubs() is called which
resets _fetching to false.
Instead, we need to keep a pointer to the job so we can abort it by
deleting it.
2018-06-05 08:12:58 +02:00
Roeland Jago Douma
6872cbda7e Merge pull request #329 from nextcloud/upstream/pr/6416
csync_update: add the checksum in the discovery log
2018-06-05 08:12:00 +02:00
Olivier Goffart
3e508329b5 csync_update: add the checksum in the discovery log
Issue #6414
2018-06-05 07:52:29 +02:00
Roeland Jago Douma
69aa077212 Merge pull request #338 from ivaradi/master
Patch the OSX CMakeLists.txt for Xenial
2018-06-05 07:51:46 +02:00
István Váradi
d0e4c67459 Merge branch 'master' of github.com:nextcloud/client 2018-06-05 06:58:12 +02:00
Nextcloud bot
f8d0cbd468 [tx-robot] updated from transifex 2018-06-05 00:47:52 +00:00
Roeland Jago Douma
dfed78a665 Merge pull request #328 from nextcloud/upstream/issue/5932
macdeployqt: Adjust minimum version based on our Qt #5932
2018-06-04 20:23:38 +02:00
Markus Goetz
0d182280c4 macdeployqt: Adjust minimum version based on our Qt #5932 2018-06-04 20:02:43 +02:00
Roeland Jago Douma
8477c5a565 Merge pull request #327 from nextcloud/upstream/pr/6271
postinstall macOS: check if Finder is running
2018-06-04 20:00:58 +02:00
Roeland Jago Douma
32ae670c4e Merge pull request #325 from nextcloud/upstream/ssl-button-speed
SslButton: Improve speed (especially on macOS) #6031
2018-06-04 17:14:38 +02:00
Roeland Jago Douma
4bd6f2b26d Merge pull request #323 from nextcloud/upstream/upload-finished-flag
Upload: Simplify 'finished' flag
2018-06-04 17:14:17 +02:00
Roeland Jago Douma
c1171d700e Merge pull request #322 from nextcloud/upstream/pr/6404
Excludes: Expand doc, Desktop.ini only in root folder
2018-06-04 17:13:23 +02:00
Roeland Jago Douma
3a1dc44ec8 Merge pull request #320 from nextcloud/upstream/issue/6403
propagateuploadv1: don't finalize after a done()
2018-06-04 17:12:52 +02:00
Roeland Jago Douma
3c3f3541d4 Merge pull request #291 from nextcloud/fixEncryptionDecryptionNonEmptyFolder
Forbid to encrypt or decrypt a non-empty folder.
2018-06-04 16:03:25 +02:00
Roeland Jago Douma
c49597d9d8 Merge pull request #319 from nextcloud/upstream/issue/4424
Folder: normalize the local path.
2018-06-04 16:02:49 +02:00
Roeland Jago Douma
321e8c0264 Merge pull request #317 from nextcloud/upstream/issue/3146
SslButton: Add HTTP/2 info #3146
2018-06-04 16:01:44 +02:00
Roeland Jago Douma
092063d348 Merge pull request #316 from nextcloud/upstream/pr/6384
CSync Errors cleanup
2018-06-04 15:59:45 +02:00
Olivier Goffart
393f6c2310 SyncEngine: remove the "CSync" wording from the error messages
They are confusing for the user.
Example in issue #6274
2018-06-04 15:41:38 +02:00
Olivier Goffart
5f30177bfc CSync: Remove unused error codes
None of the removed ERRNO code were ever set.
So none of the removed error hapenned anymore
2018-06-04 15:41:38 +02:00
Olivier Goffart
15e93c8a31 CSync: reconcile never returns an error 2018-06-04 15:41:38 +02:00
Olivier Goffart
be29fc2f69 csync: remove CSYNC_PARAM_ERROR
It does not make sense to report such error to the user.
Its goal was to show invalid use of the csync API, but this is now done
with asserts.
2018-06-04 15:41:38 +02:00
Olivier Goffart
0443f8dd4d csync: Simplify csync_walk_local_tree/csync_walk_remote_tree
Small refactoring
2018-06-04 15:41:38 +02:00
Tomaz Canabrava
9b74a596c6 Forbid to encrypt or decrypt a non-empty folder.
The specs forbid the encryption or decryption of a
non empty folder. so...
1 - check for the sync status, if it's not synced return

as there's no way that I can say that there's items on the
server right now without waiting for the sync to finish

2 - verify if the folder is empty locally

as the user could have send some files to the folder.
2018-06-04 15:33:01 +02:00
Julius Härtl
5df1af79c5 Merge pull request #377 from nextcloud/bugfix/noid/cloudprovidesr_314
Fix cloudproviders after merging #314
2018-06-04 15:32:36 +02:00
Morris Jobke
d35ea29ad2 Merge pull request #388 from nextcloud/documentation/macos-osx
[documentation] Mac OS X is now macOS
2018-06-04 14:10:55 +02:00
Marius Blüm
78bfae45ae Mac OS X is now macOS
Signed-off-by: Marius Blüm <marius@lineone.io>
2018-06-04 11:44:03 +02:00
Markus Goetz
ab34f36836 owncloudsynclog: 1 MB -> 10 MB #6420 2018-06-03 23:09:23 +02:00
Roeland Jago Douma
f96206705a Merge pull request #315 from nextcloud/upstream/pr/6379
Discovery: Error if properties are missing #6317
2018-06-03 19:58:21 +02:00
Nextcloud bot
70d4c64d99 [tx-robot] updated from transifex 2018-06-03 00:48:45 +00:00
Roeland Jago Douma
4b1c6bb833 Fix cloudproviders after merging #314
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-02 20:46:10 +02:00
Roeland Jago Douma
1262cbf4ef Merge pull request #314 from nextcloud/upstream/pr/6373
Make sure ignored and conflict files show up in the issues tab even with partial local discovery
2018-06-02 20:20:19 +02:00
Nextcloud bot
b2433c8961 [tx-robot] updated from transifex 2018-06-02 00:46:48 +00:00
Julius Härtl
c9634d65aa Merge pull request #313 from nextcloud/upstream/pr/6380
ConnectionValidator: change the minimum server version
2018-06-01 15:43:19 +02:00
Julius Härtl
fc4f8fb2d5 Merge pull request #372 from nextcloud/upstream/pr/6488
ShareDialog: macOS grey odditiy #5774
2018-06-01 15:42:26 +02:00
Julius Härtl
4be565c56f Merge pull request #369 from nextcloud/upstream/issue/6406
Nautilus shell integration: Print python version on startup #6406
2018-06-01 15:40:23 +02:00
Julius Härtl
e4981931ac Merge pull request #373 from nextcloud/upstream/pr/6490
Nautilus: Fix Python3 and remove many debug
2018-06-01 15:39:56 +02:00
Olivier Goffart
5f969580ac Nautilus: Fix Python3 and remove many debug
Use b'\n' in the call to rfind, as the _remainder is bytes, not a string.

Remove most of the debug message which happens during normal operation.
They are mostly spamming the nautilus console, and can also cause bug
as they may throw exception in case of wrong encoding.

Relates to issue: #6406
2018-06-01 13:35:19 +02:00
Markus Goetz
b8b9b93a6e ShareDialog: macOS grey odditiy #5774 2018-06-01 13:31:22 +02:00
Olivier Goffart
4d7617d64b Propagator: remove a bunch of code related to the 'Shared' directory
This no longer exists since the owncloud server 7.0 which we no longer
allow to connect to
2018-06-01 13:17:20 +02:00
Olivier Goffart
8484b493e4 ConnectionValidator: change the minimum server version
Forbit connection with server older than 7.0. These server did not have
permission.

Also warn for anything older than 9.1. 9.0 is end of life according to
https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
2018-06-01 13:17:11 +02:00
Christian Kamm
70f0792d4a Nautilus shell integration: Print python version on startup #6406 2018-06-01 13:02:13 +02:00
Roeland Jago Douma
335298f4e2 Merge pull request #312 from nextcloud/upstream/pr/6374
Move ClientProxy and and ConnectionValidator out of libsync
2018-06-01 11:08:20 +02:00
Olivier Goffart
1b587a1241 ConnectionValidator::Status use Q_ENUM
So no need to have a manual conversion to QString
This is only used in debug message anyway.
2018-05-31 21:56:55 +02:00
Olivier Goffart
311307e8cb Move ClientProxy and ConnecitonValidator to gui
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
2018-05-31 21:56:55 +02:00
Olivier Goffart
7e05e1e411 owncloudcmd: Do not overwrite the http timeout for json jobs
The AbstractNetworkJob already has a sensible timeout that depends
on an environment variable.
No need to overwrite that with some arbitrary value. (The connection
validator does that because it could cause problems if two connection
validator were to run at the same time. Not a problem here)
2018-05-31 21:56:55 +02:00
Olivier Goffart
204cb470b4 owncloudcmd: Do not read the proxy settings from the gui's config file
The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
2018-05-31 21:56:55 +02:00
Olivier Goffart
9fe8713bdc Folder: remove unused member 2018-05-31 21:56:44 +02:00
Nextcloud bot
08024f69c8 [tx-robot] updated from transifex 2018-05-31 00:48:48 +00:00
Roeland Jago Douma
c6ef8eec0a Merge pull request #305 from nextcloud/upstream/pr/6363
SyncEngine: Use separate state for two unicode conversions
2018-05-30 08:04:05 +02:00
Roeland Jago Douma
86741de622 Merge pull request #299 from nextcloud/upstream/pr/6349
Don't delete contents behind directory junctions #6322
2018-05-30 08:03:04 +02:00
Roeland Jago Douma
c6c42c3c70 Merge pull request #311 from nextcloud/upstream/pr/6371
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
2018-05-29 20:33:34 +02:00
Roeland Jago Douma
d410b8e057 Merge pull request #310 from nextcloud/upstream/version-cmake
VERSION.cmake: This is 2.4.2 now
2018-05-29 20:32:27 +02:00
Markus Goetz
68601240f8 VERSION.cmake: This is 2.4.2 now 2018-05-29 20:19:42 +02:00
Roeland Jago Douma
6ebcc638e0 Merge pull request #300 from nextcloud/upstream/pr/6351
SettingsDialogMac: Also start timer for notifications
2018-05-29 20:19:03 +02:00
Markus Goetz
13b2e51dfe Notifications: Immediately request when getting account online 2018-05-29 20:09:08 +02:00
Markus Goetz
00d8343e76 SettingsDialogMac: Also start timer for notifications 2018-05-29 20:09:06 +02:00
Nextcloud bot
4089456bc6 [tx-robot] updated from transifex 2018-05-28 00:49:03 +00:00
Roeland Jago Douma
1b756ac80f Merge pull request #318 from nextcloud/upstream/pr/6402
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
2018-05-26 21:33:45 +02:00
Roeland Jago Douma
bb1b86b087 Merge pull request #307 from nextcloud/upstream/pr/6366
test/testsyncengine: testNoLocalEncoding is for Linux
2018-05-26 21:30:21 +02:00
Nextcloud bot
e9be7fc18a [tx-robot] updated from transifex 2018-05-26 00:54:16 +00:00
Nextcloud bot
37cac61f49 [tx-robot] updated from transifex 2018-05-25 00:55:04 +00:00
Nextcloud bot
c2e0a4a73c [tx-robot] updated from transifex 2018-05-23 16:56:31 +00:00
István Váradi
76c4b05270 Patch the OSX CMakeLists.txt for Xenial 2018-05-22 07:04:09 +02:00
Camila Ayres
122daf4199 Merge pull request #335 from nextcloud/rakekniven-patch-1
Fixed tiny grammar issue (adds dot to the end of a sentence)
2018-05-21 17:43:35 +02:00
rakekniven
8d90c8c17b Fixed tiny grammar issue 2018-05-20 11:17:46 +02:00
Julius Härtl
6a5654d6d2 Merge pull request #294 from nextcloud/upstream/pr/6330
SocketAPI: "Open in browser" and disable Share entries when sharing i…
2018-05-19 16:09:50 +02:00
Julius Härtl
9196ab1c98 Merge pull request #246 from k1l1/master
scary wording on big changes #216 (translations missing)
2018-05-19 15:44:04 +02:00
Kilian Pfeiffer
bb65eb8cdd changed wording
https://github.com/nextcloud/client/issues/216
2018-05-19 13:17:25 +02:00
Julius Härtl
b7a67863a7 Merge pull request #306 from nextcloud/upstream/pr/6347
Set launch-on-startup when the first account is set up
2018-05-18 16:08:52 +02:00
Roeland Jago Douma
b7d5aff901 Merge pull request #303 from nextcloud/upstream/issue/6322
SyncJournal: Don't use LIKE with paths
2018-05-18 13:56:25 +02:00
Roeland Jago Douma
1dc3c156d4 Merge pull request #304 from nextcloud/upstream/pr/6364
Conflicts: Add user name to conflict file name #6325
2018-05-18 13:56:14 +02:00
Julius Härtl
0283e1bfaa Merge pull request #295 from nextcloud/upstream/pr/6329
Tray: Change icon for unresolved conflicts #6277
2018-05-18 08:53:49 +02:00
Julius Härtl
5f0b56e13a Merge pull request #326 from nextcloud/upstream/pr/6415
Nautilus integration: Not a ColumnProvider
2018-05-17 22:56:57 +02:00
Joss Brown
df8708dd46 postinstall macOS: check if Finder is running
Some users have disabled Finder, and the postinstall will always reenable Finder, unless it checks Finder status first.
2018-05-17 21:14:57 +02:00
Roeland Jago Douma
cf4e156fa0 Merge pull request #321 from nextcloud/upstream/qtversion-pkg-name
macOS: Put Qt version in .pkg name
2018-05-17 21:13:42 +02:00
Roeland Jago Douma
3b4fcfcc65 Merge pull request #302 from nextcloud/upstream/pr/6352
Sharing: Use maximum allowed permissions for new share #6346
2018-05-17 21:11:33 +02:00
Christian Kamm
629b14266b Nautilus integration: Not a ColumnProvider
The nautilus plugin doesn't actually define get_columns(), so pretending
to be a ColumnProvider lead to a critical warning on startup.
2018-05-17 20:52:40 +02:00
Roeland Jago Douma
33555292ae Merge pull request #301 from nextcloud/upstream/pr/6353
HTTP2: Only from Qt 5.9.4 #6285
2018-05-17 15:39:09 +02:00
Roeland Jago Douma
36572b79c3 Merge pull request #298 from nextcloud/upstream/no-shibboleth
NO_SHIBBOLETH: Fix warning
2018-05-17 15:38:04 +02:00
Roeland Jago Douma
2e0d724e3e Merge pull request #297 from nextcloud/upstream/pr/6336
- add description for moveToTrash variable
2018-05-17 15:37:40 +02:00
Roeland Jago Douma
cbeb9af7fd Merge pull request #296 from nextcloud/upstream/issue/6337
FolderStatusModel: Refresh folders on Problem sync #6337
2018-05-17 15:37:20 +02:00
Camila Ayres
19ae3e4326 Merge pull request #293 from nextcloud/upstream/pr/6265
Move remote-deleted files to trash
2018-05-17 12:20:53 +02:00
Markus Goetz
9ef42b4835 SslButton: Improve speed (especially on macOS) #6031
From 1+n*450msec to 1*450msec
2018-05-16 21:03:06 +02:00
Christian Kamm
a2675b559b Upload: Simplify 'finished' flag
* Sometimes there was 'finished' and '_finished'
* Make each done() call automatically set _finished to true
2018-05-16 20:57:26 +02:00
Christian Kamm
5f7fd7c551 Excludes: Expand doc, Desktop.ini only in root folder
The Desktop.ini exclude was added for 2.4 because we add such a file to
the synced folder on Windows. It doesn't need to cover subdirectories.
2018-05-16 20:29:12 +02:00
Olivier Goffart
ad276a4bce Folder: normalize the local path.
We otherwise normalize all path in the C form, so we must have
the Folder's path normalized the same. Or all comparizon will fail
(such as knowing if a file from the SocketAPI or the FilesystemWatcher
are part of the folder)

Issue #4424
2018-05-16 20:26:09 +02:00
Olivier Goffart
3506c52be9 propagateuploadv1: don't finalize after a done()
Should fix an assert when "Server does not support X-OC-MTime"
(Which only happens with owncloud 5)

Issue #6403
2018-05-16 20:23:47 +02:00
Markus Goetz
434f093f98 SslButton: Add HTTP/2 info #3146 2018-05-16 20:10:51 +02:00
Markus Goetz
b22daf8691 macOS: Put Qt version in .pkg name 2018-05-16 20:08:25 +02:00
whitequark
6dd5876b8a Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
As per XDG Base Directories specification:
> If $XDG_RUNTIME_DIR is not set applications should fall back
> to a replacement directory [...]

In practice, the ownCloud client has the fallback, but the plugin
helper does not, and if $XDG_RUNTIME_DIR is not set, the plugin
mysteriously does not work.
2018-05-16 20:05:46 +02:00
Christian Kamm
1868b2f3ec IssuesWidget: addItem performance improvement
Ensure adding a new item isn't usually O(n) by keeping track of which
items have associated issues.
2018-05-16 16:49:41 +02:00
Christian Kamm
a0d7095b2c IssuesWidget: Don't allow two issues for the same file/folder
This is intended to safeguard against invalidation bugs that cause the
same error to be added again for every sync run.
2018-05-16 16:49:03 +02:00
Christian Kamm
a0d5e31423 INSTRUCTION_IGNORE now carries a direction
This allows IssuesWidget to selectively wipe only the 'Up' ignores
during selective local discovery.
2018-05-16 16:48:31 +02:00
Christian Kamm
11b6b48c75 ProtocolItem: Adjust the way data is stored again
The struct makes it easy to pack data and should consume less memory
overall.
2018-05-16 16:48:06 +02:00
Christian Kamm
800f1ace0c SyncResult: Make sure the number of conflicts is correct #6226
If the SyncResult incorrectly believes that there are no conflicts, the
tray icon won't be correct and there will be no warning about unresolved
conflicts on the account.

Nevertheless, it's pretty awkward that the IssuesWidget is better
informed about pending conflicts than the Folder itself. This kind of
backwards data flow is very confusing.

Unfortunately the only alternative I see is to either keep track of
this information in two places (also in Folder), or create a common
data-holding class that can serve as a model instance for the issues
view as well as provide data directly to the Folder - which would
have been a much larger change.
2018-05-16 16:47:27 +02:00
Christian Kamm
75194d1821 SyncEngine: Make "local discovery?" question available
Also fix the minor bug that was mentioned and add tests.
2018-05-16 16:46:40 +02:00
Christian Kamm
2defaf099d Issues tab: Invalidate issues selectively #6226
Everything is invalidated later: after discovery, not before. In
addition entries that should only be invalidated when new local
discovery is done have that behavior now.
2018-05-16 16:45:39 +02:00
Christian Kamm
01f83ff398 ProgressInfo: Add information for local vs remote discovery 2018-05-16 16:45:13 +02:00
Christian Kamm
8077748c9d slotFolderDiscovered: Fix 'local' always being false
It was unused, so no harm done.
2018-05-16 16:44:36 +02:00
Christian Kamm
687b6f5655 Discovery: Error if properties are missing #6317 2018-05-16 16:42:20 +02:00
Olivier Goffart
b0f539fc1f cmake: Remove references of now unused WITH_TESTING
Issue #6318
2018-05-16 13:00:17 +02:00
Olivier Goffart
d4aebd30de Utility::fsCasePreserving: remove UNIT_TESTING ifdef
Since the release package will be build with unit test, we don't
want to query the env variable at every call to fsCasePreserving.
So only test the env variable at startup.
And the testutility can still change the value.

(The env variable is still used from t8.pl and maybe smashbox)

Issue #6318
2018-05-16 12:57:20 +02:00
Markus Goetz
f6b67a866a test/testsyncengine: testNoLocalEncoding is for Linux 2018-05-15 23:06:39 +02:00
Christian Kamm
583399ad53 Set launch-on-startup when the first account is set up
The previous code would disable it when the second account was
configured.

See #6347
2018-05-15 22:59:16 +02:00
Christian Kamm
ea142b8018 Conflicts with user name: Fix tests 2018-05-15 22:54:48 +02:00
Christian Kamm
f244cc4d4a SyncEngine: Use separate state for two unicode conversions
It's unlikely that there were interaction effects but still seems safer
to use different conversion state for the path and rename_path.
2018-05-15 22:44:10 +02:00
Christian Kamm
17d174e6fa Conflicts: Add user name to conflict file name #6325
For the case of uploading conflict files only.
2018-05-15 22:38:35 +02:00
Christian Kamm
ce0e2d0b88 SyncJournal: Don't use LIKE with paths
Paths can contain the wildcards % and _ and that would lead to odd
behavior.

This patch also clarifies the behavior of avoidReadFromDbOnNextSync()
which previously dependend on whether "foo/bar" or "foo/bar/" was
passed as input.

Possibly affects #6322
2018-05-15 19:44:00 +02:00
Christian Kamm
7154a001d6 Sharing: Use maximum allowed permissions for new share #6346
The client already computed the valid permissions, there was just a typo
that meant we didn't end up using them.
2018-05-15 19:26:40 +02:00
Markus Goetz
e82869d10e HTTP2: Only from Qt 5.9.4 #6285 2018-05-15 19:23:11 +02:00
Olivier Goffart
88347a985f Adjust the Move To Trash patch
(PR #6265)

 - Remove the UI completely
 - Move the #ifdef inside the FileSystem::moveToTrash function, so it is easier to
   implement on other platforms
 - Q_OS_UNIX includes mac, so we need to disable it. (not using Q_OS_LINUX because of
   other BSD that uses XDG spec as well
 - Translate the error messages
 - Add a couple of doc comments
2018-05-15 19:10:41 +02:00
Christian Kamm
2d1d651fcd Don't delete contents behind directory junctions #6322
QFileInfo::isSymLink() does detect reparse points that are symlinks but
returns false for junctions. The new function FileSystem::isJunction()
can detect those and is used to not recursively delete files inside
directories that are junctions.

See also https://bugreports.qt.io/browse/QTBUG-45344 and the
discussion in the PR https://codereview.qt-project.org/#/c/113019/.
2018-05-15 18:42:44 +02:00
Markus Goetz
d33692cdc7 NO_SHIBBOLETH: Fix warning 2018-05-15 18:31:12 +02:00
Oleg Solovyov
66eeb96c54 - doc: linux-only setting 2018-05-15 18:25:27 +02:00
Oleg Solovyov
09ade2b892 - add description for moveToTrash variable 2018-05-15 18:22:36 +02:00
Christian Kamm
1fa88c9820 FolderStatusModel: Refresh folders on Problem sync #6337
We don't want to refresh too frequently. But Problem is very close to
Success and very common.
2018-05-15 18:08:17 +02:00
Christian Kamm
ad750f569c Tray: Change icon for unresolved conflicts #6277 2018-05-15 17:58:10 +02:00
Olivier Goffart
2fcd7b20b8 SocketAPI: "Open in browser" and disable Share entries when sharing is disabled.
This adds "Open in browser" entry in the menu (Issue #5903)

Also mark the entries as disabled when the file is not yet on the server.
If re-sharing is not allowed for that file, a disabled explaination
entry is added to the menu.
If sharing is disabled globaly in the branding or in the server,
the share entry will not be present.
(Issues #4205 and #4608)

Meta issue #6292
2018-05-15 17:39:30 +02:00
Oleg Solovyov
f9fe24feb9 Move remote-deleted files to trash
Squashed from https://github.com/owncloud/client/pull/6265

Linux only, Hidden option, disabled by default
2018-05-15 17:23:38 +02:00
Julius Härtl
5e2270bd57 Merge pull request #247 from nextcloud/adds-etag-navigation-apps
Checks for 304 response in the navigation apps request
2018-05-08 06:55:41 +02:00
Camila San
d629f2259d Changes from qCWarning to qCDebug.
Signed-off-by: Camila San <hello@camila.codes>
2018-05-07 18:19:29 +02:00
Camila San
bbff83fe7c Only updates the list of apps when there is a change in the server (not 304 status).
Signed-off-by: Camila San <hello@camila.codes>
2018-05-07 18:03:51 +02:00
Camila San
402dc6c33b Checks for http status code before building navigation apps menu.
Signed-off-by: Camila San <hello@camila.codes>
2018-05-07 18:03:51 +02:00
Camila San
23a759ef4a Adds 304 http status code as valid.
Signed-off-by: Camila San <hello@camila.codes>
2018-05-07 18:03:51 +02:00
Camila San
77ebccee72 Adds methods to set/get navigation apps etag response header.
Signed-off-by: Camila San <hello@camila.codes>
2018-05-07 18:03:51 +02:00
Camila San
d7286872f6 Adds function to add raw header to the request.
Function added to be able to add If-None-Match to save the ETag.

Signed-off-by: Camila San <hello@camila.codes>
2018-05-07 18:03:42 +02:00
Camila Ayres
3b0b0fea33 Merge pull request #282 from ivaradi/master
Fix Debian build (another attempt)
2018-05-06 19:23:31 +02:00
István Váradi
ceb83c3709 Merge branch 'master' of github.com:nextcloud/client 2018-05-06 18:28:34 +02:00
István Váradi
a602df065e Fixed the name of the Qt WebEngine package 2018-05-06 17:12:17 +02:00
István Váradi
181f3bbd26 Added build dependency on qt5webengine-dev (#281) 2018-05-06 16:17:16 +02:00
István Váradi
7e210cfcb3 Merge branch 'master' of github.com:nextcloud/client 2018-05-06 10:24:21 +02:00
István Váradi
fee2872a98 Added build dependency on qt5webengine-dev 2018-05-06 09:53:49 +02:00
Roeland Jago Douma
880f256a62 Merge pull request #278 from ivaradi/master
Fix Debian build
2018-05-03 22:20:44 +02:00
István Váradi
7827fe4151 Fix Debian build 2018-05-03 19:02:49 +02:00
Roeland Jago Douma
e40bddb2c2 Merge pull request #276 from nextcloud/no_debian
Build no debian while it fails
2018-05-03 14:38:38 +02:00
Roeland Jago Douma
ed3a723ad2 Build no debian while it fails
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-03 14:28:11 +02:00
Roeland Jago Douma
889c930b36 Merge pull request #75 from nextcloud/new_flow
Add weblogin flow for NC > 12
2018-05-03 14:07:44 +02:00
Roeland Jago Douma
56e17c25b2 Change loading bar to NC blue
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-03 13:55:27 +02:00
Roeland Jago Douma
ef2d113930 Mark credentials as valid if there is no error
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
35e8d0437d Address comments
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
6809f12e68 Allow the user to sign in again
If the user is signed out (for whatever reason). Show a popup
with the loginflow again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
ac1664b525 Actually use webflow credentails
* Detect invalid auth (if the users token is removed for example)
* Properly store and fetch from keychain

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
6b43d80c01 Start with persisting credentials
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
356f9b4831 Actually connect properly to server
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
715c738ebf Add urlschema handler so w can catch the nc:// urls
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
c763a6e7fb Show webview with page
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
c4a88fe57e Add QWebView as a dependency
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
Camila Ayres
9338dadaab Merge pull request #265 from k1l1/log_files_path
Put log files somewhere else #221 (name conflict)
2018-05-02 15:30:34 +02:00
Kilian Pfeiffer
56c1d79c49 fixes windows crash / renaming changed 2018-04-30 16:09:04 +02:00
Camila Ayres
64cbc88474 Merge pull request #251 from nextcloud/clientSideEncryptionV4
Client side encryption v4.
2018-04-26 19:56:55 +02:00
Kilian Pfeiffer
cd926e5b84 resolving name conflict in logfiles 2018-04-24 15:47:23 +02:00
Morris Jobke
a41546834e Merge pull request #262 from nextcloud/update-transifex-config
Update transifex config and move it to a proper place
2018-04-23 19:59:41 +02:00
Morris Jobke
3a763f4d9c Update transifex config and move it to a proper place
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-23 15:45:34 +02:00
Roeland Jago Douma
81ae682e87 Revert "Make different program so it doesn't mess with existing config"
This reverts commit c04d1f1f69.
2018-04-22 21:04:37 +02:00
Roeland Jago Douma
75609c1b2c Merge pull request #254 from ad1rie1/FIX32BitApplication
Fix #6394
2018-04-22 20:57:36 +02:00
Camila Ayres
25b40cc852 Merge pull request #255 from ad1rie1/FixDeprecatedTR
Fix Use of Deprecated trUtf8.
2018-04-20 11:11:05 +02:00
Adrien
8e52f1237b Fix Use of Deprecated trUtf8 2018-04-19 12:02:26 +02:00
Julius Härtl
00336bd71d Merge pull request #253 from k1l1/log_files_path
Put log files somewhere else #221
2018-04-19 11:43:29 +02:00
Adrien
5f0a021c04 Fix #6394 2018-04-19 11:35:03 +02:00
Kilian Pfeiffer
40b1f051a4 log files are visible now 2018-04-17 17:59:03 +02:00
Kilian Pfeiffer
faf64958ec changed paths of logfiles 2018-04-17 15:54:05 +02:00
Tomaz Canabrava
7432d6a814 Merge branch 'master' into clientSideEncryptionV4 2018-04-10 16:18:58 +02:00
Daniel Nicoletti
16aa54ed64 Do not create new db entries when the remote tree does not have proper values 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
3e05bd1da0 Do not detach encrypted files vector 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
3eb3535d0f Fix downloading NEW encrypted files 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
defe2d7631 Fix matching encrypted data for downloading 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
b12066f1aa Properly remove encryption data from JSON of deleted file 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a9208f6581 Remove unused encrypted property 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
6e63a538b7 Make sure bool _currentLockingInProgress is first defined to false 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a7a8de8787 Fix matching encrypted file for download 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d93f7269b8 Properly mark encrypted files for removal 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d3b6aacf3f Fix merging remote and local trees when e2e files are involved
When populating the tree from the filesystem we need to fill
the e2eMangledName from DB and we when trying to find another
match on the oposite tree we need to take in account that names
don't match and search with the mangled name information
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
c0ef36b8fa Use QUuid to generate random names 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
60fc5d6dd4 Fix upload of existing encrypted files by matching only filename 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d5ab642e46 Fix sync status running when encryption data is missing
When a file on the server of an encrypted folder do
not have a matching entry on the JSON metadata, we
need to report an error and be done with the job
so that Sync status is not "running".

This eventually should cause the file to be removed
from the server as it can not be recovered anymore.
2018-04-09 13:23:52 +02:00
Tomaz Canabrava
b4b3e422de Handle gracefully failures in file decryption 2018-03-27 09:18:54 +02:00
Tomaz Canabrava
ed6f56257e Dont use new with QFiles. 2018-03-26 22:18:07 +02:00
Tomaz Canabrava
461aeca200 Do not crash when failing to decrypt the metadata 2018-03-26 22:02:46 +02:00
Tomaz Canabrava
6c88367ac6 Do not crash if there was an error encrypting the file. 2018-03-26 21:44:46 +02:00
Tomaz Canabrava
5fe9717598 Potentially fix crash acessing a deleted pointer. 2018-03-26 21:37:13 +02:00
Tomaz Canabrava
ec28465e01 Correctly handle systems without client side encryption 2018-03-26 20:51:14 +02:00
Tomaz Canabrava
11684682e6 Return empty metadata in case of error, Display error to the user. 2018-03-25 22:31:49 +02:00
Tomaz Canabrava
96115be0c6 Unlock folder in case of error 2018-03-25 21:54:08 +02:00
Roeland Jago Douma
4c40789dca Merge pull request #140 from nextcloud/appimage_drone_bump
Bump AppImage Drone
2018-03-23 15:36:33 +01:00
Roeland Jago Douma
a2815dac12 Merge pull request #224 from nextcloud/fix-documentation-cmake
Remove configure_file for non-existing documentation config file
2018-03-23 15:36:13 +01:00
Julius Härtl
16f53da9ae Remove configure_file for non-existing documentation config file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-22 19:30:05 +01:00
Camila Ayres
08b33c6f4b Merge pull request #197 from nextcloud/fix-notifications
Improves notifications:
- Display the actual response text from the notification API in the popups.
- Do not display sync activities messages like how many files were downloaded, only errors.
- Make the notifications section above the activity feed also clickable. e.g open the call, the file that was shared, open the calendar event etc
- Changes "Show desktop notifications" setting to "Show server notifications"
- Show notifications on startup and then show only NEW notifications: uses If-None-Match check to only retrieve notifications once there are new notifications.
2018-03-13 13:30:44 +01:00
Camila Ayres
eb3b3f02a0 Merge pull request #195 from nextcloud/apps-external-sites-menu
Adds apps and external sites to menu.
2018-03-09 11:48:14 +01:00
Camila San
11d178ce1d Adds absolute=true param to navigation/apps request.
Signed-off-by: Camila San <hello@camila.codes>
2018-03-03 23:11:11 +01:00
Camila San
2e4472a4db Enables server notifications by default.
Signed-off-by: Camila San <hello@camila.codes>
2018-03-03 22:44:24 +01:00
Camila San
3c778980df Makes sure JsonApiJob::finished won't throw a JSON error when status code is 304.
Signed-off-by: Camila San <hello@camila.codes>
2018-03-03 22:24:16 +01:00
Camila San
621596f45a Saves notifications ETag response header to use to request only new notifications.
Signed-off-by: Camila San <hello@camila.codes>
2018-03-01 22:19:04 +01:00
Camila Ayres
cb5bc61a44 Merge pull request #163 from nextcloud/edit-system-exclude-list
Edit system exclude list.
2018-03-01 19:32:18 +01:00
Camila San
d42401e36a Changes notifications api endpoint to v2.
Signed-off-by: Camila San <hello@camila.codes>
2018-03-01 15:20:36 +01:00
Camila San
6bf9f65fd3 Only notify users of new notifications and only shows them all on startup.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-27 23:05:18 +01:00
Camila San
56709f3cff Removes string 'Created' from notifications time.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-26 12:56:02 +01:00
Camila San
112c5e10b6 Removes Server Activities option from General settings.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-26 12:02:34 +01:00
Camila San
09a92a518a Align text and changes spacing in notification widget. 2018-02-26 00:03:29 +01:00
Camila San
0f9d8e15a0 Only uses 'More information' text in button for notification link.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-26 00:02:09 +01:00
Camila San
44f299eba2 Removes debug messages.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-26 00:00:42 +01:00
Camila San
d71438f181 Adds host and scheme to activity link so it can be opened in the
browser.

- Removes debug messages.
- Removes Activity data _appName - not used anymore.

Signed-off-by: Camila San <hello@camila.codes>
2018-02-25 23:58:28 +01:00
Camila San
71f4760215 Do not display user account when there is only one user in popup message.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-25 23:57:44 +01:00
Camila San
4a6a8ca6c6 Removes _appName from Activity data.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-25 23:56:54 +01:00
Camila San
e33d2bf7f7 Removes (s) from time strings.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-25 23:55:04 +01:00
Camila San
4c79059146 Changes notification icon bell size.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-25 23:54:04 +01:00
Daniel Hansson
eec728eab8 Merge pull request #196 from ivaradi/master
Recommends relation to libgnome-keyring0
2018-02-24 21:46:09 +01:00
Daniel Hansson
d21ea9ed10 Merge pull request #174 from ivaradi/correct-dolphin-plugin-path
Dolphin plugin path correction
2018-02-24 21:45:47 +01:00
István Váradi
99add9f00d Recommend libgnome-keyring0 on Debian too 2018-02-24 10:33:19 +01:00
István Váradi
0b3129f366 Added a Recommends relation to libgnome-keyring0 2018-02-24 10:19:01 +01:00
Camila San
1a0edc1cd0 Sync activities notifications are never shown unless there is an error. Server activities and notifications are off by default.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-23 12:08:37 +01:00
Camila San
99d8d050c2 Compares account menu with the account associated with the action to make sure apps is added to the right position.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-22 20:10:22 +01:00
Camila San
4ffff7454e Refactores code and displays nav. apps before Pause/Unpause folders sync.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-21 18:49:12 +01:00
Camila San
9acb30ecb2 Refactores code to fetch and display sub menu with list from navigation/apps endpoint.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-20 19:41:08 +01:00
Camila San
61062f9809 Adds ocsnavigationapps files to CMakeslists.txt.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-20 19:33:25 +01:00
Camila San
fb080f08ec Uses OcsNavigationAppsJob instead of OcsAppsJob and OcsExternalSitesJob in OwncloudGui.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 20:53:12 +01:00
Camila San
c9bc20c63d Creates navigation/apps API call class OcsNavigationAppsJob.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 20:51:56 +01:00
Camila San
f107b3348c Removes external sites/apps configuration from general settings.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 20:49:55 +01:00
Camila San
00cfbe39be Removes external sites/apps configuration from config file.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 20:49:13 +01:00
Camila San
9f559c8e00 Retrieves list of apps and displays it if 'show apps' checkbox is checked in the settings.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:33 +01:00
Camila San
bf77dbac73 Adds checkbox 'showApps' to the general settings form.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:33 +01:00
Camila San
e29953bc11 Adds show apps option to the config file.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:33 +01:00
Camila San
8ada9d0471 List apps for each user in the tray main menu.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:33 +01:00
Camila San
08769b2803 Adds OcsAppsJob to retrieve apps enabled for the user.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:33 +01:00
Camila San
89d743396a Fixes class name in comments and in ifndef.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:33 +01:00
Camila San
649f3ff904 Changes response parsing for the new request.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:32 +01:00
Camila San
9f0c154e68 Fixes request url - uses the one for all users.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:32 +01:00
Camila San
f48a94ba71 Saves 'show external sites list' option to the config file.
Uses option to toggle display of external sites list in the main menu.

Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:32 +01:00
Camila San
ec428786ac Adds checkbox to toggle display of external sites list in the menu.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:32 +01:00
Camila San
69f3468ec0 Lists external sites for each user in the main menu.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:32 +01:00
Camila San
8408851cee Adds OCS External Sites Job to retrieve it from the server.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-19 19:59:19 +01:00
Tomaz Canabrava
7da0764b8d Don't class what's not a class 2018-02-18 01:23:59 +01:00
Tomaz Canabrava
176a42a062 Return the error reported by openssl 2018-02-18 01:13:23 +01:00
Tomaz Canabrava
5faeca1b82 Move BIO2ByteArray to annonymous namespace
This has no use outside of the clientsidenecryption.cpp
2018-02-18 01:04:44 +01:00
Camila San
32e29fb849 Doesn't open the file manager when there isn't a file associated with the Activity.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-16 19:17:22 +01:00
Camila San
20cf4ed642 Improves Notification Widget UI.
- Changes spacing.
- Removes QFrame.
- Changes icon size.

Signed-off-by: Camila San <hello@camila.codes>
2018-02-16 18:04:44 +01:00
Camila San
ab7185a6c7 Changes notification text in the checkboxes and adds tooltips with explanation about it.
- Changes the configuration name in ConfigFile and GeneralSettings
accordingly with the new text.
- Makes sure the user sees error and conflict messages even if the
setting is disabled.

Signed-off-by: Camila San <hello@camila.codes>
2018-02-15 20:21:35 +01:00
Camila San
bfc7aa16c6 Adds option to toggle display of Sync and Activity notifications.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-14 20:38:15 +01:00
Camila San
b24751b099 Adds button to open notification in the browser - to update something, join a call, etc.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-14 19:22:08 +01:00
Camila San
a7dd3a7da1 Displays the actual notification subject in the system tray messages.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-12 22:16:46 +01:00
Daniel Nicoletti
99117078f3 Remove table for e2e and add an e2eMangledName column (#169)
If the code was not complex enough syncing two tables
already started to give UNIQUE constrains errors on
simple sync operations, this also adds initial support
remote delete of an encrypted file
2018-02-12 12:50:51 +01:00
Roeland Jago Douma
1eb7ba72f0 Use standardized filename
See https://github.com/nextcloud/end_to_end_encryption_rfc/issues/13

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-09 11:40:06 +01:00
István Váradi
2cc670453a A separate Dolphin client install file is not required for Bionic 2018-02-08 17:19:13 +01:00
István Váradi
22153cf912 KDE_INSTALL_USE_QT_SYS_PATHS turned on so that the plugin is installed to the correct directory on Xenial too 2018-02-08 17:18:18 +01:00
Roeland Jago Douma
0743c63c81 Merge pull request #114 from ivaradi/debian-build
Moved Debian build to Drone
2018-02-06 08:18:00 +01:00
István Váradi
7216d05766 The Debian build script needs the history to generate logs and the tags to be able to determine the version 2018-02-02 19:11:10 +01:00
István Váradi
b11661f4c0 Reinstated the check for being on the master branch to enable uploading the packages 2018-02-02 18:57:51 +01:00
Daniel Nicoletti
080c5ea678 Better explanation for encryption passphrase
FIXES: #149
2018-02-02 17:27:58 +01:00
Camila San
2545017819 Refactores code.
- Renames function from populateTableReadOnlyValues to setupTableReadOnlyItems.
- Use a const to define the number of read only rows.
- Removes enable/disable remove all button checks from where it was not
needed.

Signed-off-by: Camila San <hello@camila.codes>
2018-02-02 16:01:53 +01:00
Camila San
73b7540468 Enable/disable remove all button depending on the number of rows.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-02 15:50:17 +01:00
Camila San
c29d3b7e0b Adds button to remove all items from ignore list table.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-02 14:40:30 +01:00
Camila San
4855e3242c Restores correctly default system values for ignore files list.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-02 14:15:45 +01:00
Camila San
bf76b596af Allows deletion of pre configured patterns in the ignore list.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-01 22:36:40 +01:00
Camila San
6dd349a8a6 Adds button to restore default patterns in the ignore list.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-01 22:35:38 +01:00
István Váradi
4c74f29b5f Removed yakkety and zesty, added bionic 2018-02-01 20:07:40 +01:00
István Váradi
549abc8c90 Build Xenial with Qt 5.5 2018-02-01 20:06:18 +01:00
István Váradi
ed9509f31f Merge branch 'master' into debian-build 2018-02-01 18:44:55 +01:00
Morris Jobke
b9a7e5622d Merge pull request #141 from nextcloud/documentation
Documentation update
2018-02-01 16:14:44 +01:00
Morris Jobke
5db7f60179 Fix CMake failure
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-01 16:08:33 +01:00
Morris Jobke
9c43edcad6 Run documentation tests in seperate job
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-01 15:58:51 +01:00
Morris Jobke
545a406997 Latest refinements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-01 15:57:37 +01:00
Marius Blüm
d75b32156f Brand Screenshots
Signed-off-by: Marius Blüm <marius@lineone.io>
2018-02-01 14:23:38 +01:00
Camila San
f7697b0584 Enables removing patterns from ignored files list.
Signed-off-by: Camila San <hello@camila.codes>
2018-01-31 22:59:51 +01:00
István Váradi
d0896f0c82 Removed some debug printouts and dead code and added Bionic in place of Zesty 2018-01-31 20:04:33 +01:00
István Váradi
4d396c645e Why does Drone sometimes not use the new changes? 2018-01-31 19:58:24 +01:00
István Váradi
ebaae773f6 Trying a different strategy to sign the package files 2018-01-31 19:53:50 +01:00
István Váradi
88c03a5858 Stepped the version of the build image 2018-01-30 19:22:46 +01:00
István Váradi
11a540114e Hiding the keys from the output 2018-01-30 19:22:26 +01:00
Roeland Jago Douma
89b2df62c5 Merge pull request #144 from nextcloud/win_images
Use Nextcloud images for windows installer
2018-01-30 14:23:32 +01:00
Julius Härtl
da2a1c25d5 Add drone build for documentation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-30 14:23:10 +01:00
Roeland Jago Douma
df123bb3bc Use NC windows installer images
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-30 11:55:16 +01:00
Morris Jobke
a7e1003c41 Add shared_assets
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-29 01:19:51 +01:00
Morris Jobke
fe102f359c Build current documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-29 01:19:47 +01:00
Roeland Jago Douma
4ee1f1fe1a Foo
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-28 20:19:37 +01:00
Roeland Jago Douma
45eefb27cf Bump AppImage Drone
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-28 20:04:42 +01:00
István Váradi
72f629a7dc Added secrets to .drone.yml 2018-01-27 08:50:28 +01:00
István Váradi
9ad6f1485e Printing environment 2018-01-26 12:54:35 +01:00
István Váradi
459b6ab1e7 Trigger another build in the hope that it will see the previous commit 2018-01-26 12:41:27 +01:00
István Váradi
85140d3784 Reverting to upper-case key variable names 2018-01-26 12:28:14 +01:00
István Váradi
7a1f32894b Try if the variables are lower-case 2018-01-25 17:21:02 +01:00
István Váradi
1acd7db5f8 Dummy commit to trigger a new build 2018-01-25 17:16:59 +01:00
István Váradi
5e7f72b8df Attempt to pass the key in the environment 2018-01-23 19:51:13 +01:00
István Váradi
ed9300f924 Commit to trigger build 2018-01-23 19:42:34 +01:00
István Váradi
3ea3699cdd The source packages are temporarily uploaded even when not on the master branch 2018-01-17 19:24:02 +01:00
István Váradi
f4fcf46a1c Utilizing some Drone environment variables 2018-01-16 19:36:36 +01:00
István Váradi
9eb395efd1 The Debian Docker image reference is fixed 2018-01-12 19:55:56 +01:00
István Váradi
66c745e133 Moved Debian build to Drone 2018-01-11 11:34:41 +01:00
773 changed files with 108949 additions and 11756 deletions

View File

@@ -1,11 +1,12 @@
clone:
git:
image: plugins/git
tags: true
depth: 1
pipeline:
qt-5.7:
image: nextcloudci/client-5.7:client-5.7-2
image: nextcloudci/client-5.7:client-5.7-3
commands:
# Install QtKeyChain
- /bin/bash -c "
@@ -24,13 +25,16 @@ pipeline:
source /opt/qt57/bin/qt57-env.sh &&
mkdir build &&
cd build &&
cmake -D NO_SHIBBOLETH=1 ../ &&
make"
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
make &&
useradd -m -s /bin/bash test &&
chown -R test:test . &&
su -c 'ctest --output-on-failure' test"
when:
matrix:
TESTS: qt-5.7
qt-5.8:
image: nextcloudci/client-5.8:client-5.8-2
image: nextcloudci/client-5.8:client-5.8-3
commands:
# Install QtKeyChain
- /bin/bash -c "
@@ -49,13 +53,16 @@ pipeline:
source /opt/qt58/bin/qt58-env.sh &&
mkdir build &&
cd build &&
cmake -D NO_SHIBBOLETH=1 ../ &&
make"
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
make &&
useradd -m -s /bin/bash test &&
chown -R test:test . &&
su -c 'ctest --output-on-failure' test"
when:
matrix:
TESTS: qt-5.8
qt-5.9:
image: nextcloudci/client-5.9:client-5.9-3
image: nextcloudci/client-5.9:client-5.9-4
commands:
# Install QtKeyChain
- /bin/bash -c "
@@ -74,24 +81,148 @@ pipeline:
source /opt/qt59/bin/qt59-env.sh &&
mkdir build &&
cd build &&
cmake -D NO_SHIBBOLETH=1 ../ &&
make"
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
make &&
useradd -m -s /bin/bash test &&
chown -R test:test . &&
su -c 'ctest --output-on-failure' test"
when:
matrix:
TESTS: qt-5.9
AppImage-5.9:
image: nextcloudci/client-appimage-ci:client-appimage-ci-8
qt-5.10:
image: nextcloudci/client-5.10:client-5.10-3
commands:
# Install QtKeyChain
- /bin/bash -c "
export CC=gcc-7 &&
export CXX=g++-7 &&
source /opt/qt510/bin/qt510-env.sh &&
cd /tmp &&
git clone https://github.com/frankosterfeld/qtkeychain.git &&
cd qtkeychain &&
git checkout v0.8.0 &&
mkdir build &&
cd build &&
cmake ../ &&
make &&
make install"
# Build client
- /bin/bash -c "
export CC=gcc-7 &&
export CXX=g++-7 &&
source /opt/qt510/bin/qt510-env.sh &&
mkdir build &&
cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
make &&
useradd -m -s /bin/bash test &&
chown -R test:test . &&
su -c 'ctest --output-on-failure' test"
when:
matrix:
TESTS: qt-5.10
qt-5.11:
image: nextcloudci/client-5.11:client-5.11-3
commands:
# Install QtKeyChain
- /bin/bash -c "
export CC=gcc-7 &&
export CXX=g++-7 &&
source /opt/qt511/bin/qt511-env.sh &&
cd /tmp &&
git clone https://github.com/frankosterfeld/qtkeychain.git &&
cd qtkeychain &&
git checkout v0.8.0 &&
mkdir build &&
cd build &&
cmake ../ &&
make &&
make install"
# Build client
- /bin/bash -c "
export CC=gcc-7 &&
export CXX=g++-7 &&
source /opt/qt511/bin/qt511-env.sh &&
mkdir build &&
cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
make &&
useradd -m -s /bin/bash test &&
chown -R test:test . &&
su -c 'ctest --output-on-failure' test"
when:
matrix:
TESTS: qt-5.11
qt-5.11-clang:
image: nextcloudci/client-5.11:client-5.11-3
commands:
# Install QtKeyChain
- /bin/bash -c "
export CC=clang-6.0 &&
export CXX=clang++-6.0 &&
source /opt/qt511/bin/qt511-env.sh &&
cd /tmp &&
git clone https://github.com/frankosterfeld/qtkeychain.git &&
cd qtkeychain &&
git checkout v0.8.0 &&
mkdir build &&
cd build &&
cmake ../ &&
make &&
make install"
# Build client
- /bin/bash -c "
export CC=clang-6.0 &&
export CXX=clang++-6.0 &&
source /opt/qt511/bin/qt511-env.sh &&
mkdir build &&
cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
make &&
useradd -m -s /bin/bash test &&
chown -R test:test . &&
su -c 'ctest --output-on-failure' test"
when:
matrix:
TESTS: qt-5.11-clang
AppImage:
image: nextcloudci/client-5.11:client-5.11-3
commands:
- /bin/bash -c "./admin/linux/build-appimage.sh"
when:
matrix:
BUILD: AppImage
Debian:
image: nextcloudci/client-debian-ci:client-debian-ci-2
commands:
- /bin/bash -c "./admin/linux/debian/drone-build.sh"
secrets: [ DEBIAN_SECRET_KEY, DEBIAN_SECRET_IV ]
when:
matrix:
BUILD: Debian
documentation:
image: nextcloudci/documentation:documentation-5
commands:
- cd doc
- make html
when:
matrix:
TESTS: documentation
matrix:
include:
- TESTS: qt-5.7
- TESTS: qt-5.8
- TESTS: qt-5.9
- TESTS: qt-5.10
- TESTS: qt-5.11
- TESTS: qt-5.11-clang
- BUILD: AppImage
- BUILD: Debian
- TESTS: documentation
branches: [ master, 2.* ]

View File

@@ -1,38 +0,0 @@
os: linux
dist: trusty
sudo: required
language: generic
services:
- docker
env:
matrix:
- BUILD_TYPE=debian
before_install:
- admin/linux/travis-build.sh before_install
install:
- admin/linux/travis-build.sh install
before_script:
- admin/linux/travis-build.sh before_script
script:
- admin/linux/travis-build.sh script
after_success:
- admin/linux/travis-build.sh after_success
deploy:
- provider: script
skip_cleanup: true
script: admin/linux/travis-build.sh ppa_deploy
on:
condition: ($BUILD_TYPE = debian)
branches:
except:
- # Do not build tags that we create when we upload to GitHub Releases
- /^(?i:continuous)$/

16
.tx/config Normal file
View File

@@ -0,0 +1,16 @@
[main]
host = https://www.transifex.com
lang_map = bg_BG: bg, cs_CZ: cs, de_DE: de, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja, pt_PT: pt, et_EE: et
[nextcloud.client]
host = https://www.transifex.com
source_lang = en
source_file = translations/client_en.ts
file_filter = translations/client_<lang>.ts
type = QT
[nextcloud.client-desktop]
host = https://www.transifex.com
source_file = mirall.desktop.in
source_lang = en
type = DESKTOP

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[cs_CZ]=@APPLICATION_NAME@ desktopový synchronizační klient
Icon[cs_CZ]=@APPLICATION_EXECUTABLE@
Name[cs_CZ]=@APPLICATION_NAME@ desktopový synchronizační klient
GenericName[cs_CZ]=Synchronizace složek

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
Icon[de_DE]=@APPLICATION_EXECUTABLE@
Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
GenericName[de_DE]=Synchronisationsordner

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
Icon[en_GB]=@APPLICATION_EXECUTABLE@
Name[en_GB]=@APPLICATION_NAME@ desktop sync client
GenericName[en_GB]=Folder Sync

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
Icon[es_CL]=@APPLICATION_EXECUTABLE@
Name[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
GenericName[es_CL]=Sincronización de carpeta

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
Icon[es_CO]=@APPLICATION_EXECUTABLE@
Name[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
GenericName[es_CO]=Sincronización de carpeta

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
Icon[es_CR]=@APPLICATION_EXECUTABLE@
Name[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
GenericName[es_CR]=Sincronización de carpeta

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
Icon[es_DO]=@APPLICATION_EXECUTABLE@
Name[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
GenericName[es_DO]=Sincronización de carpeta

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
Icon[es_EC]=@APPLICATION_EXECUTABLE@
Name[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
GenericName[es_EC]=Sincronización de carpeta

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
Icon[es_GT]=@APPLICATION_EXECUTABLE@
Name[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
GenericName[es_GT]=Sincronización de carpeta

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
Icon[es_MX]=@APPLICATION_EXECUTABLE@
Name[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
GenericName[es_MX]=Sincronización de carpeta

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
Icon[es_SV]=@APPLICATION_EXECUTABLE@
Name[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
GenericName[es_SV]=Sincronización de carpeta

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
Icon[es]=@APPLICATION_EXECUTABLE@
Name[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
GenericName[es]=Sincronización de carpetas

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[fr]=Client desktop de synchronisation @APPLICATION_NAME@
Icon[fr]=@APPLICATION_EXECUTABLE@
Name[fr]=Client desktop de synchronisation @APPLICATION_NAME@
GenericName[fr]=Synchronisation du dossier

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה
Icon[he]=@APPLICATION_EXECUTABLE@
Name[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה
GenericName[he]=סנכרון תיקיות

View File

@@ -0,0 +1,203 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[hr]=klijent za sinkronizaciju računala
Name[hr]=sinkronizacija računala
GenericName[hr]=Sinkronizacija mapa

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
Icon[is]=@APPLICATION_EXECUTABLE@
Name[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
GenericName[is]=Samstilling á möppum

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@
Icon[it]=@APPLICATION_EXECUTABLE@
Name[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@
GenericName[it]=Sincronizzazione cartelle

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
Icon[ja_JP]=@APPLICATION_EXECUTABLE@
Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
GenericName[ja_JP]=フォルダーを同期する

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
Icon[pt_BR]=@APPLICATION_EXECUTABLE@
Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
GenericName[pt_BR]=Sincronizar Pasta

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[ru]=Клиент синхронизации @APPLICATION_NAME@ для ПК
Icon[ru]=@APPLICATION_EXECUTABLE@
Name[ru]=@APPLICATION_NAME@ клиент для ПК
GenericName[ru]=Синхронизация папок

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
Icon[sr]=@APPLICATION_EXECUTABLE@
Name[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
GenericName[sr]=Синхронизација фасцикли

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
Icon[tr]=@APPLICATION_EXECUTABLE@
Name[tr]=@APPLICATION_NAME@ masaüstü eşiteme istemcisi
GenericName[tr]=Klasör Eşitleme

View File

@@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
Icon[zh_TW]=@APPLICATION_EXECUTABLE@
Name[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
GenericName[zh_TW]=資料夾同步

View File

@@ -174,6 +174,8 @@ endif()
if(BUILD_CLIENT)
if(APPLE)
find_package(Sparkle)
find_package(FUSE REQUIRED)
include_directories(BEFORE ${FUSE_INCLUDE_DIR})
endif(APPLE)
if(UNIX)
@@ -183,7 +185,7 @@ if(BUILD_CLIENT)
endif()
find_package(Sphinx)
find_package(PdfLatex)
find_package(OpenSSL REQUIRED VERSION 1.0)
find_package(OpenSSL 1.1 REQUIRED)
find_package(ZLIB REQUIRED)
find_package(GLib2)
@@ -215,9 +217,6 @@ endif()
file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
set(TRANSLATIONS ${TRANS_FILES})
# Make sure we set this before recursing into child folders.
set(WITH_TESTING ${UNIT_TESTING})
if(BUILD_CLIENT)
add_subdirectory(src)
if(NOT BUILD_LIBRARIES_ONLY)
@@ -246,7 +245,9 @@ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
if(BUILD_OWNCLOUD_OSX_BUNDLE)
install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
configure_file(LoopbackFS.icns bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/LoopbackFS.icns COPYONLY)
elseif(BUILD_CLIENT)
install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
configure_file(LoopbackFS.icns bin/LoopbackFS.icns COPYONLY)
endif()

View File

@@ -1,7 +1,22 @@
ChangeLog
=========
version 2.4.0 (2017-12-XX)
version 2.4.1 (2017-02-xx)
* Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719)
* Issues: Speed up insertion and add hard upper limit (#6272)
* Notifications: Fix "Dismiss" action
* Notifications: Fix timer invocation on macOS
* Notifications: Immediately poll when account online
* Protocol: Remove entries for auto resolved conflicts (#6316)
* owncloudcmd: Set proxy before capabilities call (#6281)
* owncloudcmd: Do not do the capability call when --nonshib is passed
* Avatars: Use old location for servers <10 (#6279)
* Link shares: Change default share name (#6298)
* Nautilus integration: Work with python2 and python3
* HTTP2: Only allow with Qt 5.9.4 (#6285)
* Crash fixes
version 2.4.0 (2017-12-21)
* If you're using 2.4.0 alpha1, please upgrade as previous alphas/rcs had an issue with hidden files and renames!
* OAuth2 authentication support by opening external browser (#5668)
* Shibboleth: Change to use OAuth2 if supported (#6198)
@@ -204,7 +219,7 @@ version 2.2.2 (release 2016-06-21)
version 2.2.1 (release 2016-06-06)
* Fix out of memory error when too many uploads happen (#4611)
* Fix display errors in progress display (#4803 #4856)
* LockWatcher: Remember to upload files after they become unlocked (#4865)
* LockWatcher: Remember to upload files after they become unlocked (#4865)
* Fix overlay icons for files with umlauts (#4884)
* Certs: Re-ask for different cert after rejection (#4898, #4911)
* Progress: Don't count items without propagation jobs (#4856, #4910)
@@ -261,7 +276,7 @@ version 2.1 (release 2015-12-03)
* GUI: Improved upload/download progress UI (#3403, #3569)
* Allowed sharing with ownCloud internal users and groups from Desktop
* Changed files starting in .* to be considered hidden on all platforms (#4023)
* Reflect read-only permissions in filesystem (#3244)
* Reflect read-only permissions in filesystem (#3244)
* Blacklist: Clear on successful chunk upload (#3934)
* Improved reconnecting after network change/disconnect (#4167 #3969 ...)
* Improved performance in Windows file system discovery
@@ -335,7 +350,7 @@ version 2.0.2 (release 2015-10-21)
* ShareDialog: Fix folder display (#3659)
* AccountSettings: Restore from legacy only once (#3565)
* SSL Certificate Error Dialog: show account name (#3729)
* Tray notification: Don't show a message about modified folder (#3613)
* Tray notification: Don't show a message about modified folder (#3613)
* PropagateLocalRemove: remove entries from the DB even if there was an error.
* Settings UI improvements (eg. #3713, #3721, #3619 and others)
* Folder: Do not create the sync folder if it does not exist (#3692)
@@ -966,7 +981,7 @@ version 1.1.1 (release 2012-10-18), csync 0.60.1 required
directory, away from the .csync dir.
* Renamed exclude.lst to sync-exclude.lst and moved it to
/etc/appName()/ for more clean packaging. From the user path,
still exclude.lst is read if sync-exclude.lst is not existing.
still exclude.lst is read if sync-exclude.lst is not existing.
* Placed custom.ini with customization options to /etc/appName()
version 1.0.5 (release 2012-08-14), csync 0.50.8 required
@@ -986,8 +1001,8 @@ version 1.0.4 (release 2012-08-10), csync 0.50.8 required
* [GUI] Proxy configuration dialog added.
* [GUI] Added Translations to languages Slovenian, Polish, Catalan,
Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak,
French, Russian, Japanese, Swedish, Portuguese (Portugal)
all with translation rate >90%.
French, Russian, Japanese, Swedish, Portuguese (Portugal)
all with translation rate >90%.
* [Fixes] Loading of self signed certs into Networkmanager (#oc-843)
* [Fixes] Win32: Handle SSL dll loading correctly.
* [Fixes] Many other small fixes and improvements.

BIN
LoopbackFS.icns Normal file

Binary file not shown.

View File

@@ -1,5 +1,5 @@
set( APPLICATION_NAME "Nextcloud-e2e" )
set( APPLICATION_SHORTNAME "Nextcloud-e2e" )
set( APPLICATION_NAME "Nextcloud" )
set( APPLICATION_SHORTNAME "Nextcloud" )
set( APPLICATION_EXECUTABLE "nextcloud" )
set( APPLICATION_DOMAIN "nextcloud.com" )
set( APPLICATION_VENDOR "Nextcloud GmbH" )
@@ -20,3 +20,5 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back
option( WITH_CRASHREPORTER "Build crashreporter" OFF )
#set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
#set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
option( WITH_PROVIDERS "Build with providers list" ON )

View File

@@ -19,7 +19,7 @@ if(APPLE)
set( CPACK_GENERATOR "DragNDrop" )
set( CPACK_SOURCE_GENERATOR "")
set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} )
set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)
set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/${APPLICATION_ICON_NAME}.icns)
set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
# set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )

101
README.md
View File

@@ -1,39 +1,94 @@
# Nextcloud Desktop Client
## Introduction
The Nextcloud Desktop Client is a tool to synchronize files from Nextcloud Server
The :computer: Nextcloud Desktop Client is a tool to synchronize files from Nextcloud Server
with your computer.
## Download
<p align="center">
<img src="https://nextcloud.com/wp-content/themes/next/assets/img/clients/desktop/macsettings.png?x16328" alt="Desktop Client on Mac OS]">
</p>
### Binary packages
## :blue_heart: :tada: Contributing
* Refer to the [download page https://nextcloud.com/install/#install-clients](https://nextcloud.com/install/#install-clients)
### :hammer_and_wrench: How to compile the desktop client
### Source code
:building_construction: [System requirements](https://github.com/nextcloud/desktop/wiki/System-requirements-for-compiling-the-desktop-client) includes OpenSSL 1.1.x, QtKeychain, Qt 5.x.x and zlib.
#### :memo: Step by step instructions
##### Clone the repo and create build directory
```
$ git clone git@github.com:nextcloud/desktop.git
$ cd desktop
$ mkdir build
```
##### Compile and install
##### Linux
```
$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
$ make install
```
##### Windows
```
$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
$ cmake --build . --config Debug --target install
```
##### Mac OS
```
$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
$ make install
```
More detailed instructions can be found at the [Desktop Client Wiki](https://github.com/nextcloud/desktop/wiki).
### :inbox_tray: Where to find binaries to download
#### :high_brightness: Daily builds
- Daily builds based on the latest master are available for Linux :penguin:, Mac, and Windows
[in the desktop/daily folder of our download server](https://download.nextcloud.com/desktop/daily).
For more info: [Wiki/Daily Builds](https://github.com/nextcloud/desktop/wiki/Daily-Builds).
#### :rocket: Releases
- Refer to the [download page https://nextcloud.com/install/#install-clients](https://nextcloud.com/install/#install-clients)
### :bomb: Reporting issues
- If you find any bugs or have any suggestion for improvement, please
file an issue at https://github.com/nextcloud/client/issues. Do not
contact the authors directly by mail, as this increases the chance
of your report being lost. :boom:
### :smiley: :trophy: Pull requests
- If you created a patch :heart_eyes:, please submit a [Pull
Request](https://github.com/nextcloud/client/pulls).
## :satellite: Contact us
If you want to contact us, e.g. before starting a more complex feature, for questions :question:
you can join us at
[#nextcloud-client](https://webchat.freenode.net/?channels=nextcloud-client).
## :v: Code of conduct
The Nextcloud community has core values that are shared between all members during conferences, hackweeks and on all interactions in online platforms including [Github](https://github.com/nextcloud) and [Forums](https://help.nextcloud.com). If you contribute, participate or interact with this community, please respect [our shared values](https://nextcloud.com/code-of-conduct/). :relieved:
## :memo: Source code
The Nextcloud Desktop Client is developed in Git. Since Git makes it easy to
fork and improve the source code and to adapt it to your need, many copies
can be found on the Internet, in particular on GitHub. However, the
authoritative repository maintained by the developers is located at
https://github.com/nextcloud/client.
https://github.com/nextcloud/desktop.
## Reporting issues and contributing
If you find any bugs or have any suggestion for improvement, please
file an issue at https://github.com/nextcloud/client/issues. Do not
contact the authors directly by mail, as this increases the chance
of your report being lost.
If you created a patch, please submit a [Pull
Request](https://github.com/nextcloud/client/pulls).
If you want to contact us, e.g. before starting a more complex feature,
you can join us at
[#nextcloud-dev](irc://irc.freenode.net/#nextcloud-dev).
## License
## :scroll: License
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

View File

@@ -1,7 +1,7 @@
set( MIRALL_VERSION_MAJOR 2 )
set( MIRALL_VERSION_MINOR 5 )
set( MIRALL_VERSION_PATCH 0 )
set( MIRALL_VERSION_YEAR 2017 )
set( MIRALL_VERSION_YEAR 2018 )
set( MIRALL_SOVERSION 0 )
if ( NOT DEFINED MIRALL_VERSION_SUFFIX )

View File

@@ -5,8 +5,8 @@ set -xe
mkdir /app
mkdir /build
#Set Qt-5.9
export QT_BASE_DIR=/opt/qt59
#Set Qt-5.11
export QT_BASE_DIR=/opt/qt511
export QTDIR=$QT_BASE_DIR
export PATH=$QT_BASE_DIR/bin:$PATH
export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
@@ -71,8 +71,13 @@ cp ./usr/share/icons/hicolor/512x512/apps/Nextcloud.png . # Workaround for linux
# Because distros need to get their shit together
cp -P /lib/x86_64-linux-gnu/libssl.so* ./usr/lib/
cp -P /lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/
cp -R /lib/x86_64-linux-gnu/libssl.so* ./usr/lib/
cp -R /lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/
cp -P /usr/local/lib/libssl.so* ./usr/lib/
cp -P /usr/local/lib/libcrypto.so* ./usr/lib/
# NSS fun
cp -P -r /usr/lib/x86_64-linux-gnu/nss ./usr/lib/
# Use linuxdeployqt to deploy
cd /build

View File

@@ -1,4 +0,0 @@
usr/lib/*/libnextclouddolphinpluginhelper.so
usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
usr/share/kservices5/nextclouddolphinactionplugin.desktop

View File

@@ -1,22 +1,22 @@
nextcloud-client (2.3.3-1.0~artful1) artful; urgency=medium
nextcloud-client (2.3.3-1.0~bionic1) bionic; urgency=medium
* Debian build support for the forked client.
-- István Váradi <ivaradi@varadiistvan.hu> Mon, 6 Nov 2017 20:20:04 +0100
nextcloud-client (2.3.1-1.0~artful1) artful; urgency=medium
nextcloud-client (2.3.1-1.0~bionic1) bionic; urgency=medium
* New upstream version
-- István Váradi <ivaradi@varadiistvan.hu> Thu, 23 Mar 2017 19:07:36 +0100
nextcloud-client (2.3.0-1.0~artful1) artful; urgency=medium
nextcloud-client (2.3.0-1.0~bionic1) bionic; urgency=medium
* New upstream version
-- István Váradi <ivaradi@varadiistvan.hu> Tue, 21 Mar 2017 19:34:13 +0100
nextcloud-client (2.2.4-1.4~artful1) artful; urgency=medium
nextcloud-client (2.2.4-1.4~bionic1) bionic; urgency=medium
* The locale-specific icon names are correct too

View File

@@ -0,0 +1,88 @@
Source: nextcloud-client
Section: contrib/devel
Priority: optional
Maintainer: István Váradi <ivaradi@varadiistvan.hu>
Build-Depends: cmake,
debhelper,
cdbs,
dh-python,
extra-cmake-modules (>= 5.16),
kdelibs5-dev,
kio-dev,
libcmocka-dev,
libhttp-dav-perl,
libinotify-dev [kfreebsd-any],
libqt5webkit5-dev,
libsqlite3-dev,
libssl-dev (>> 1.0.0),
zlib1g-dev,
optipng,
pkg-kde-tools,
python-sphinx | python3-sphinx,
python3-all,
qt5keychain-dev,
qtwebengine5-dev,
qtdeclarative5-dev,
qttools5-dev,
qttools5-dev-tools,
xvfb
Standards-Version: 3.9.8
Homepage: https://github.com/nextcloud/client_theming
#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
Package: nextcloud-client
Architecture: any
Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
Description: Nextcloud desktop sync client
Use the desktop client to keep your files synchronized
between your Nextcloud server and your desktop. Select
one or more directories on your local machine and always
have access to your latest files wherever you are.
Package: libnextcloudsync0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Nextcloud sync library
Used by the Nextcloud desktop client as the synchronization engine.
Package: libnextcloudsync-dev
Architecture: any
Section: contrib/libdevel
Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
Description: Nextcloud sync library development files
The headers and development library for the Nextcloud sync library.
Package: nextcloud-client-l10n
Architecture: all
Depends: ${misc:Depends}
Description: Nextcloud client internatialization files
The translation files.
Package: nextcloud-client-nautilus
Architecture: all
Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
Description: Nautilus plugin for Nextcloud
This package contains a Nautilus plugin to display
synchronization status icons for Nextcloud files.
Package: nextcloud-client-nemo
Architecture: all
Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
Description: Nemo plugin for Nextcloud
This package contains a Nemo plugin to display
synchronization status icons for Nextcloud files.
Package: nextcloud-client-caja
Architecture: all
Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
Description: Caja plugin for Nextcloud
This package contains a Caja plugin to display
synchronization status icons for Nextcloud files.
Package: nextcloud-client-dolphin
Architecture: any
Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
Description: Dolphin plugin for Nextcloud
This package contains a Dolphin plugin to display
synchronization status icons for Nextcloud files.

View File

@@ -1,22 +1,22 @@
nextcloud-client (2.3.3-1.0~zesty1) zesty; urgency=medium
nextcloud-client (2.3.3-1.0~cosmic1) cosmic; urgency=medium
* Debian build support for the forked client.
-- István Váradi <ivaradi@varadiistvan.hu> Mon, 6 Nov 2017 20:20:04 +0100
nextcloud-client (2.3.1-1.0~zesty1) zesty; urgency=medium
nextcloud-client (2.3.1-1.0~cosmic1) cosmic; urgency=medium
* New upstream version
-- István Váradi <ivaradi@varadiistvan.hu> Thu, 23 Mar 2017 19:07:36 +0100
nextcloud-client (2.3.0-1.0~zesty1) zesty; urgency=medium
nextcloud-client (2.3.0-1.0~cosmic1) cosmic; urgency=medium
* New upstream version
-- István Váradi <ivaradi@varadiistvan.hu> Tue, 21 Mar 2017 19:34:13 +0100
nextcloud-client (2.2.4-1.4~zesty1) zesty; urgency=medium
nextcloud-client (2.2.4-1.4~cosmic1) cosmic; urgency=medium
* The locale-specific icon names are correct too

View File

@@ -0,0 +1,88 @@
Source: nextcloud-client
Section: contrib/devel
Priority: optional
Maintainer: István Váradi <ivaradi@varadiistvan.hu>
Build-Depends: cmake,
debhelper,
cdbs,
dh-python,
extra-cmake-modules (>= 5.16),
kdelibs5-dev,
kio-dev,
libcmocka-dev,
libhttp-dav-perl,
libinotify-dev [kfreebsd-any],
libqt5webkit5-dev,
libsqlite3-dev,
libssl-dev (>> 1.0.0),
zlib1g-dev,
optipng,
pkg-kde-tools,
python-sphinx | python3-sphinx,
python3-all,
qt5keychain-dev,
qtwebengine5-dev,
qtdeclarative5-dev,
qttools5-dev,
qttools5-dev-tools,
xvfb
Standards-Version: 3.9.8
Homepage: https://github.com/nextcloud/client_theming
#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
Package: nextcloud-client
Architecture: any
Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
Description: Nextcloud desktop sync client
Use the desktop client to keep your files synchronized
between your Nextcloud server and your desktop. Select
one or more directories on your local machine and always
have access to your latest files wherever you are.
Package: libnextcloudsync0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Nextcloud sync library
Used by the Nextcloud desktop client as the synchronization engine.
Package: libnextcloudsync-dev
Architecture: any
Section: contrib/libdevel
Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
Description: Nextcloud sync library development files
The headers and development library for the Nextcloud sync library.
Package: nextcloud-client-l10n
Architecture: all
Depends: ${misc:Depends}
Description: Nextcloud client internatialization files
The translation files.
Package: nextcloud-client-nautilus
Architecture: all
Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
Description: Nautilus plugin for Nextcloud
This package contains a Nautilus plugin to display
synchronization status icons for Nextcloud files.
Package: nextcloud-client-nemo
Architecture: all
Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
Description: Nemo plugin for Nextcloud
This package contains a Nemo plugin to display
synchronization status icons for Nextcloud files.
Package: nextcloud-client-caja
Architecture: all
Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
Description: Caja plugin for Nextcloud
This package contains a Caja plugin to display
synchronization status icons for Nextcloud files.
Package: nextcloud-client-dolphin
Architecture: any
Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
Description: Dolphin plugin for Nextcloud
This package contains a Dolphin plugin to display
synchronization status icons for Nextcloud files.

View File

@@ -21,6 +21,7 @@ Build-Depends: cmake,
python-sphinx | python3-sphinx,
python3-all,
qt5keychain-dev,
qtwebengine5-dev,
qtdeclarative5-dev,
qttools5-dev,
qttools5-dev-tools,
@@ -33,6 +34,7 @@ Homepage: https://github.com/nextcloud/client_theming
Package: nextcloud-client
Architecture: any
Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
Recommends: libgnome-keyring0
Description: Nextcloud desktop sync client
Use the desktop client to keep your files synchronized
between your Nextcloud server and your desktop. Select

View File

@@ -0,0 +1,24 @@
Binary files nextcloud-client-2.4.0.orig/.git/index and nextcloud-client-2.4.0/.git/index differ
diff -ruN nextcloud-client-2.4.0.orig/src/CMakeLists.txt nextcloud-client-2.4.0/src/CMakeLists.txt
--- nextcloud-client-2.4.0.orig/src/CMakeLists.txt 2018-02-01 19:16:38.461162563 +0100
+++ nextcloud-client-2.4.0/src/CMakeLists.txt 2018-02-01 19:20:20.253824030 +0100
@@ -4,7 +4,7 @@
set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
-find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
+find_package(Qt5 5.5 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
if (Qt5Core_VERSION VERSION_LESS 5.9.0)
message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
endif()
--- nextcloud-client-2.4.0.orig/admin/osx/CMakeLists.txt 2018-05-22 07:01:48.248646951 +0200
+++ nextcloud-client-2.4.0/admin/osx/CMakeLists.txt 2018-05-22 07:01:51.012689711 +0200
@@ -11,7 +11,7 @@
set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
endif()
-find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
+find_package(Qt5 5.5 COMPONENTS Core REQUIRED)
configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)

View File

@@ -1,48 +0,0 @@
nextcloud-client (2.3.3-1.0~yakkety1) yakkety; urgency=medium
* Debian build support for the forked client.
-- István Váradi <ivaradi@varadiistvan.hu> Mon, 6 Nov 2017 20:20:04 +0100
nextcloud-client (2.3.1-1.0~yakkety1) yakkety; urgency=medium
* New upstream version
-- István Váradi <ivaradi@varadiistvan.hu> Thu, 23 Mar 2017 19:07:36 +0100
nextcloud-client (2.3.0-1.0~yakkety1) yakkety; urgency=medium
* New upstream version
-- István Váradi <ivaradi@varadiistvan.hu> Tue, 21 Mar 2017 19:34:13 +0100
nextcloud-client (2.2.4-1.4~yakkety1) yakkety; urgency=medium
* The locale-specific icon names are correct too
-- István Váradi <ivaradi@varadiistvan.hu> Tue, 7 Feb 2017 19:55:40 +0100
nextcloud-client (2.2.4-1.3~yakkety1) yakkety; urgency=medium
* Caja syncstate plugin is built.
* The syncstate plugin has application-specific name
-- István Váradi <ivaradi@varadiistvan.hu> Fri, 27 Jan 2017 19:34:18 +0100
nextcloud-client (2.2.4-1.2~yakkety1) yakkety; urgency=medium
* Fixed appname in the Nemo syncstate extension.
-- István Váradi <ivaradi@varadiistvan.hu> Thu, 19 Jan 2017 16:46:50 +0100
nextcloud-client (2.2.4-1.1~yakkety1) yakkety; urgency=medium
* Added Nautilus and Nemo syncstate extensions.
-- István Váradi <ivaradi@varadiistvan.hu> Tue, 17 Jan 2017 19:55:32 +0100
nextcloud-client (2.2.4-1.0~yakkety1) yakkety; urgency=medium
* Initial release.
-- István Váradi <ivaradi@varadiistvan.hu> Wed, 14 Dec 2016 20:07:46 +0100

View File

@@ -1,4 +0,0 @@
usr/lib/*/libnextclouddolphinpluginhelper.so
usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
usr/share/kservices5/nextclouddolphinactionplugin.desktop

View File

@@ -1,4 +0,0 @@
usr/lib/*/libnextclouddolphinpluginhelper.so
usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
usr/share/kservices5/nextclouddolphinactionplugin.desktop

View File

@@ -21,6 +21,7 @@ Build-Depends: cmake,
python-sphinx | python3-sphinx,
python3-all,
qt5keychain-dev,
qtwebengine5-dev,
qtdeclarative5-dev,
qttools5-dev,
qttools5-dev-tools,
@@ -33,6 +34,7 @@ Homepage: https://github.com/nextcloud/client_theming
Package: nextcloud-client
Architecture: any
Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
Recommends: libgnome-keyring0
Description: Nextcloud desktop sync client
Use the desktop client to keep your files synchronized
between your Nextcloud server and your desktop. Select

View File

@@ -1,4 +1,4 @@
usr/lib/*/libnextclouddolphinpluginhelper.so
usr/lib/*/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
usr/lib/*/plugins/nextclouddolphinactionplugin.so
usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
usr/share/kservices5/nextclouddolphinactionplugin.desktop

124
admin/linux/debian/drone-build.sh Executable file
View File

@@ -0,0 +1,124 @@
#!/bin/bash
set -xe
shopt -s extglob
PPA=ppa:nextcloud-devs/client-beta
PPA_BETA=ppa:nextcloud-devs/client-alpha
OBS_PROJECT=home:ivaradi:beta
OBS_PROJECT_BETA=home:ivaradi:alpha
OBS_PACKAGE=nextcloud-client
pull_request=${DRONE_PULL_REQUEST:=master}
if test -z "${DRONE_WORKSPACE}"; then
DRONE_WORKSPACE=`pwd`
fi
if test -z "${DRONE_DIR}"; then
DRONE_DIR=`dirname ${DRONE_WORKSPACE}`
fi
set +x
if test "$DEBIAN_SECRET_KEY" -a "$DEBIAN_SECRET_IV"; then
openssl aes-256-cbc -K $DEBIAN_SECRET_KEY -iv $DEBIAN_SECRET_IV -in admin/linux/debian/signing-key.txt.enc -d | gpg --import
openssl aes-256-cbc -K $DEBIAN_SECRET_KEY -iv $DEBIAN_SECRET_IV -in admin/linux/debian/oscrc.enc -out ~/.oscrc -d
touch ~/.has_ppa_keys
fi
set -x
cd "${DRONE_WORKSPACE}"
read basever kind <<<$(admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog stable)
cd "${DRONE_DIR}"
echo "$kind" > kind
kind="release"
if test "$kind" = "beta"; then
repo=nextcloud-devs/client-alpha
else
repo=nextcloud-devs/client-beta
fi
origsourceopt=""
if ! wget http://ppa.launchpad.net/${repo}/ubuntu/pool/main/n/nextcloud-client/nextcloud-client_${basever}.orig.tar.bz2; then
cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
tar cjf nextcloud-client_${basever}.orig.tar.bz2 --exclude .git nextcloud-client_${basever}
origsourceopt="-sa"
fi
for distribution in xenial bionic cosmic stable; do
rm -rf nextcloud-client_${basever}
cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
cd nextcloud-client_${basever}
cp -a admin/linux/debian/debian .
if test -d admin/linux/debian/debian.${distribution}; then
tar cf - -C admin/linux/debian/debian.${distribution} . | tar xf - -C debian
fi
admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution}
cp /tmp/tmpchangelog debian/changelog
if test -f admin/linux/debian/debian.${distribution}/changelog; then
cat admin/linux/debian/debian.${distribution}/changelog >> debian/changelog
else
cat admin/linux/debian/debian/changelog >> debian/changelog
fi
for p in debian/post-patches/*.patch; do
if test -f "${p}"; then
echo "Applying ${p}"
patch -p1 < "${p}"
fi
done
fullver=`head -1 debian/changelog | sed "s:nextcloud-client (\([^)]*\)).*:\1:"`
EDITOR=true dpkg-source --commit . local-changes
dpkg-source --build .
dpkg-genchanges -S ${origsourceopt} > "../nextcloud-client_${fullver}_source.changes"
if test -f ~/.has_ppa_keys; then
debsign -k7D14AA7B -S
fi
cd ..
done
if test "${pull_request}" = "master"; then
kind=`cat kind`
if test "$kind" = "beta"; then
PPA=$PPA_BETA
OBS_PROJECT=$OBS_PROJECT_BETA
fi
OBS_SUBDIR="${OBS_PROJECT}/${OBS_PACKAGE}"
if test -f ~/.has_ppa_keys; then
for changes in nextcloud-client_*~+([a-z])1_source.changes; do
dput $PPA $changes > /dev/null
done
mkdir osc
cd osc
osc co ${OBS_PROJECT} ${OBS_PACKAGE}
if test "$(ls ${OBS_SUBDIR})"; then
osc delete ${OBS_SUBDIR}/*
fi
cp ../nextcloud-client*.orig.tar.* ${OBS_SUBDIR}/
cp ../nextcloud-client_*[0-9.][0-9].dsc ${OBS_SUBDIR}/
cp ../nextcloud-client_*[0-9.][0-9].debian.tar* ${OBS_SUBDIR}/
cp ../nextcloud-client_*[0-9.][0-9]_source.changes ${OBS_SUBDIR}/
osc add ${OBS_SUBDIR}/*
cd ${OBS_SUBDIR}
osc commit -m "Travis update"
fi
fi

Binary file not shown.

View File

@@ -75,6 +75,15 @@ if test -d "${scriptdir}/../debian.${distribution}"; then
tar cf - -C "${scriptdir}/../debian.${distribution}" . | tar xf - -C "${packagedir}/debian"
fi
pushd "${packagedir}"
for p in debian/post-patches/*.patch; do
if test -f "${p}"; then
echo "Applying ${p}"
patch -p1 < "${p}"
fi
done
popd
"${scriptdir}/git2changelog.py" /tmp/git2changelog "${distribution}"
mv "${packagedir}/debian/changelog" "${packagedir}/debian/changelog.old"
cat /tmp/git2changelog "${packagedir}/debian/changelog.old" > "${packagedir}/debian/changelog"

View File

@@ -4,5 +4,5 @@
# accross to the main repo for a pull request, so
# some hacking is needed
[versionhack]
#commit = 30986d6
#tag = v2.3.3-beta
commit = bc7e65b39552ac458b2adacf76cbf98735ec29a0
tag = v2.4.0-beta

View File

@@ -18,6 +18,27 @@ def processVersionTag(tag):
else:
return None
def getCommitVersion(commit):
major=None
minor=None
patch=None
for line in subprocess.check_output(["git", "show",
commit + ":VERSION.cmake"]).splitlines():
m = re.match("set\( MIRALL_VERSION_([A-Z]+) +([0-9])+ *\)", line)
if m is not None:
kind=m.group(1)
version=m.group(2)
if kind=="MAJOR":
major=version
elif kind=="MINOR":
minor=version
elif kind=="PATCH":
patch=version
if major and minor and patch:
return major + "." + minor + "." + patch
else:
return None
def collectEntries(baseCommit, baseVersion, kind):
scriptdir = os.path.dirname(__file__)
configPath = os.path.join(scriptdir, "git2changelog.cfg")
@@ -47,6 +68,7 @@ def collectEntries(baseCommit, baseVersion, kind):
lastVersionTag = None
lastCMAKEVersion = None
for line in output.splitlines():
(commit, name, email, date, revdate, subject) = line.split("\t")
revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S")
@@ -57,6 +79,17 @@ def collectEntries(baseCommit, baseVersion, kind):
newVersionOrigTag = lastVersionTag
(baseVersion, kind) = result
version=getCommitVersion(commit)
if version and version!=lastCMAKEVersion:
tag = "v" + version
if tag!=newVersionOrigTag:
result = processVersionTag(tag)
if result:
lastVersionTag = tag
lastCMAKEVersion = version
(baseVersion, kind) = result
for tag in subprocess.check_output(["git", "tag",
"--points-at",
commit]).splitlines():
@@ -66,6 +99,7 @@ def collectEntries(baseCommit, baseVersion, kind):
lastVersionTag = tag
(baseVersion, kind) = result
entries.append((commit, name, email, date, revdate, subject,
baseVersion, kind))

View File

@@ -1,143 +0,0 @@
#!/bin/bash
set -xe
shopt -s extglob
TRAVIS_BUILD_STEP="$1"
PPA=ppa:nextcloud-devs/client-alpha
PPA_BETA=ppa:nextcloud-devs/client-beta
OBS_PROJECT=home:ivaradi:alpha
OBS_PROJECT_BETA=home:ivaradi:beta
OBS_PACKAGE=nextcloud-client
if [ "$TRAVIS_BUILD_STEP" == "install" ]; then
sudo apt-get update -q
sudo apt-get install -y devscripts cdbs osc
if test "$encrypted_585e03da75ed_key" -a "$encrypted_585e03da75ed_iv"; then
openssl aes-256-cbc -K $encrypted_585e03da75ed_key -iv $encrypted_585e03da75ed_iv -in admin/linux/debian/signing-key.txt.enc -d | gpg --import
echo "DEBUILD_DPKG_BUILDPACKAGE_OPTS='-k7D14AA7B'" >> ~/.devscripts
openssl aes-256-cbc -K $encrypted_585e03da75ed_key -iv $encrypted_585e03da75ed_iv -in admin/linux/debian/oscrc.enc -out ~/.oscrc -d
touch ~/.has_ppa_keys
elif test "$encrypted_8da7a4416c7a_key" -a "$encrypted_8da7a4416c7a_iv"; then
openssl aes-256-cbc -K $encrypted_8da7a4416c7a_key -iv $encrypted_8da7a4416c7a_iv -in admin/linux/debian/oscrc.enc -out ~/.oscrc -d
PPA=ppa:ivaradi/nextcloud-client-exp
elif test "$encrypted_c5306c5c5331_key" -a "$encrypted_c5306c5c5331_key"; then
openssl aes-256-cbc -K $encrypted_c5306c5c5331_key -iv $encrypted_c5306c5c5331_iv -in admin/linux/debian/oscrc.enc -out ~/.oscrc -d
PPA=ppa:ivaradi/nextcloud-client-exp
elif test "$encrypted_5dafbd038603_key" -a "$encrypted_5dafbd038603_iv"; then
openssl aes-256-cbc -K $encrypted_5dafbd038603_key -iv $encrypted_5dafbd038603_iv -in admin/linux/debian/signing-key.txt.enc -d | gpg --import
echo "DEBUILD_DPKG_BUILDPACKAGE_OPTS='-k7D14AA7B'" >> ~/.devscripts
openssl aes-256-cbc -K $encrypted_5dafbd038603_key -iv $encrypted_5dafbd038603_iv -in admin/linux/debian/oscrc.enc -out ~/.oscrc -d
touch ~/.has_ppa_keys
fi
elif [ "$TRAVIS_BUILD_STEP" == "script" ]; then
read basever kind <<<$(admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog stable)
cd ..
echo "$kind" > kind
kind="release"
if test "$encrypted_5dafbd038603_key" -a "$encrypted_5dafbd038603_iv"; then
repo=ivaradi/nextcloud-client-exp
else
if test "$kind" = "beta"; then
repo=nextcloud-devs/client-beta
else
repo=nextcloud-devs/client-alpha
fi
fi
if test -d nextcloud.client; then
gitdir="nextcloud.client"
else
gitdir="client"
fi
origsourceopt=""
if ! wget http://ppa.launchpad.net/${repo}/ubuntu/pool/main/n/nextcloud-client/nextcloud-client_${basever}.orig.tar.bz2; then
mv ${gitdir} nextcloud-client_${basever}
tar cjf nextcloud-client_${basever}.orig.tar.bz2 --exclude .git nextcloud-client_${basever}
mv nextcloud-client_${basever} ${gitdir}
origsourceopt="-sa"
fi
for distribution in xenial zesty artful stable; do
rm -rf nextcloud-client_${basever}
cp -a ${gitdir} nextcloud-client_${basever}
cd nextcloud-client_${basever}
cp -a admin/linux/debian/debian .
if test -d admin/linux/debian/debian.${distribution}; then
tar cf - -C admin/linux/debian/debian.${distribution} . | tar xf - -C debian
fi
admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution}
cp /tmp/tmpchangelog debian/changelog
if test -f admin/linux/debian/debian.${distribution}/changelog; then
cat admin/linux/debian/debian.${distribution}/changelog >> debian/changelog
else
cat admin/linux/debian/debian/changelog >> debian/changelog
fi
EDITOR=true dpkg-source --commit . local-changes
if test -f ~/.has_ppa_keys; then
debuild -S ${origsourceopt}
else
debuild -S ${origsourceopt} -us -uc
fi
cd ..
done
elif [ "$TRAVIS_BUILD_STEP" == "ppa_deploy" ]; then
cd ..
kind=`cat kind`
if test "$encrypted_5dafbd038603_key" -a "$encrypted_5dafbd038603_iv"; then
PPA=ppa:ivaradi/nextcloud-client-exp
fi
echo "kind: $kind"
if test "$kind" = "beta"; then
PPA=$PPA_BETA
OBS_PROJECT=$OBS_PROJECT_BETA
fi
OBS_SUBDIR="${OBS_PROJECT}/${OBS_PACKAGE}"
if test -f ~/.has_ppa_keys; then
for changes in nextcloud-client_*~+([a-z])1_source.changes; do
dput $PPA $changes > /dev/null
done
fi
mkdir osc
cd osc
osc co ${OBS_PROJECT} ${OBS_PACKAGE}
if test "$(ls ${OBS_SUBDIR})"; then
osc delete ${OBS_SUBDIR}/*
fi
cp ../nextcloud-client*.orig.tar.* ${OBS_SUBDIR}/
cp ../nextcloud-client_*[0-9.][0-9].dsc ${OBS_SUBDIR}/
cp ../nextcloud-client_*[0-9.][0-9].debian.tar* ${OBS_SUBDIR}/
cp ../nextcloud-client_*[0-9.][0-9]_source.changes ${OBS_SUBDIR}/
osc add ${OBS_SUBDIR}/*
cd ${OBS_SUBDIR}
osc commit -m "Travis update"
fi

View File

@@ -1,19 +0,0 @@
#!/bin/bash
# Copyright (C) 2017 Marco Trevisan
set -xe
TRAVIS_BUILD_STEP="$1"
THIS_PATH=$(dirname $0)
if [ -z "$TRAVIS_BUILD_STEP" ]; then
echo "No travis build step defined"
exit 0
fi
if [ "$BUILD_TYPE" == "debian" ]; then
admin/linux/debian/travis-build.sh "$@"
else
echo 'No $BUILD_TYPE defined'
exit 1
fi

View File

@@ -11,7 +11,10 @@ else()
set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
endif()
configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh)
configure_file(fuse/FUSE\ for\ macOS\ 3.8.1.pkg ${CMAKE_CURRENT_BINARY_DIR}/fuse/FUSE\ for\ macOS\ 3.8.1.pkg COPYONLY)
configure_file(fuse/settings.plist ${CMAKE_CURRENT_BINARY_DIR}/fuse/settings.plist COPYONLY)

View File

@@ -23,7 +23,7 @@ identity="$3"
prjfile=$build_path/admin/osx/macosx.pkgproj
# The name of the installer package
installer="@APPLICATION_SHORTNAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
installer="@APPLICATION_SHORTNAME@-qt@Qt5Core_VERSION@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
installer_file="$installer.pkg"
installer_file_tar="$installer.pkg.tar"
installer_file_tar_bz2="$installer.pkg.tar.bz2"

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>URL</key>
<string>https://github.com/libfuse/libfuse</string>
</dict>
</plist>

Binary file not shown.

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>URL</key>
<string>https://osxfuse.github.io</string>
</dict>
</plist>

View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleAllowMixedLocalizations</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
<string>Uninstaller</string>
<key>CFBundleExecutable</key>
<string>applet</string>
<key>CFBundleIconFile</key>
<string>Uninstaller</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Uninstaller</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>aplt</string>
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>
<key>x86_64</key>
<string>10.6</string>
</dict>
<key>LSRequiresCarbon</key>
<true/>
<key>LSUIElement</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>Copyright © Benjamin Fleischer. All rights reserved.</string>
</dict>
</plist>

Binary file not shown.

View File

@@ -0,0 +1 @@
APPLaplt

View File

@@ -0,0 +1,10 @@
"welcome_text" = "Remove FUSE for macOS?";
"welcome_message" = "In case FUSE for macOS was installed using a package manager (e.g. Homebrew, MacPorts), please follow the instructions provided by the package manager for removing FUSE for macOS.\n\nIt is recommended to restart the Mac once the uninstallation is complete. Would you like to continue?";
"welcome_no" = "No";
"welcome_yes" = "Yes";
"uninstaller_successful_text" = "Uninstallation successful";
"uninstaller_successful_message" = "FUSE for macOS has been sucessfully removed.";
"uninstaller_failed_text" = "Uninstallation failed";
"uninstaller_failed_message" = "FUSE for macOS could not be removed due to an unknown error.";

View File

@@ -0,0 +1,10 @@
"welcome_text" = "FUSE for macOS entfernen?";
"welcome_message" = "Falls FUSE for macOS mit Hilfe eines Paket Managers (z.B. Homebrew, MacPorts) installiert wurde, folgen Sie bitte den Anweisungen des Paket Managers, um FUSE for macOS zu entfernen.\n\nEs wird empfohlen den Mac nach Abschluss der Deinstallation neu zu starten. Möchten Sie fortfahren?";
"welcome_no" = "Nein";
"welcome_yes" = "Ja";
"uninstaller_successful_text" = "Deinstallation erfolgreich";
"uninstaller_successful_message" = "FUSE for macOS wurde erfolgreich entfernt.";
"uninstaller_failed_text" = "Deinstallation fehlgeschlagen";
"uninstaller_failed_message" = "Bei der Deinstallation von FUSE for macOS ist ein unbekannter Fehler aufgetreten.";

View File

@@ -0,0 +1,247 @@
#!/bin/bash
# Copyright (c) 2011-2014 Benjamin Fleischer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# Requires common.sh
# Requires math.sh
# Requires string.sh
function array_is_array
{
if common_is_variable "${1}"
then
[[ "`declare -p "${1}" 2> /dev/null`" =~ ^"declare -"[^=]{0,}"a"[^=]{0,}" ${1}=" ]]
else
return 1
fi
}
function array_create
{
common_assert "common_variable_is_legal_name `string_escape "${1}"`"
eval "${1}=()"
}
function array_size
{
common_assert "array_is_array `string_escape "${1}"`"
eval "printf \"%u\" \${#${1}[@]}"
}
function array_get
{
if [[ -z "${3}" ]]
then
common_assert "common_is_variable `string_escape "${1}"`"
common_assert "math_is_integer `string_escape "${2}"` && [[ ${2} -ge 0 ]]"
eval "string_escape \"\${${1}[${2}]}\""
else
common_assert "common_is_variable `string_escape "${3}"`"
eval "${3}=`array_get "${1}" "${2}"`"
fi
}
function array_set
{
common_assert "common_is_variable `string_escape "${1}"`"
common_assert "math_is_integer `string_escape "${2}"` && [[ ${2} -ge 0 ]]"
eval "${1}[${2}]=`string_escape "${3}"`"
}
function array_append
{
common_assert "common_is_variable `string_escape "${1}"`"
eval "${1}+=(`string_escape "${2}"`)"
}
function array_get_elements
{
common_assert "common_is_variable `string_escape "${1}"`"
function array_get_elements_serialize
{
local offset=$(( ${#} / 2 + 1 ))
if [[ ${#} -ge ${offset} ]]
then
printf '[%q]=%q' "${1}" "${!offset}"
shift
while [[ ${#} -ge ${offset} ]]
do
printf ' [%q]=%q' "${1}" "${!offset}"
shift
done
fi
}
eval "array_get_elements_serialize \"\${!${1}[@]}\" \"\${${1}[@]}\""
local rc=${?}
unset -f array_get_elements_serialize
return ${rc}
}
function array_foreach
{
common_assert "common_is_variable `string_escape "${1}"`"
common_assert "common_is_function `string_escape "${2}"`"
common_assert "[[ ! `string_escape "${2}"` =~ ^array_foreach_ ]]"
eval "
function array_foreach_internal
{
while [[ \${#} -gt 0 ]]
do
if ${2} \"\${1}\"
then
shift
else
return \${?}
fi
done
}
function array_foreach_wrapper
{
array_foreach_internal \"\${${1}[@]}\"
}
" && array_foreach_wrapper
local rc=${?}
unset -f array_foreach_internal
unset -f array_foreach_wrapper
return ${rc}
}
function array_contains
{
eval "
function array_contains_compare
{
[[ \"\${1}\" != `string_escape "${2}"` ]]
}
" && ! array_foreach "${1}" array_contains_compare
local rc=${?}
unset -f array_contains_compare
return ${rc}
}
function array_sort
{
common_assert "common_is_variable `string_escape "${1}"`"
common_assert "common_is_function `string_escape "${2}"`"
common_assert "[[ ! `string_escape "${2}"` =~ ^array_sort_ ]]"
common_assert "[[ `string_escape "${3}"` =~ !? ]]"
eval "
function array_sort_quicksort
{
local -a left=()
local -a right=()
local pivot=""
if [[ \${#} -eq 0 ]]
then
return 0
fi
pivot=\"\${1}\"
shift
while [[ \${#} -gt 0 ]]
do
${2} \"\${1}\" \"\${pivot}\"
if [[ ${3} \${?} -le 1 ]]
then
left[\${#left[@]}]=\"\${1}\"
else
right[\${#right[@]}]=\"\${1}\"
fi
shift
done
if [[ \${#left[@]} -gt 0 ]]
then
array_sort_quicksort \"\${left[@]}\"
fi
string_escape \"\${pivot}\"
printf \"%s\" \"\${IFS}\"
if [[ \${#right[@]} -gt 0 ]]
then
array_sort_quicksort \"\${right[@]}\"
fi
}
function array_sort_wrapper
{
eval \"${1}=(\$(array_sort_quicksort \"\${${1}[@]}\"))\"
}
" && array_sort_wrapper
local rc=${?}
unset -f array_sort_quicksort
unset -f array_sort_wrapper
return ${rc}
}
function array_join
{
common_assert "common_is_variable `string_escape "${1}"`"
eval "
function array_join_internal
{
printf \"%s\" \"\${1}\"
shift
while [[ \${#} -gt 0 ]]
do
printf \"%s%s\" `string_escape "${2:-, }"` \"\${1}\"
shift
done
printf \"\n\"
}
function array_join_wrapper
{
array_join_internal \"\${${1}[@]}\"
}
" && array_join_wrapper
local rc=${?}
unset -f array_join_internal
unset -f array_join_wrapper
return ${rc}
}

View File

@@ -0,0 +1,578 @@
#!/bin/bash
# Copyright (c) 2011-2014 Benjamin Fleischer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# Requires array.sh
# Requires math.sh
# Requires string.sh
declare -a COMMON_LOG_PREFIX=()
declare -i COMMON_LOG_VERBOSE=2
function common_log_initialize
{
common_log_set_verbose ${COMMON_LOG_VERBOSE}
}
function common_log_set_verbose
{
local verbose="${1}"
common_assert "math_is_integer `string_escape "${verbose}"`"
common_assert "[[ ${verbose} -gt 0 ]]"
COMMON_LOG_VERBOSE=${verbose}
if (( COMMON_LOG_VERBOSE > 4 ))
then
exec 3>&1
exec 4>&2
else
exec 3> /dev/null
exec 4> /dev/null
fi
}
function common_log
{
local -a options=()
common_getopt options "v:,verbose:,c:,color:,t,trace,o:,offset:" "${@}"
common_die_on_error "${options[@]}"
set -- "${options[@]}"
local -i verbose=2
local color=""
local -i trace=0
local -i trace_offset=0
while [[ ${#} -gt 0 ]]
do
case "${1}" in
--)
shift
break
;;
-v|--verbose)
verbose="${2}"
shift 2
;;
-c|--color)
color="${2}"
shift 2
;;
-t|--trace)
trace=1
shift
;;
-o|--trace-offset)
trace_offset="${2}"
shift 2
;;
esac
done
if (( verbose > COMMON_LOG_VERBOSE ))
then
return 0
fi
if [[ -z "${color}" ]]
then
case ${verbose} in
1|2)
color="1;30"
;;
4)
color="0;37"
;;
[0-9]+)
color="0:30"
;;
esac
fi
if (( trace == 1 ))
then
local -a stack=()
local -i i=${trace_offset}
local caller=""
local function=""
local file=""
local line=""
while caller="`caller ${i}`"
do
function="`/usr/bin/cut -d " " -f 2 <<< "${caller}"`"
file="`/usr/bin/cut -d " " -f 3- <<< "${caller}"`"
line="`/usr/bin/cut -d " " -f 1 <<< "${caller}"`"
array_append stack "at ${function} (${file}, line ${line})"
(( i++ ))
done
set -- "${@}" "${stack[@]}"
fi
while [[ ${#} -gt 0 ]]
do
if [[ ${#COMMON_LOG_PREFIX[@]} -gt 0 ]]
then
printf "%-20s | " "${COMMON_LOG_PREFIX}" >&2
fi
printf "\033[${color}m%s\033[0m\n" "${1}" >&2
shift
done
}
function common_log_variable
{
while [[ ${#} -gt 0 ]]
do
common_log -v 4 -- "`common_variable_print "${1}"`"
shift
done
}
function common_warn
{
common_log -v 1 -c "0;31" -o 1 "${@}"
}
function common_die
{
if [[ ${#} -eq 0 ]]
then
set -- "Unspecified error"
fi
common_log -v 1 -c "1;31" -o 1 "${@}"
echo -ne "\a" >&2
if (( BASH_SUBSHELL > 0 ))
then
kill -SIGTERM 0
fi
exit 1
}
function common_assert
{
if [[ -n "${1}" ]]
then
eval "${1}"
if (( ${?} != 0 ))
then
if [[ -n "${2}" ]]
then
common_die -t -o 2 "${2}"
else
common_die -t -o 2 "Assertion '${1}' failed"
fi
fi
fi
}
function common_die_on_error
{
if (( ${?} != 0 ))
then
common_die "${@}"
fi
}
function common_warn_on_error
{
if (( ${?} != 0 ))
then
common_warn "${@}"
fi
}
function common_signal_trap_initialize
{
local signal=""
for signal in SIGINT SIGTERM
do
trap "common_signal_trap \"${signal}\"" "${signal}"
done
}
function common_signal_trap
{
local signal="${1}"
common_log -v 4 "Received signal: ${signal}"
case "${signal}" in
SIGINT)
common_warn "Aborted by user"
exit 130
;;
SIGTERM)
exit 143
;;
*)
common_warn "Ignore signal: ${signal}"
;;
esac
}
function common_getopt
{
function common_getopt_internal
{
local variable="${1}"
local -a specs=()
IFS="," read -ra specs <<< "${2}"
common_assert "array_is_array `string_escape ${variable}`"
local -i error=0
local -a out=()
function common_getopt_spec
{
case "${1: -1}" in
":")
common_variable_set "${2}" "${1:0:$((${#1} - 1))}"
common_variable_set "${3}" 1
;;
"?")
common_variable_set "${2}" "${1:0:$((${#1} - 1))}"
common_variable_set "${3}" 2
;;
*)
common_variable_set "${2}" "${1}"
common_variable_set "${3}" 0
;;
esac
}
local spec_name=""
local -i spec_has_argument=0
local option=""
local option_name=""
local option_argument=""
local -i option_has_argument=0
local -i match_found=0
local match_name=""
local -i match_has_argument=0
shift 2
while [[ ${#} -gt 0 ]]
do
case ${1} in
--)
break
;;
-)
out+=("--")
break
;;
--*)
option="${1:2}"
shift
option_name="`/usr/bin/sed -E -n -e 's/^([^=]*).*$/\1/p' <<< "${option}"`"
option_argument="`/usr/bin/sed -E -n -e 's/^[^=]*=(.*)$/\1/p' <<< "${option}"`"
[[ ! "${option}" =~ "=" ]]
option_has_argument=${?}
match_found=0
match_name=""
match_has_argument=0
for spec in "${specs[@]}"
do
common_getopt_spec "${spec}" spec_name spec_has_argument
if [[ ${#spec_name} -eq 1 ]]
then
continue
fi
if [[ "${spec_name:0:${#option_name}}" = "${option_name}" ]]
then
match_name="${spec_name}"
match_has_argument=${spec_has_argument}
if [[ ${#spec_name} -eq ${#option_name} ]]
then
match_found=1
break
elif (( match_found != 0 ))
then
error=1
out=("Option '${option_name}' is ambiguous")
break 2
else
match_found=1
fi
fi
done
if (( match_found == 0 ))
then
error=1
out=("Illegal option '${option_name}'")
break
fi
if (( match_has_argument != 2 && option_has_argument != match_has_argument ))
then
error=1
if (( option_has_argument == 0 ))
then
out=("Option '${option_name}' requires an argument")
else
out=("Option '${option_name}' does not allow an argument")
fi
break
fi
out+=("--${match_name}")
if (( match_has_argument != 0 ))
then
out+=("${option_argument}")
fi
;;
-*)
option="${1:1}"
shift
option_name="${option:0:1}"
option_argument="${option:1}"
match_found=0
for spec in "${specs[@]}"
do
common_getopt_spec "${spec}" spec_name spec_has_argument
if [[ "${option_name}" = "${spec_name}" ]]
then
match_found=1
out+=("-${option_name}")
if (( spec_has_argument == 0 ))
then
if [[ -n "${option_argument}" ]]
then
set -- "-${option_argument}" "${@}"
fi
else
if [[ -z "${option_argument}" ]]
then
if [[ ${#} -le 0 ]]
then
error=1
out=("Option '${option_name}' requires an argument")
break 2
fi
option_argument="${1}"
shift
fi
out+=("${option_argument}")
fi
break
fi
done
if (( match_found == 0 ))
then
error=1
out=("Illegal option '${option_name}'")
break
fi
;;
*)
out+=("--")
break
;;
esac
done
if (( error == 0 ))
then
out+=("${@}")
fi
printf "%s=%s\n" "${variable}" "`common_variable_clone out`"
printf "return %d\n" ${error}
}
eval "`common_getopt_internal "${@}"`"
}
function common_sudo
{
local prompt="${1}"
common_assert "[[ -n `string_escape "${prompt}"` ]]"
common_assert "[[ ${#} -gt 1 ]]"
if [[ ${#COMMON_LOG_PREFIX[@]} -gt 0 ]]
then
prompt="`printf "%-20s | %s" "${COMMON_LOG_PREFIX}" "${prompt}"`"
fi
sudo -p "${prompt}: " "${@:2}"
}
function common_is_function
{
[[ "`type -t "${1}"`" == "function" ]]
}
function common_function_is_legal_name
{
[[ "${1}" =~ ^[a-zA-Z_][0-9a-zA-Z_]*$ ]]
}
function common_is_variable
{
compgen -A variable | grep ^"${1}"$ > /dev/null
}
function common_variable_is_legal_name
{
[[ "${1}" =~ ^[a-zA-Z_][0-9a-zA-Z_]*$ ]]
}
function common_variable_is_readonly
{
if common_is_variable "${1}"
then
[[ "`declare -p "${1}" 2> /dev/null`" =~ ^"declare -"[^=]{0,}"r"[^=]{0,}" ${1}=" ]]
fi
}
function common_variable_get
{
common_assert "common_is_variable `string_escape "${1}"`"
string_escape "${!1}"
}
function common_variable_set
{
common_assert "common_variable_is_legal_name `string_escape "${1}"`"
eval "${1}=`string_escape "${2}"`"
}
function common_variable_clone
{
if [[ -z "${2}" ]]
then
common_assert "common_is_variable `string_escape "${1}"`"
if array_is_array "${1}"
then
printf "("
array_get_elements "${1}"
printf ")"
else
common_variable_get "${1}"
fi
else
common_assert "common_variable_is_legal_name `string_escape "${2}"`"
eval "${2}=`common_variable_clone "${1}"`"
fi
}
function common_variable_print
{
common_assert "common_is_variable `string_escape "${1}"`"
printf "%s=" "${1}"
common_variable_clone "${1}"
printf "\n"
}
function common_variable_require
{
while [[ ${#} -gt 0 ]]
do
if ! common_is_variable "${1}"
then
common_die "Variable not declared: ${1}"
fi
shift
done
}
function common_variable_expand
{
while [[ ${#} -gt 0 ]]
do
eval "echo \${!${1}@}"
shift
done
}
function common_path_absolute
{
local path="${1}"
local -a tokens=()
local -i tokens_count=0
local -i i=0
if [[ ! "${path}" =~ ^/ ]]
then
path="`pwd -P`/${path}"
fi
IFS="/" read -ra tokens <<< "${path}"
tokens_count=${#tokens[@]}
for (( i=0 ; i < ${tokens_count} ; i++ ))
do
case "${tokens[${i}]}" in
.|"")
unset -v tokens[${i}]
;;
..)
unset -v tokens[$(( i - 1 ))]
unset -v tokens[${i}]
;;
esac
done
printf "/"
array_join tokens "/"
}

View File

@@ -0,0 +1,52 @@
#!/bin/bash
# Copyright (c) 2014 Benjamin Fleischer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
function installer_is_package_installed
{
local identifier="${1}"
/usr/sbin/pkgutil --pkg-info "${identifier}" > /dev/null 2>&1
}
function installer_package_get_info
{
local identifier="${1}"
local field="${2}"
local info=""
info="`/usr/sbin/pkgutil --pkg-info "${identifier}" 2> /dev/null`"
if [[ ${?} -eq 0 ]]
then
/usr/bin/sed -E -n -e "s/^${field}: (.*)$/\1/p" <<< "${info}"
else
return 1
fi
}

View File

@@ -0,0 +1,50 @@
#!/bin/bash
# Copyright (c) 2011-2016 Benjamin Fleischer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# Requires common.sh
function macos_get_version
{
sw_vers -productVersion | /usr/bin/cut -d . -f 1,2 2> /dev/null
}
function macos_unload_kext
{
local identifier="${1}"
common_assert "[[ -n `string_escape "${identifier}"` ]]"
if [[ -n "`/usr/sbin/kextstat -l -b "${identifier}"`" ]]
then
/sbin/kextunload -b "${identifier}" 1>&3 2>&4
else
return 0
fi
}

View File

@@ -0,0 +1,76 @@
#!/bin/bash
# Copyright (c) 2011-2014 Benjamin Fleischer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# Requires common.sh
# Requires string.sh
function math_is_integer
{
[[ "${1}" =~ ^-?[0-9]+$ ]]
}
function math_compare
{
if (( ${1} < ${2} ))
then
return 1
fi
if (( ${1} > ${2} ))
then
return 2
fi
return 0
}
function math_max
{
common_assert "math_is_integer `string_escape "${1}"`"
common_assert "math_is_integer `string_escape "${2}"`"
if (( ${1} > ${2} ))
then
printf "%s" "${1}"
else
printf "%s" "${2}"
fi
}
function math_min
{
common_assert "math_is_integer `string_escape "${1}"`"
common_assert "math_is_integer `string_escape "${2}"`"
if (( ${1} < ${2} ))
then
printf "%s" "${1}"
else
printf "%s" "${2}"
fi
}

View File

@@ -0,0 +1,160 @@
#!/bin/bash
# Copyright (c) 2014 Benjamin Fleischer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# Requires common.sh
function osxfuse_uninstall_macfuse
{
/bin/rm -rf "/Library/Application Support/Developer/Shared/Xcode/Project Templates/MacFUSE"
/bin/rm -rf "/Library/Filesystems/fusefs.fs"
/bin/rm -rf "/Library/Frameworks/MacFUSE.framework"
/bin/rm -rf "/Library/PreferencePanes/MacFUSE.prefPane"
/bin/rm -f "/Library/Preferences/com.google.macfuse.plist"
/bin/rm -rf "/usr/local/include/fuse"
/bin/rm -f "/usr/local/include/fuse.h"
/bin/rm -f "/usr/local/lib/libfuse.0.dylib"
/bin/rm -f "/usr/local/lib/libfuse.2.7.3.dylib"
/bin/rm -f "/usr/local/lib/libfuse.2.dylib"
/bin/rm -f "/usr/local/lib/libfuse.dylib"
/bin/rm -f "/usr/local/lib/libfuse.la"
/bin/rm -f "/usr/local/lib/libfuse_ino64.2.7.3.dylib"
/bin/rm -f "/usr/local/lib/libfuse_ino64.2.dylib"
/bin/rm -f "/usr/local/lib/libfuse_ino64.dylib"
/bin/rm -f "/usr/local/lib/libfuse_ino64.la"
/bin/rm -f "/usr/local/lib/pkgconfig/fuse.pc"
/bin/rm -rf "/Library/Receipts/MacFUSE.pkg"
/bin/rm -rf "/Library/Receipts/MacFUSE Core.pkg"
/usr/sbin/pkgutil --forget "com.google.macfuse" 1>&3 2>&4
/usr/sbin/pkgutil --forget "com.google.macfuse.core" 1>&3 2>&4
return 0
}
function osxfuse_uninstall_osxfuse_2_core
{
/bin/rm -rf "/Library/Filesystems/osxfusefs.fs"
/bin/rm -rf "/Library/Frameworks/OSXFUSE.framework"
/bin/rm -rf "/usr/local/include/osxfuse"
/bin/rm -f "/usr/local/lib/libosxfuse.2.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse.la"
/bin/rm -f "/usr/local/lib/libosxfuse_i32.2.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse_i32.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse_i32.la"
/bin/rm -f "/usr/local/lib/libosxfuse_i64.2.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse_i64.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse_i64.la"
/bin/rm -f "/usr/local/lib/pkgconfig/fuse.pc"
/bin/rm -f "/usr/local/lib/pkgconfig/osxfuse.pc"
/usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.Core" 1>&3 2>&4
return 0
}
function osxfuse_uninstall_osxfuse_2_macfuse
{
/bin/rm -rf "/Library/Frameworks/MacFUSE.framework"
/bin/rm -f "/usr/local/lib/libfuse.0.dylib"
/bin/rm -f "/usr/local/lib/libfuse.2.dylib"
/bin/rm -f "/usr/local/lib/libfuse.dylib"
/bin/rm -f "/usr/local/lib/libfuse.la"
/bin/rm -f "/usr/local/lib/libfuse_ino64.2.dylib"
/bin/rm -f "/usr/local/lib/libfuse_ino64.dylib"
/bin/rm -f "/usr/local/lib/libfuse_ino64.la"
/bin/rm -f "/usr/local/lib/libmacfuse_i32.2.dylib"
/bin/rm -f "/usr/local/lib/libmacfuse_i32.dylib"
/bin/rm -f "/usr/local/lib/libmacfuse_i64.2.dylib"
/bin/rm -f "/usr/local/lib/libmacfuse_i64.dylib"
/usr/sbin/pkgutil --forget "com.google.macfuse.core" 1>&3 2>&4
return 0
}
function osxfuse_uninstall_osxfuse_2_prefpane
{
/bin/rm -rf "/Library/PreferencePanes/OSXFUSE.prefPane"
/bin/rm -f "/Library/Preferences/com.github.osxfuse.OSXFUSE.plist"
/usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.PrefPane" 1>&3 2>&4
return 0
}
function osxfuse_uninstall_osxfuse_3_core
{
/bin/rm -rf "/Library/Filesystems/osxfuse.fs"
/bin/rm -rf "/Library/Frameworks/OSXFUSE.framework"
/bin/rm -rf "/usr/local/include/osxfuse"
/bin/rm -f "/usr/local/lib/libosxfuse.2.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse.la"
/bin/rm -f "/usr/local/lib/libosxfuse_i64.2.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse_i64.dylib"
/bin/rm -f "/usr/local/lib/libosxfuse_i64.la"
/bin/rm -f "/usr/local/lib/pkgconfig/fuse.pc"
/bin/rm -f "/usr/local/lib/pkgconfig/osxfuse.pc"
/usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.Core" 1>&3 2>&4
return 0
}
function osxfuse_uninstall_osxfuse_3_macfuse
{
/bin/rm -rf "/Library/Frameworks/MacFUSE.framework"
/bin/rm -rf "/usr/local/include/fuse"
/bin/rm -f "/usr/local/include/fuse.h"
/bin/rm -f "/usr/local/lib/libfuse.0.dylib"
/bin/rm -f "/usr/local/lib/libfuse.2.dylib"
/bin/rm -f "/usr/local/lib/libfuse.dylib"
/bin/rm -f "/usr/local/lib/libfuse.la"
/bin/rm -f "/usr/local/lib/libfuse_ino64.2.dylib"
/bin/rm -f "/usr/local/lib/libfuse_ino64.dylib"
/bin/rm -f "/usr/local/lib/libfuse_ino64.la"
/bin/rm -f "/usr/local/lib/pkgconfig/macfuse.pc"
/usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.MacFUSE" 1>&3 2>&4
return 0
}
function osxfuse_uninstall_osxfuse_3_prefpane
{
/bin/rm -rf "/Library/PreferencePanes/OSXFUSE.prefPane"
/bin/rm -f "/Library/Preferences/com.github.osxfuse.OSXFUSE.plist"
/usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.PrefPane" 1>&3 2>&4
return 0
}

View File

@@ -0,0 +1,87 @@
#!/bin/bash
# Copyright (c) 2011-2014 Benjamin Fleischer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
function string_trim
{
local string="${1}"
! shopt -q extglob
local -i extglob=${?}
if (( extglob == 0 ))
then
shopt -s extglob
fi
string="${string##+([[:space:]])}"
string="${string%%+([[:space:]])}"
if (( extglob == 0 ))
then
shopt -u extglob
fi
printf "%s" "${string}"
}
function string_lowercase
{
/usr/bin/tr '[A-Z]' '[a-z]'
}
function string_uppercase
{
/usr/bin/tr '[a-z]' '[A-Z]'
}
function string_escape
{
local count="${2:-1}"
if [[ "${count}" =~ [0-9]+ ]] && (( count > 0 ))
then
printf "%q" "`string_escape "${1}" $(( count - 1 ))`"
else
printf "%s" "${1}"
fi
}
function string_compare
{
if [[ "${1}" < "${2}" ]]
then
return 1
fi
if [[ "${1}" > "${2}" ]]
then
return 2
fi
return 0
}

View File

@@ -0,0 +1,87 @@
#!/bin/bash
# Copyright (c) 2011-2014 Benjamin Fleischer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# Requires common.sh
# Requires math.sh
# Requires string.sh
function version_is_version
{
[[ "${1}" =~ ^[0-9]+(\.[0-9]+)*$ ]]
}
function version_compare
{
common_assert "version_is_version `string_escape "${1}"`"
common_assert "version_is_version `string_escape "${2}"`"
local -a version1=()
local -a version2=()
IFS="." read -ra version1 <<< "${1}"
IFS="." read -ra version2 <<< "${2}"
local -i i=0
local t1=""
local t2=""
for (( i=0 ; i < `math_max ${#version1[@]} ${#version2[@]}` ; i++ ))
do
t1=${version1[${i}]:-0}
t2=${version2[${i}]:-0}
if (( t1 < t2 ))
then
return 1
fi
if (( t1 > t2 ))
then
return 2
fi
done
return 0
}
function version_compare_eq
{
version_compare "${1}" "${2}"
(( ${?} == 0 ))
}
function version_compare_le
{
version_compare "${1}" "${2}"
(( ${?} != 2 ))
}
function version_compare_ge
{
version_compare "${1}" "${2}"
(( ${?} != 1 ))
}

View File

@@ -0,0 +1,137 @@
#!/bin/bash
# Copyright (c) 2014 Benjamin Fleischer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
function uninstall_osxfuse_main
{
# Source libraries
local library_path=""
for library_path in "${BASH_SOURCE[0]%/*}/lib"/*.sh
do
if [[ -f "${library_path}" ]]
then
source "${library_path}" || return 1
fi
done
common_log_initialize
common_signal_trap_initialize
# Uninstall core
local core_version="`installer_package_get_info com.github.osxfuse.pkg.Core version`"
if [[ -z "${core_version}" ]]
then
if [[ -e "/Library/Filesystems/osxfuse.fs" ]]
then
core_version="3.0"
elif [[ -e "/Library/Filesystems/osxfusefs.fs" ]]
then
core_version="2.3"
fi
fi
if [[ -n "${core_version}" ]]
then
if version_compare_ge "${core_version}" 3.0
then
macos_unload_kext "com.github.osxfuse.filesystems.osxfuse"
osxfuse_uninstall_osxfuse_3_core
elif version_compare_ge "${core_version}" 2.3
then
macos_unload_kext "com.github.osxfuse.filesystems.osxfusefs"
osxfuse_uninstall_osxfuse_2_core
fi
fi
# Uninstall preference pane
local prefpane_version="`installer_package_get_info com.github.osxfuse.pkg.PrefPane version`"
if [[ -z "${prefpane_version}" ]]
then
if [[ -e "/Library/PreferencePanes/OSXFUSE.prefPane" ]]
then
prefpane_version="3.0"
fi
fi
if [[ -n "${prefpane_version}" ]]
then
if version_compare_ge "${prefpane_version}" 3.0
then
osxfuse_uninstall_osxfuse_3_prefpane
elif version_compare_ge "${prefpane_version}" 2.3
then
osxfuse_uninstall_osxfuse_2_prefpane
fi
fi
# Uninstall MacFUSE compatibility layer
local macfuse_version="`installer_package_get_info com.github.osxfuse.pkg.MacFUSE version`"
if [[ -z "${macfuse_version}" ]]
then
macfuse_version="`installer_package_get_info com.google.macfuse.core version`"
fi
if [[ -z "${macfuse_version}" ]]
then
if [[ -e /usr/local/lib/pkgconfig/macfuse.pc ]]
then
macfuse_version="3.0"
elif [[ -e /usr/local/lib/libmacfuse_i32.2.dylib ]]
then
macfuse_version="2.3"
fi
fi
if [[ -n "${macfuse_version}" ]]
then
if version_compare_ge "${macfuse_version}" 3.0
then
osxfuse_uninstall_osxfuse_3_macfuse
elif version_compare_ge "${macfuse_version}" 2.3
then
osxfuse_uninstall_osxfuse_2_macfuse
fi
fi
return 0
}
uninstall_osxfuse_main "${@}"

Binary file not shown.

After

Width:  |  Height:  |  Size: 362 B

View File

@@ -0,0 +1,341 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict>
<key>Resources/English.lproj/Localizable.strings</key>
<dict>
<key>hash</key>
<data>
0Wjn3NrPepmcOASicNLS2raGv6k=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/German.lproj/Localizable.strings</key>
<dict>
<key>hash</key>
<data>
4buJ6nBrQzNa0CURYrv6fDLWXMc=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/Scripts/lib/array.sh</key>
<data>
acATIcnlFIi6qM0DXuVy5gdtFEc=
</data>
<key>Resources/Scripts/lib/common.sh</key>
<data>
ENbs4voSh0jU5KEK5BvFWSTjcNw=
</data>
<key>Resources/Scripts/lib/installer.sh</key>
<data>
GZbRDSAeVo5JyzznWzc3BhFuUGo=
</data>
<key>Resources/Scripts/lib/macos.sh</key>
<data>
e9Er5/UuqM3WdHEePY4vV/IBgxg=
</data>
<key>Resources/Scripts/lib/math.sh</key>
<data>
vTIVoM4Ta6BENguDomO8mSUTtto=
</data>
<key>Resources/Scripts/lib/osxfuse.sh</key>
<data>
yiCIOaPBCbVxNL4CMPRDV14AKSk=
</data>
<key>Resources/Scripts/lib/string.sh</key>
<data>
m3XuFEuae7unzvq2PMsL/+tKZfU=
</data>
<key>Resources/Scripts/lib/version.sh</key>
<data>
Maq9UhAmPuP1u0uG0CClOnEtXUI=
</data>
<key>Resources/Scripts/main.scpt</key>
<data>
SL2QzuMln6cM4yRRGLNVqm5eS/w=
</data>
<key>Resources/Scripts/uninstall_osxfuse.sh</key>
<data>
PLOe6Huk3962Njim7rKpCLhRLW0=
</data>
<key>Resources/Uninstaller.icns</key>
<data>
kL6mz31YXPBrUTT9Xk5T1T4Dhpg=
</data>
<key>Resources/applet.rsrc</key>
<data>
/jVQqMpNI1L5OTLhyJaYiMBCQY8=
</data>
</dict>
<key>files2</key>
<dict>
<key>Resources/English.lproj/Localizable.strings</key>
<dict>
<key>hash</key>
<data>
0Wjn3NrPepmcOASicNLS2raGv6k=
</data>
<key>hash2</key>
<data>
lTTq7JkVc0CP5qPxIwk54tsVL+rEiv9NMy2cuke49Tg=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/German.lproj/Localizable.strings</key>
<dict>
<key>hash</key>
<data>
4buJ6nBrQzNa0CURYrv6fDLWXMc=
</data>
<key>hash2</key>
<data>
LhPdZbWcZjiUTy+nVQc+ybd0l0GpwKoKDP3TDrSNdUA=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/Scripts/lib/array.sh</key>
<dict>
<key>hash</key>
<data>
acATIcnlFIi6qM0DXuVy5gdtFEc=
</data>
<key>hash2</key>
<data>
n4ua44AdK1W8tQrVaNoEbE4KNiFaUPXRCjzUdP9wHHA=
</data>
</dict>
<key>Resources/Scripts/lib/common.sh</key>
<dict>
<key>hash</key>
<data>
ENbs4voSh0jU5KEK5BvFWSTjcNw=
</data>
<key>hash2</key>
<data>
kH6kB2aWWzDgMHvo8zS4YLcpXSSaylMzSnEn0gQQpoc=
</data>
</dict>
<key>Resources/Scripts/lib/installer.sh</key>
<dict>
<key>hash</key>
<data>
GZbRDSAeVo5JyzznWzc3BhFuUGo=
</data>
<key>hash2</key>
<data>
2Z/2eNbV2UZJCRyQ+8zMHin9TGBC15mXny15HcIJPZo=
</data>
</dict>
<key>Resources/Scripts/lib/macos.sh</key>
<dict>
<key>hash</key>
<data>
e9Er5/UuqM3WdHEePY4vV/IBgxg=
</data>
<key>hash2</key>
<data>
WojtBY9VGpZjVX+xxjzOUGZR4H/o4zkDuNOcfPvFKug=
</data>
</dict>
<key>Resources/Scripts/lib/math.sh</key>
<dict>
<key>hash</key>
<data>
vTIVoM4Ta6BENguDomO8mSUTtto=
</data>
<key>hash2</key>
<data>
aozCiQoNO6hiHmvUbWsebuMGVs8GAC19L4Qj7MSXFUk=
</data>
</dict>
<key>Resources/Scripts/lib/osxfuse.sh</key>
<dict>
<key>hash</key>
<data>
yiCIOaPBCbVxNL4CMPRDV14AKSk=
</data>
<key>hash2</key>
<data>
zyarGvNeCuciX2oW3fH2SQ5KRiyMWlNUsmdCFK6n4Nk=
</data>
</dict>
<key>Resources/Scripts/lib/string.sh</key>
<dict>
<key>hash</key>
<data>
m3XuFEuae7unzvq2PMsL/+tKZfU=
</data>
<key>hash2</key>
<data>
/vj6gilOvFq6Fz/rDQeT7tpYcOw684tKnVED/Uf/fIA=
</data>
</dict>
<key>Resources/Scripts/lib/version.sh</key>
<dict>
<key>hash</key>
<data>
Maq9UhAmPuP1u0uG0CClOnEtXUI=
</data>
<key>hash2</key>
<data>
wfjFX+pXNt58pax1r1g8tld4SjgO/Ln9cwqDR7uactc=
</data>
</dict>
<key>Resources/Scripts/main.scpt</key>
<dict>
<key>hash</key>
<data>
SL2QzuMln6cM4yRRGLNVqm5eS/w=
</data>
<key>hash2</key>
<data>
kq5sWt58LkxZlUULW60hlhRHz4eU6R61vqWiTjK0Scc=
</data>
</dict>
<key>Resources/Scripts/uninstall_osxfuse.sh</key>
<dict>
<key>hash</key>
<data>
PLOe6Huk3962Njim7rKpCLhRLW0=
</data>
<key>hash2</key>
<data>
XBBbe5Gi2uNwDt8Bux07CSzeSQyZehHsBtSTM8M8Iyg=
</data>
</dict>
<key>Resources/Uninstaller.icns</key>
<dict>
<key>hash</key>
<data>
kL6mz31YXPBrUTT9Xk5T1T4Dhpg=
</data>
<key>hash2</key>
<data>
fC0GPJXmpV4oDKdvRlAQBNfIN2Uomq/vlnFP1IcWMlk=
</data>
</dict>
<key>Resources/applet.rsrc</key>
<dict>
<key>hash</key>
<data>
/jVQqMpNI1L5OTLhyJaYiMBCQY8=
</data>
<key>hash2</key>
<data>
0jPapEMRihcikRr/mzmNOcrNOYLHxGEOVmOrcBa6U/E=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^Resources/</key>
<true/>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>URL</key>
<string>https://github.com/osxfuse/osxfuse/wiki</string>
</dict>
</plist>

View File

@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>childItems</key>
<array>
<dict>
<key>childItems</key>
<array/>
<key>choiceDescription</key>
<string>Installs the FUSE for macOS core components, including the FUSE kernel extension, the shared library libosxfuse and OSXFUSE.framework.</string>
<key>choiceIdentifier</key>
<string>com.github.osxfuse.pkg.Core</string>
<key>choiceIsEnabled</key>
<false/>
<key>choiceIsSelected</key>
<integer>1</integer>
<key>choiceIsVisible</key>
<true/>
<key>choiceSizeInKilobytes</key>
<integer>4540</integer>
<key>choiceTitle</key>
<string>FUSE for macOS Core Components</string>
<key>pathsOfActivePackagesInChoice</key>
<array>
<string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#Core.pkg</string>
</array>
</dict>
<dict>
<key>childItems</key>
<array/>
<key>choiceDescription</key>
<string>Installs the FUSE for macOS Preference Pane which is used to download and install updates or remove FUSE for macOS.</string>
<key>choiceIdentifier</key>
<string>com.github.osxfuse.pkg.PrefPane</string>
<key>choiceIsEnabled</key>
<true/>
<key>choiceIsSelected</key>
<integer>1</integer>
<key>choiceIsVisible</key>
<true/>
<key>choiceSizeInKilobytes</key>
<integer>2669</integer>
<key>choiceTitle</key>
<string>FUSE for macOS Preference Pane</string>
<key>pathsOfActivePackagesInChoice</key>
<array>
<string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#PrefPane.pkg</string>
</array>
</dict>
<dict>
<key>childItems</key>
<array/>
<key>choiceDescription</key>
<string>Installs the compatibility layer for legacy MacFUSE file systems, that have not been ported to FUSE for macOS.</string>
<key>choiceIdentifier</key>
<string>com.github.osxfuse.pkg.MacFUSE</string>
<key>choiceIsEnabled</key>
<true/>
<key>choiceIsSelected</key>
<integer>0</integer>
<key>choiceIsVisible</key>
<true/>
<key>choiceSizeInKilobytes</key>
<integer>1743</integer>
<key>choiceTitle</key>
<string>MacFUSE Compatibility Layer</string>
<key>pathsOfActivePackagesInChoice</key>
<array>
<string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#MacFUSE.pkg</string>
</array>
</dict>
</array>
<key>choiceIdentifier</key>
<string>__ROOT_CHOICE_IDENT_FUSEformacOS</string>
<key>choiceIsEnabled</key>
<true/>
<key>choiceIsSelected</key>
<integer>1</integer>
<key>choiceIsVisible</key>
<true/>
<key>choiceSizeInKilobytes</key>
<integer>0</integer>
<key>choiceTitle</key>
<string>FUSE for macOS</string>
<key>pathsOfActivePackagesInChoice</key>
<array/>
</dict>
</array>
</plist>

View File

@@ -0,0 +1,3 @@
<?xmlversion="1.0"encoding="UTF-8"?>
<!DOCTYPEplistPUBLIC"-//Apple//DTDPLIST1.0//EN""http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist><array><dict><key>choiceIdentifier</key><string>__ROOT_CHOICE_IDENT_FUSEformacOS</string><key>choiceIsEnabled</key><true/><key>choiceIsSelected</key><integer>1</integer><key>choiceIsVisible</key><true/><key>choiceSizeInKilobytes</key><integer>0</integer><key>choiceTitle</key><string>FUSEformacOS</string><key>pathsOfActivePackagesInChoice</key><array/><key>childItems</key><array><dict><key>childItems</key><array/><key>choiceDescription</key><string>InstallstheFUSEformacOScorecomponents,includingtheFUSEkernelextension,thesharedlibrarylibosxfuseandOSXFUSE.framework.</string><key>choiceIdentifier</key><string>com.github.osxfuse.pkg.Core</string><key>choiceIsEnabled</key><false/><key>choiceIsSelected</key><integer>1</integer><key>choiceIsVisible</key><true/><key>choiceSizeInKilobytes</key><integer>4540</integer><key>choiceTitle</key><string>FUSEformacOSCoreComponents</string><key>pathsOfActivePackagesInChoice</key><array><string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#Core.pkg</string></array></dict><dict><key>childItems</key><array/><key>choiceDescription</key><string>InstallstheFUSEformacOSPreferencePanewhichisusedtodownloadandinstallupdatesorremoveFUSEformacOS.</string><key>choiceIdentifier</key><string>com.github.osxfuse.pkg.PrefPane</string><key>choiceIsEnabled</key><true/><key>choiceIsSelected</key><integer>1</integer><key>choiceIsVisible</key><true/><key>choiceSizeInKilobytes</key><integer>2669</integer><key>choiceTitle</key><string>FUSEformacOSPreferencePane</string><key>pathsOfActivePackagesInChoice</key><array><string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#PrefPane.pkg</string></array></dict><dict><key>childItems</key><array/><key>choiceDescription</key><string>InstallsthecompatibilitylayerforlegacyMacFUSEfilesystems,thathavenotbeenportedtoFUSEformacOS.</string><key>choiceIdentifier</key><string>com.github.osxfuse.pkg.MacFUSE</string><key>choiceIsEnabled</key><true/><key>choiceIsSelected</key><integer>1</integer><key>choiceIsVisible</key><true/><key>choiceSizeInKilobytes</key><integer>1743</integer><key>choiceTitle</key><string>MacFUSECompatibilityLayer</string><key>pathsOfActivePackagesInChoice</key><array><string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#MacFUSE.pkg</string></array></dict></array></dict></array></plist>

View File

@@ -22,6 +22,7 @@ import subprocess
import commands
import sys
from glob import glob
from distutils.version import LooseVersion
def QueryQMake(attrib):
return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
@@ -31,7 +32,7 @@ FRAMEWORK_SEARCH_PATH=[
os.path.join(os.environ['HOME'], 'Library/Frameworks')
]
LIBRARY_SEARCH_PATH=['/usr/local/lib', '.']
LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Qt-5.6.2/lib', '.']
QT_PLUGINS = [
'sqldrivers/libqsqlite.dylib',
@@ -44,7 +45,8 @@ QT_PLUGINS = [
QT_PLUGINS_SEARCH_PATH=[
# os.path.join(os.environ['QTDIR'], 'plugins'),
'/usr/local/Cellar/qt/5.2.1/plugins',
# '/usr/local/Cellar/qt/5.2.1/plugins',
'/usr/local/Qt-5.6.2/plugins',
]
@@ -92,6 +94,8 @@ commands.append(['mkdir', '-p', resources_dir])
plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];
qt_version = QueryQMake('QT_VERSION')
print "Using Qt", qt_version
fixed_libraries = []
fixed_frameworks = []
@@ -261,9 +265,9 @@ def CopyFramework(source_dylib):
dest_path = os.path.join(frameworks_dir, framework)
dest_dylib_path = os.path.join(frameworks_dir, *parts[i:-1])
break
if os.path.exists(dest_path):
print dest_path, "already exists, skipping copy..."
return os.path.join(dest_dylib_path, dylib_name)
# if os.path.exists(dest_path):
# print dest_path, "already exists, skipping copy..."
# return os.path.join(dest_dylib_path, dylib_name)
args = ['mkdir', '-p', dest_dylib_path]
commands.append(args)
@@ -279,6 +283,10 @@ def CopyFramework(source_dylib):
commands.append(args)
args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Resources'), os.path.join(dest_path, 'Versions', '5')]
commands.append(args)
args = ['ln', '-s', os.path.join('Versions', 'Current', 'Helpers'), os.path.join(dest_path, 'Helpers')]
commands.append(args)
args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Helpers'), os.path.join(dest_path, 'Versions', '5')]
commands.append(args)
return os.path.join(dest_dylib_path, dylib_name)
@@ -337,6 +345,13 @@ for binary in binaries:
for plugin in QT_PLUGINS:
FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.10.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
commands.append(args)
else:
args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.7.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
commands.append(args)
if len(sys.argv) <= 2:
print 'Will run %d commands:' % len(commands)
for command in commands:

View File

@@ -486,7 +486,72 @@
<integer>0</integer>
</dict>
<key>RESOURCES</key>
<array/>
<array>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>com.clarodrive.trashdetector.plist</string>
<key>PATH_TYPE</key>
<integer>1</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>fuse/FUSE for macOS 3.8.1.pkg</string>
<key>PATH_TYPE</key>
<integer>1</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>fuse/settings.plist</string>
<key>PATH_TYPE</key>
<integer>1</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>uninstallCD.applescript</string>
<key>PATH_TYPE</key>
<integer>1</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
</dict>
<key>PACKAGE_SETTINGS</key>
<dict>
@@ -506,6 +571,536 @@
<key>UUID</key>
<string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
</dict>
<dict>
<key>PACKAGE_FILES</key>
<dict>
<key>DEFAULT_INSTALL_LOCATION</key>
<string>/</string>
<key>HIERARCHY</key>
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>Utilities</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>Applications</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>509</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>Application Support</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Documentation</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Filesystems</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Frameworks</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Input Methods</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Internet Plug-Ins</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>LaunchAgents</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>LaunchDaemons</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>PreferencePanes</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Preferences</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>Printers</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>PrivilegedHelperTools</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>QuickLook</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>QuickTime</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Screen Savers</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Library/ScriptingAdditions/SyncStateFinder.osax/Contents</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>SyncStateFinder.osax</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>2</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>ScriptingAdditions</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>2</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Scripts</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Services</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Widgets</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Library</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Extensions</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Library</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>System</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Shared</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>1023</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>Users</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>/</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<key>PAYLOAD_TYPE</key>
<integer>0</integer>
<key>VERSION</key>
<integer>2</integer>
</dict>
<key>PACKAGE_SCRIPTS</key>
<dict>
<key>POSTINSTALL_PATH</key>
<dict/>
<key>PREINSTALL_PATH</key>
<dict/>
<key>RESOURCES</key>
<array/>
</dict>
<key>PACKAGE_SETTINGS</key>
<dict>
<key>AUTHENTICATION</key>
<integer>1</integer>
<key>CONCLUSION_ACTION</key>
<integer>0</integer>
<key>IDENTIFIER</key>
<string>com.ownCloud.finderPlugin</string>
<key>LOCATION</key>
<integer>0</integer>
<key>NAME</key>
<string>Legacy Finder Plugin (OS X 10.9 or older)</string>
<key>OVERWRITE_PERMISSIONS</key>
<false/>
<key>VERSION</key>
<string>@MIRALL_VERSION_FULL@</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
<key>UUID</key>
<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
</dict>
</array>
<key>PROJECT</key>
<dict>
@@ -573,6 +1168,49 @@
<key>UUID</key>
<string>9647ADC0-BD53-4D7D-A561-73D383AACDE1</string>
</dict>
<dict>
<key>DESCRIPTION</key>
<array/>
<key>OPTIONS</key>
<dict>
<key>HIDDEN</key>
<false/>
<key>STATE</key>
<integer>1</integer>
</dict>
<key>PACKAGE_UUID</key>
<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
<key>REQUIREMENTS</key>
<array>
<dict>
<key>BEHAVIOR</key>
<integer>1</integer>
<key>DICTIONARY</key>
<dict>
<key>IC_REQUIREMENT_JAVASCRIPT_FUNCTION</key>
<string>olderOsx</string>
<key>IC_REQUIREMENT_JAVASCRIPT_PARAMETERS</key>
<array/>
</dict>
<key>IDENTIFIER</key>
<string>fr.whitebox.Packages.requirement.javascript</string>
<key>MESSAGE</key>
<array/>
<key>NAME</key>
<string>JavaScript</string>
<key>STATE</key>
<true/>
</dict>
</array>
<key>TITLE</key>
<array/>
<key>TOOLTIP</key>
<array/>
<key>TYPE</key>
<integer>0</integer>
<key>UUID</key>
<string>1D2C47E0-5FD3-4623-B934-1347C66782D0</string>
</dict>
</array>
<key>REMOVED</key>
<dict/>
@@ -672,7 +1310,7 @@
<key>LANGUAGE</key>
<string>English</string>
<key>VALUE</key>
<string>@APPLICATION_NAME_XML_ESCAPED@ Client</string>
<string>@APPLICATION_NAME_XML_ESCAPED@</string>
</dict>
</array>
</dict>
@@ -877,6 +1515,18 @@
<string>@CMAKE_INSTALL_DIR@</string>
</dict>
</dict>
<key>SHARED_GLOBAL_DATA</key>
<dict>
<key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
<string>
function olderOsx() {
if(system.compareVersions(system.version.ProductVersion, '10.10') == -1) {
return true;
}
return false;
}
</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
<key>VERSION</key>

View File

@@ -1,12 +1,16 @@
#!/bin/sh
osascript << EOF
# Check if Finder is running (for systems with Finder disabled)
finder_status=`ps aux | grep "/System/Library/CoreServices/Finder.app/Contents/MacOS/Finder" | grep -v "grep"`
if ! [ "$finder_status" == "" ] ; then # Finder is running
osascript << EOF
tell application "Finder"
activate
select the last Finder window
reveal POSIX file "/Applications/@APPLICATION_EXECUTABLE@.app"
end tell
EOF
fi
# Always enable the new 10.10 finder plugin if available
if [ -x "$(command -v pluginkit)" ]; then

View File

@@ -3,4 +3,6 @@
# kill the old version. see issue #2044
killall @APPLICATION_EXECUTABLE@
installer -pkg FUSE\ for\ macOS\ 3.8.1.pkg -target / -applyChoiceChangesXML settings.plist
exit 0

View File

@@ -1,12 +1,36 @@
-----BEGIN PUBLIC KEY-----
MIIBtzCCASsGByqGSM44BAEwggEeAoGBANC50nTWzroQwwawgaV4jd5TjjqbGKDH
6CWbZzyfJ246mJcrwTfM2h5Z80GwLSNFBIjtLGpFd7Wd+CI1dY8oIOYxnYgWDSJC
Al1RMoUSSwx0LRr8J3gojcvvsrhk/t57o9bjXynE2tiP1fwzPb+B3NH/02fMnzfH
k+B8/8GOnX8dAhUA9PZ1QrH/mN+7ckiGjmoegZdv9tMCgYBPEj2850r8+9tXljU4
X0s1NKBfiyhBGw/quJMZ3k0fQ/tpOyYwXYBg+9GBVc4pF1CKMVGoBS6XnLrZ1OkC
OP9g+NNH5cLOKrBxjtd1GPG8UF/sZpak2sVfuNKzRtFT/6WFHc3f7C+LiDFZ2aPO
A+Kr5MZJ8xxYDYj16WV2nKgoQgOBhQACgYEAuQzycfUZKm7MR9WZSFF9uQ3N3SQr
PKYggCl6GTdWYmrsFyXLEBmb3m2qXxx9AcfR2LdkTp/CRCzm+HD6wyHVAAVG2kI2
mWafcahlx/lVMd2yytdRE5pjpjLxw7rrt/fvSZsGwUswQJLl4iDWoE+mFfaaZnnM
JKoiKLX7LUFOPaU=
MIIGOzCCBC0GByqGSM44BAEwggQgAoICAQCwGHwZVKUPwJafICkknBmoIS7TGjfw
TnHpZdWJ/kVvMIhFiui3cJaB85e8R2yGRq7wr6ljYCR5EyjRXEJGEFW05PCUxLhh
LnUg7yWIL1EnRM61zSlnWer4f7IBO7Qf8hd35jL5VuQtqE+Shq1vtC21SFO6GMog
sfQdeyhTMIH67nw19fDxbyqPh+fPsBgitWmO07eF132Qxju0MwXvaju3YrXepuoR
ClonI8pfPCJAAyJd5sEAfJPiqObgW/ehNgU5mVXv2D6VNtvvyu0flnvj05TOtkz+
6392xh0u/xtz1F1clPe31JW3C2zxkvS14M7eSn96hMlojLev75/V84pQNZ7qXQ/X
TxWaucnipJ94EqRLTg1hD3qwyC+5JKqOA6ELFmMARsP2MV4wmBIE+bz/bP2g7UCT
UIJVTZrZAemozMFR6zsQQMrdz9fEPXQhibcg3LppMnnTkAJUdMkKlGIpehGe1tVC
LaOgYh03zf/N7yFwH9eMIiAoXTlqR7iRO1HHsXn60OF8XYEt8Xga8cK7zMiPYOqm
o4rheeXw33pckX63glOjJ+ADH1jhU7vOjRsAySXMFjanD8A31Mh8NbhuvPJowJAx
ez8Hu4M6+fg644z7WHmsrbp0R3/Ow9FI/zmvYT6najOlEwnar8ix210ezjWmAOxN
BTuHN6Bj7ckgdQIVAKwAcb77T0Fyjus9ZImfCqlKdihZAoICABiPO4bywe636AlU
FRhMS/XFeGqRD7GbJSbGzIahooUPyVAeyRIU1HzmeVPx7jTqcoqcau0vXfv10EB+
nJ3q6EzfCbitGIDJ1TjT2BhMtsnhzplhvVOAThuLnLpYwa3h8DIfgTqxh+DaCJHc
ccdl/sAgj/6m54FCRc5ukyQZZeOFgSO2L+JfGDYJpn1CFuRVrXr4DbvtUDItRTbQ
Gxlg5OEx2D1eO5DHtmuRPBZbumgACnFeD97tRQVjVKqQiMU3ZfNDp+mub0/MS/PY
djDZIZM4E3/Nx+IuSuRELGKgifM/ED0tyiq6FYy9kx1nVVoRhWt29ipkQSskvRL3
Ba593/u7dMt2Pa/RVNha+9J1VIadblNu0OkieI8OrPJ8PEdrr3Igit1GuURxz/oR
c4T5nWCM+7e9yxs1resVDsU4D0aJVBMnE7IZwnN9/f4wduR0rxuBTLbMgtgBoIak
JhgplAQu7SdSxKSpY6keGZUpt8ATkixkScZmVhFKmuVYc1c0tLfUqQnlC4Ty44Wk
MEyub6749iRgNQp9vzvntS3EoLDho4CdEWlrp7YBtvTPiey46gcoLeLNZVyGuQ42
CdFw09MIDPEhXBe6oWsOqW4OUla/UoVJyEjuPeiNIMruUJKIGkB1RL6OaiWxJkGM
2HXSebMEweWuScaJmNR5VX87n6KTA4ICBgACggIBAKIAUUc/MJYZYkZectbSabZy
TmlrPmi00q7wpsInTieeKVqOSypS+fuoiG2uuUX4+duqK8mLiA9WC0/y/cBJiWth
Bp28s1ADdC98wamERYpZOxWuHDS9MEsovQzm5RIxgVtZbK7vKk/f0WbGE6xwgERH
dt1zSZRh1ZWi/UWDVGHjlVMEhtNxoRD/Q5T4KUpLez0DNf2VpKk17KsqD2sS1zit
IwIMR++PEY9Rfw1FWIkE5GzJnjxR8sUr6hg5A4z779W7qW/KK5DGlOVYrHhdxUDA
b5q4wGBP3sDCPhhZ/g1V62tb1LAXnTMgAkdXGpRCxoe21TcB21PSQAbW1sOpFbSu
07kMLAZIh+L1eR5sY6z7S/pqE4W4ukYUEFJPUSCVUCXkN2ZbSfbQLLi2mVNNIp7u
/MJVxNQOtRqHM+2/nN+98Grivr1ct1G1NUHYgP/lr7Y2QNBiST0Lcnos8pjmI42v
0NxCt+BOx+cc0SNXxRJD2j73IgzD8YW3gvWfzSwUcIqgC27JEEMhscEVNI4vD/CR
mdDmYm0QJdBmEczPf5cA5gyAa1ATYS8ejrh6HpbC++FpSf4FN++5uu9cXtYJgI9B
G0ZEvlGwqzStV35LeqwF2KBSZIspquILBDJDaKHG7wPE5/MdSsFky1awX7jgyGZV
H5CvBpIDHOrQ0r1b40oB
-----END PUBLIC KEY-----

View File

@@ -20,8 +20,23 @@
<file>resources/lock-https.png</file>
<file>resources/lock-https@2x.png</file>
<file>resources/account.png</file>
<file>resources/more.png</file>
<file>resources/more.svg</file>
<file>resources/delete.png</file>
<file>resources/bell.png</file>
<file>resources/close.svg</file>
<file>resources/bell.svg</file>
<file>resources/link.svg</file>
<file>resources/files.svg</file>
<file>resources/folder-grey.png</file>
<file>resources/state-error.svg</file>
<file>resources/state-warning.svg</file>
<file>resources/folder.svg</file>
<file>resources/network.svg</file>
<file>resources/settings.svg</file>
<file>resources/public-white.svg</file>
<file>resources/public.svg</file>
<file>resources/confirm.svg</file>
<file>resources/copy.svg</file>
<file>resources/state-sync.svg</file>
</qresource>
<qresource prefix="/"/>
</RCC>

View File

@@ -45,6 +45,9 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
if (fn MATCHES ".*128.*" )
list (APPEND _icons ${it})
endif (fn MATCHES ".*128.*")
if (fn MATCHES ".*256.*" )
list (APPEND _icons ${it})
endif (fn MATCHES ".*256.*")
endforeach (it)
if (_icons)
add_custom_command(OUTPUT ${_outfilename}.ico ${_outfilename}.rc

View File

@@ -168,7 +168,8 @@ function(ecm_add_app_icon appsources)
${icons_at_32px}
${icons_at_48px}
${icons_at_64px}
${icons_at_128px})
${icons_at_128px}
${icons_at_256px})
if (NOT windows_icons)
message(AUTHOR_WARNING "No icons suitable for use on Windows provided")
endif()

View File

@@ -0,0 +1,43 @@
# Find the FUSE includes and library
#
# Once done this will define
# FUSE_FOUND - system has FUSE
# FUSE_INCLUDE_DIR - the FUSE include directory
# FUSE_LIBRARIES - List of libraries when using FUSE.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
# check if already in cache, be silent
IF (FUSE_INCLUDE_DIR)
SET (FUSE_FIND_QUIETLY TRUE)
ENDIF (FUSE_INCLUDE_DIR)
# find includes
FIND_PATH (FUSE_INCLUDE_DIR fuse.h
/usr/local/include/osxfuse
/usr/local/include
/usr/include
)
# find lib
if (APPLE)
SET(FUSE_NAMES libosxfuse.dylib fuse)
else (APPLE)
SET(FUSE_NAMES fuse)
endif (APPLE)
FIND_LIBRARY(FUSE_LIBRARIES
NAMES ${FUSE_NAMES}
PATHS /lib64 /lib /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(FUSE DEFAULT_MSG FUSE_INCLUDE_DIR FUSE_LIBRARIES)
mark_as_advanced(FUSE_INCLUDE_DIR FUSE_LIBRARIES)

View File

@@ -11,7 +11,7 @@
<key>CFBundleExecutable</key>
<string>@APPLICATION_EXECUTABLE@</string>
<key>CFBundleIconFile</key>
<string>ownCloud.icns</string>
<string>@APPLICATION_ICON_NAME@.icns</string>
<key>CFBundleIdentifier</key>
<string>@APPLICATION_REV_DOMAIN@</string>
<key>CFBundleInfoDictionaryVersion</key>
@@ -27,11 +27,11 @@
<key>CFBundleShortVersionString</key>
<string>@MIRALL_VERSION_STRING@</string>
<key>NSHumanReadableCopyright</key>
<string>(C) 2014-2016 @APPLICATION_VENDOR@</string>
<string>(C) 2014-2018 @APPLICATION_VENDOR@</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>SUShowReleaseNotes</key>
<false/>
<key>LSMinimumBundleVersion</key>
<string>10.7.0</string>
<key>SUPublicDSAKeyFile</key>
<string>dsa_pub.pem</string>
</dict>

View File

@@ -403,6 +403,8 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
File "${IMAGEFORMATS_DLL_PATH}\qico.dll"
File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
; PNG is built in Qt
SetOutPath "$INSTDIR\sqldrivers"
File "${SQLITE_DLL_PATH}\qsqlite.dll"
@@ -420,6 +422,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
File "${QT_DLL_PATH}\Qt5Gui.dll"
File "${QT_DLL_PATH}\Qt5Network.dll"
File "${QT_DLL_PATH}\Qt5PrintSupport.dll"
File "${QT_DLL_PATH}\Qt5Svg.dll"
File "${QT_DLL_PATH}\Qt5Qml.dll"
File "${QT_DLL_PATH}\Qt5Sql.dll"
File "${QT_DLL_PATH}\Qt5WebKit.dll"

View File

@@ -7,10 +7,11 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
# Fix sqlite compilation on macOS
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types-discards-qualifiers")
# Fix sqlite compilation on MinGW
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-discarded-qualifiers")
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
# Fix sqlite compilation on MinGW
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-discarded-qualifiers")
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
OUTPUT_VARIABLE GCC_VERSION)
if(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)

View File

@@ -4,6 +4,7 @@
#cmakedefine USE_INOTIFY 1
#cmakedefine WITH_QTKEYCHAIN 1
#cmakedefine WITH_CRASHREPORTER
#cmakedefine WITH_PROVIDERS "@WITH_PROVIDERS@"
#cmakedefine CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@"
#define SOCKETAPI_TEAM_IDENTIFIER_PREFIX "@SOCKETAPI_TEAM_IDENTIFIER_PREFIX@"
@@ -24,6 +25,4 @@
#cmakedefine SYSCONFDIR "@SYSCONFDIR@"
#cmakedefine SHAREDIR "@SHAREDIR@"
#cmakedefine WITH_TESTING 1
#endif

View File

@@ -16,8 +16,6 @@ if(SPHINX_FOUND)
install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
if(WITH_DOC)
add_custom_target(doc ALL DEPENDS doc-html COMMENT "Building documentation...")
else(WITH_DOC)

View File

@@ -43,22 +43,17 @@ help:
clean:
-rm -rf $(BUILDDIR)/*
html: html-org
html: html-com
html-all: html-release html-org html-com
html-all: html-release html-com
html-release:
$(SPHINXBUILD) -b html -D html_theme='owncloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release
$(SPHINXBUILD) -b html -D html_theme='nextcloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/release."
html-org:
$(SPHINXBUILD) -b html -D html_theme='owncloud_org' $(ALLSPHINXOPTS) $(BUILDDIR)/html/org
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/org."
html-com:
$(SPHINXBUILD) -b html -D html_theme='owncloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
$(SPHINXBUILD) -b html -D html_theme='nextcloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/com."

0
doc/_shared_assets/static/.gitignore vendored Normal file
View File

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
enable-background="new 0 0 512 512"
height="512px"
id="Layer_1"
version="1.1"
viewBox="0 0 512 512"
width="512px"
xml:space="preserve"
inkscape:version="0.91 r13725"
sodipodi:docname="diaspora.svg"><metadata
id="metadata23"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs21" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1600"
inkscape:window-height="835"
id="namedview19"
showgrid="false"
inkscape:snap-page="true"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:zoom="0.65186405"
inkscape:cx="44.967724"
inkscape:cy="89.460609"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g3" /><g
id="g3"><rect
style="opacity:1;fill:#212121;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="rect4151"
width="512"
height="512"
x="0"
y="0"
ry="256" /><path
transform="matrix(0.99926466,0,0,0.99926466,0.18974539,0.19224343)"
style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd"
d="m 256.078,321.98 -71.808,98.86 -57.139,-41.563 71.652,-98.711 -116.095,-37.793 21.767,-67.269 116.248,37.789 0,-122.141 70.594,0 0,122.141 116.246,-37.789 21.766,67.269 -116.094,37.637 71.801,98.867 -57.133,41.563 z"
id="polygon17" /></g></svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Some files were not shown because too many files have changed in this diff Show More