Commit Graph

Select branches

Hide Pull Requests

master

stable-3.3

stable-3.3-lnk

stable-3.4

2.6.2-buildtest1

csync-0.50.0

e2e-tech-preview-1

techpreview-v1

techpreview-v2

v0.0.2

v1.1.0

v1.1.0-beta1

v1.1.2

v1.2.0

v1.2.1

v1.2.2

v1.2.3

v1.2.4

v1.2.5

v1.3.0

v1.3.0-beta1

v1.3.0-beta2

v1.3.0-beta3

v1.3.0-beta4

v1.4.0

v1.4.0-beta1

v1.4.0-beta2

v1.4.0-rc1

v1.4.1

v1.4.2

v1.5.0

v1.5.0-beta1

v1.5.0-beta1-2nd

v1.5.0-beta2

v1.5.0-beta3

v1.5.1

v1.5.1-rc1

v1.5.2

v1.5.3

v1.5.3-rc1

v1.6.0

v1.6.0-beta1

v1.6.0-beta2

v1.6.0-rc1

v1.6.0-rc2

v1.6.0-rc3

v1.6.1

v1.6.1-rc1

v1.6.2

v1.6.2-rc1

v1.6.2-rc2

v1.6.2-themefix

v1.6.3

v1.6.3-rc1

v1.6.4

v1.6.4-rc1

v1.6.4-rc2

v1.7.0

v1.7.0-alpha1

v1.7.0-beta1

v1.7.0-beta2

v1.7.0-beta3

v1.7.0-beta4

v1.7.0-rc1

v1.7.0beta1

v1.7.0beta2

v1.7.1-beta1

v1.7.1-rc1

v1.8.0

v1.8.0-beta1

v1.8.0-beta1a

v1.8.0-beta2

v1.8.0-rc1

v1.8.0rc1

v1.8.1

v1.8.1-beta1

v1.8.1-rc1

v1.8.1-rc2

v1.8.2

v1.8.2-beta1

v1.8.2-rc1

v1.8.3

v1.8.3-rc1

v1.8.3-rc2

v1.8.3-rc3

v2.0.0

v2.0.0-beta2

v2.0.0-rc2

v2.0.1

v2.0.2

v2.0.2-oem

v2.0.2-rc1

v2.0.2-rc2

v2.1.0

v2.2.3

v2.2.4

v2.3.0

v2.3.0-rc3

v2.3.1

v2.3.1-rc1

v2.3.2

v2.3.2-rc1

v2.3.3

v2.3.3-rc1

v2.3.4

v2.4.0

v2.4.0-alpha1

v2.4.0-beta1

v2.4.0-rc1

v2.4.0-rc2

v2.4.1

v2.4.1-rc1

v2.4.2

v2.4.2-rc1

v2.4.3

v2.4.3-rc1

v2.5.0

v2.5.0-alpha

v2.5.0-alpha1

v2.5.0-beta1

v2.5.0-beta2

v2.5.0-oem

v2.5.0-rc1

v2.5.0-rc2

v2.5.1

v2.5.2

v2.5.2-rc1

v2.5.3

v2.5.3-rc1

v2.5.3-rc2

v2.6.0

v2.6.0-fix1

v2.6.0-rc1

v2.6.1

v2.6.1-rc1

v2.6.2

v2.6.2-rc1

v2.6.3

v2.6.4

v2.6.5

v2.7.0-beta1

v2.7.0-beta2

v2.7.0-beta3

v2.7.0-rc1

v3.0.0

v3.0.1

v3.0.2

v3.0.3

v3.1.0

v3.1.0-rc1

v3.1.0-rc2

v3.1.1

v3.1.2

v3.1.3

v3.2.0

v3.2.0-rc1

v3.2.0-rc2

v3.2.0-rc3

v3.2.1

v3.2.2

v3.2.3

v3.2.4

v3.3.0

v3.3.0-rc1

v3.3.0-rc2

v3.3.1

v3.3.2

v3.3.3

v3.3.4

v3.3.5

v3.3.6

v3.3.6-lnk

v3.4.0-do-not-use

v3.4.0-rc1

v3.4.0-rc2

v3.4.1

v3.4.2

Mono Color

• de1032ebd7 Q_UNUSED: Sprinkle around Markus Goetz 2018-04-13 17:15:07 +02:00
• 27826ddee0 Merge pull request #355 from nextcloud/upstream/pr/6450 Roeland Jago Douma 2018-06-05 20:45:11 +02:00
• d3cbe63801 macOS: Implement new dynamic Finder menu items #6328 Markus Goetz 2018-04-11 13:40:27 +02:00
• 5b0a1d4c79 Merge pull request #354 from nextcloud/upstream/pr/6444 Roeland Jago Douma 2018-06-05 20:39:43 +02:00
• 648911f3ab macOS: Unload the Finder extension on exit #5382 #3819 Markus Goetz 2018-04-10 15:51:06 +02:00
• eda221227f Merge pull request #353 from nextcloud/upstream/pr/6448 Roeland Jago Douma 2018-06-05 20:21:25 +02:00
• 4a81ae75cf Logging: Add persistent auto-logdir option #6442 Christian Kamm 2018-04-10 13:07:20 +02:00
• 428cfc5e1c LogDir: Compress log when switching files #6442 Christian Kamm 2018-04-10 12:20:33 +02:00
• 9319b6594e LogDir: Go to new file on Problem/Abort too #6442 Christian Kamm 2018-04-10 12:20:12 +02:00
• a7b7344659 Merge pull request #352 from nextcloud/upstream/pr/6438 Roeland Jago Douma 2018-06-05 20:07:00 +02:00
• 63c2474b70 Folders: Use "Problem" icon for unresolved conflicts #6277 Christian Kamm 2018-04-09 11:02:29 +02:00
• f9f1f8bda6 Merge pull request #351 from nextcloud/upstream/pr/6437 Roeland Jago Douma 2018-06-05 19:58:40 +02:00
• ed5e413751 Share link: Update permission wording #6192 Christian Kamm 2018-04-09 10:33:18 +02:00
• 7c4c3b0493 Merge pull request #349 from nextcloud/upstream/macOS Roeland Jago Douma 2018-06-05 13:39:36 +02:00
• 4ddbb35d77 Fix debian patch Roeland Jago Douma 2018-06-05 10:35:59 +02:00
• 16bf765818 macOS: Don't hardcode path in Installer source Markus Goetz 2018-04-04 16:45:42 +02:00
• 5667408c58 macOS: Offer only standard installation in installer Markus Goetz 2018-04-04 16:23:18 +02:00
• a0e17ce221 create_mac.sh: Also name properly in source dir Markus Goetz 2018-04-04 15:46:16 +02:00
• 3defc30e12 macosx.pkgproj; This is a .cmake preprocessed file Markus Goetz 2018-04-04 15:41:31 +02:00
• 09f83f4fa9 SyncJournal: Clear etag filter before sync Christian Kamm 2018-02-16 10:33:35 +01:00
• 3ce41c71c1 Merge pull request #350 from nextcloud/upstream/pr/6436 Roeland Jago Douma 2018-06-05 11:30:24 +02:00
• 613fd30021 SyncJournalDb::setSelectiveSyncList: Always use a transaction Olivier Goffart 2018-04-09 08:49:56 +02:00
• 0afcb23734 Merge pull request #331 from nextcloud/upstream/pr/6412 Roeland Jago Douma 2018-06-05 10:18:53 +02:00
• c57e4dcf03 Blacklisting must prevent parent etag updates #6411 Christian Kamm 2018-03-27 15:42:09 +02:00
• 5309694b34 Merge pull request #394 from nextcloud/fix/master/info Roeland Jago Douma 2018-06-05 09:39:06 +02:00
• a0c458d937 Fix output add E2E again Roeland Jago Douma 2018-06-05 09:00:42 +02:00
• a035b9b10b Merge pull request #393 from ivaradi/master Roeland Jago Douma 2018-06-05 09:02:23 +02:00
• 92de0770bc Re-encoded Ubuntu/Debian upload keys István Váradi 2018-06-05 08:34:41 +02:00
• 2eb87e769c Merge pull request #330 from nextcloud/upstream/pr/6408 Roeland Jago Douma 2018-06-05 08:19:01 +02:00
• f4f228de3e FolderStatusModel: fix potential assert Olivier Goffart 2018-03-27 12:17:29 +02:00
• 6872cbda7e Merge pull request #329 from nextcloud/upstream/pr/6416 Roeland Jago Douma 2018-06-05 08:12:00 +02:00
• 3e508329b5 csync_update: add the checksum in the discovery log Olivier Goffart 2018-03-28 13:00:38 +02:00
• 69aa077212 Merge pull request #338 from ivaradi/master Roeland Jago Douma 2018-06-05 07:51:46 +02:00
• d0e4c67459 Merge branch 'master' of github.com:nextcloud/client István Váradi 2018-06-05 06:58:12 +02:00
• f8d0cbd468 [tx-robot] updated from transifex Nextcloud bot 2018-06-05 00:47:52 +00:00
• 789c7062fe [tx-robot] updated from transifex Jenkins for ownCloud 2018-06-05 02:18:43 +02:00
• dfed78a665 Merge pull request #328 from nextcloud/upstream/issue/5932 Roeland Jago Douma 2018-06-04 20:23:38 +02:00
• 0d182280c4 macdeployqt: Adjust minimum version based on our Qt #5932 Markus Goetz 2018-04-03 21:31:02 +02:00
• 8477c5a565 Merge pull request #327 from nextcloud/upstream/pr/6271 Roeland Jago Douma 2018-06-04 20:00:58 +02:00
• 32ae670c4e Merge pull request #325 from nextcloud/upstream/ssl-button-speed Roeland Jago Douma 2018-06-04 17:14:38 +02:00
• 4bd6f2b26d Merge pull request #323 from nextcloud/upstream/upload-finished-flag Roeland Jago Douma 2018-06-04 17:14:17 +02:00
• c1171d700e Merge pull request #322 from nextcloud/upstream/pr/6404 Roeland Jago Douma 2018-06-04 17:13:23 +02:00
• 3a1dc44ec8 Merge pull request #320 from nextcloud/upstream/issue/6403 Roeland Jago Douma 2018-06-04 17:12:52 +02:00
• 3c3f3541d4 Merge pull request #291 from nextcloud/fixEncryptionDecryptionNonEmptyFolder Roeland Jago Douma 2018-06-04 16:03:25 +02:00
• c49597d9d8 Merge pull request #319 from nextcloud/upstream/issue/4424 Roeland Jago Douma 2018-06-04 16:02:49 +02:00
• 321e8c0264 Merge pull request #317 from nextcloud/upstream/issue/3146 Roeland Jago Douma 2018-06-04 16:01:44 +02:00
• 092063d348 Merge pull request #316 from nextcloud/upstream/pr/6384 Roeland Jago Douma 2018-06-04 15:59:45 +02:00
• 393f6c2310 SyncEngine: remove the "CSync" wording from the error messages Olivier Goffart 2018-03-06 07:48:00 +01:00
• 5f30177bfc CSync: Remove unused error codes Olivier Goffart 2018-03-06 07:04:02 +01:00
• 15e93c8a31 CSync: reconcile never returns an error Olivier Goffart 2018-03-06 07:13:28 +01:00
• be29fc2f69 csync: remove CSYNC_PARAM_ERROR Olivier Goffart 2018-03-01 13:55:29 +01:00
• 0443f8dd4d csync: Simplify csync_walk_local_tree/csync_walk_remote_tree Olivier Goffart 2018-03-01 13:53:55 +01:00
• 9b74a596c6 Forbid to encrypt or decrypt a non-empty folder. Tomaz Canabrava 2018-05-11 23:22:33 +02:00
• 5df1af79c5 Merge pull request #377 from nextcloud/bugfix/noid/cloudprovidesr_314 Julius Härtl 2018-06-04 15:32:36 +02:00
• d35ea29ad2 Merge pull request #388 from nextcloud/documentation/macos-osx Morris Jobke 2018-06-04 14:10:55 +02:00
• 9a8078944f FindSql3.cmake: Add the input variable in the search path Olivier Goffart 2018-06-04 11:44:09 +02:00
• 78bfae45ae Mac OS X is now macOS Marius Blüm 2018-06-04 11:44:03 +02:00
• 76bb76a59e FolderStatusModel: Fix crash when there is an error while expanding folders Olivier Goffart 2018-05-31 11:00:11 +02:00
• 888f2aae2f csync: refactor csync_s::error_string to avoid valgrind error Olivier Goffart 2018-05-31 10:56:52 +02:00
• 9e26b0fea3 Fix build without Sparkle.framework Chih-Hsuan Yen 2018-06-02 20:58:33 +08:00
• 52cfb6bfef [tx-robot] updated from transifex Jenkins for ownCloud 2018-06-04 02:18:42 +02:00
• ab34f36836 owncloudsynclog: 1 MB -> 10 MB #6420 Markus Goetz 2018-05-24 16:02:52 +02:00
• f96206705a Merge pull request #315 from nextcloud/upstream/pr/6379 Roeland Jago Douma 2018-06-03 19:58:21 +02:00
• 70d4c64d99 [tx-robot] updated from transifex Nextcloud bot 2018-06-03 00:48:45 +00:00
• 1c03ba03e4 [tx-robot] updated from transifex Jenkins for ownCloud 2018-06-03 02:18:41 +02:00
• 4b1c6bb833 Fix cloudproviders after merging #314 Roeland Jago Douma 2018-06-02 20:46:10 +02:00
• 1262cbf4ef Merge pull request #314 from nextcloud/upstream/pr/6373 Roeland Jago Douma 2018-06-02 20:20:19 +02:00
• b2433c8961 [tx-robot] updated from transifex Nextcloud bot 2018-06-02 00:46:48 +00:00
• eeff148051 [tx-robot] updated from transifex Jenkins for ownCloud 2018-06-02 02:18:42 +02:00
• c9634d65aa Merge pull request #313 from nextcloud/upstream/pr/6380 Julius Härtl 2018-06-01 15:43:19 +02:00
• fc4f8fb2d5 Merge pull request #372 from nextcloud/upstream/pr/6488 Julius Härtl 2018-06-01 15:42:26 +02:00
• 4be565c56f Merge pull request #369 from nextcloud/upstream/issue/6406 Julius Härtl 2018-06-01 15:40:23 +02:00
• e4981931ac Merge pull request #373 from nextcloud/upstream/pr/6490 Julius Härtl 2018-06-01 15:39:56 +02:00
• 5f969580ac Nautilus: Fix Python3 and remove many debug Olivier Goffart 2018-04-25 13:22:34 +02:00
• b8b9b93a6e ShareDialog: macOS grey odditiy #5774 Markus Goetz 2018-04-25 11:57:17 +02:00
• 13cb9ab1c5 PropagateDownload: Don't discard the body of error message Olivier Goffart 2018-05-30 16:29:29 +02:00
• 4d7617d64b Propagator: remove a bunch of code related to the 'Shared' directory Olivier Goffart 2018-03-01 09:18:27 +01:00
• 8484b493e4 ConnectionValidator: change the minimum server version Olivier Goffart 2018-03-01 09:15:17 +01:00
• 70f0792d4a Nautilus shell integration: Print python version on startup #6406 Christian Kamm 2018-04-25 12:26:18 +02:00
• 335298f4e2 Merge pull request #312 from nextcloud/upstream/pr/6374 Roeland Jago Douma 2018-06-01 11:08:20 +02:00
• f5ac5f2973 [tx-robot] updated from transifex Jenkins for ownCloud 2018-06-01 02:18:43 +02:00
• 1b587a1241 ConnectionValidator::Status use Q_ENUM Olivier Goffart 2018-02-21 15:12:21 +01:00
• 311307e8cb Move ClientProxy and ConnecitonValidator to gui Olivier Goffart 2018-02-21 15:03:55 +01:00
• 7e05e1e411 owncloudcmd: Do not overwrite the http timeout for json jobs Olivier Goffart 2018-02-21 14:41:17 +01:00
• 204cb470b4 owncloudcmd: Do not read the proxy settings from the gui's config file Olivier Goffart 2018-02-21 14:00:57 +01:00
• 9fe8713bdc Folder: remove unused member Olivier Goffart 2018-02-21 13:06:41 +01:00
• 08024f69c8 [tx-robot] updated from transifex Nextcloud bot 2018-05-31 00:48:48 +00:00
• bff1c1cf28 [tx-robot] updated from transifex Jenkins for ownCloud 2018-05-31 02:18:44 +02:00
• 107baf2947 VERSION.cmake: 2.5.0-alpha1 v2.5.0-alpha1 Markus Goetz 2018-05-30 13:51:33 +02:00
• 40d432ecdd .desktop file: the MimeType entry must ends with a semi colon Olivier Goffart 2018-05-30 12:58:47 +02:00
• 1753ce651b Virtual Files: Allow to download a folder recursively from the socket API Olivier Goffart 2018-05-28 14:49:02 +02:00
• 104f8c9ba2 NSIS: SVG imageformats plugin DLL #6515 Markus Goetz 2018-05-29 16:09:17 +02:00
• 7a776dbb6a NSIS: SVG DLL #6515 Markus Goetz 2018-05-29 13:35:43 +02:00
• 3a7a6b0b9e Virtual files: Wipe virtual after download completes, not before Christian Kamm 2018-05-30 10:33:32 +02:00
• d7792dc951 Rename SocketApi::FileData::accountRelativePath to serverRelativePath Olivier Goffart 2018-05-30 10:38:29 +02:00
• 1434fa5139 Share dialog: use the original name and not the virtual file name Olivier Goffart 2018-05-28 17:14:57 +02:00
• 252484e875 Virtual files: Only remove virtual file once on download Christian Kamm 2018-05-29 13:16:58 +02:00
• 94535a75d9 Update submodule Olivier Goffart 2018-05-30 09:10:27 +02:00
• c6ef8eec0a Merge pull request #305 from nextcloud/upstream/pr/6363 Roeland Jago Douma 2018-05-30 08:04:05 +02:00
• 86741de622 Merge pull request #299 from nextcloud/upstream/pr/6349 Roeland Jago Douma 2018-05-30 08:03:04 +02:00