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

• 11a540114e Hiding the keys from the output István Váradi 2018-01-30 19:22:26 +01:00
• 89b2df62c5 Merge pull request #144 from nextcloud/win_images Roeland Jago Douma 2018-01-30 14:23:32 +01:00
• da2a1c25d5 Add drone build for documentation Julius Härtl 2018-01-30 14:23:10 +01:00
• df123bb3bc Use NC windows installer images Roeland Jago Douma 2018-01-30 11:25:46 +01:00
• c04d1f1f69 Make different program so it doesn't mess with existing config e2e-tech-preview-1 Roeland Jago Douma 2018-01-30 11:53:52 +01:00
• f8d805d78b Use NC windows installer images Roeland Jago Douma 2018-01-30 11:25:46 +01:00
• d85c2bf025 Fix building on windows Roeland Jago Douma 2018-01-30 11:10:03 +01:00
• c32ba4aee3 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-30 02:18:36 +01:00
• 296f46356e If the metadata is empty we should store (and not update). Roeland Jago Douma 2018-01-29 22:04:50 +01:00
• dcc9ac7d2e [Buildfix] Fix build from last merge Tomaz Canabrava 2018-01-29 14:17:52 +01:00
• d24a1e542e Merge branch 'master' into clientSideEncryptionV3 Tomaz Canabrava 2018-01-29 14:06:12 +01:00
• e720f84005 owncloudcmd: Do not do the capability call when --nonshib is passed Olivier Goffart 2018-01-24 10:42:58 +01:00
• ec26388826 - doc: linux-only setting Oleg Solovyov 2018-01-25 17:22:27 +03:00
• f0822d648d - add description for moveToTrash variable Oleg Solovyov 2018-01-25 17:05:26 +03:00
• 14f60a4238 FolderStatusModel: Refresh folders on Problem sync #6337 Christian Kamm 2018-01-29 09:36:35 +01:00
• f8022bb248 Fix compiler warning Christian Kamm 2018-01-29 09:31:31 +01:00
• 48ef2e4563 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-29 02:18:36 +01:00
• a7e1003c41 Add shared_assets Morris Jobke 2018-01-29 01:16:18 +01:00
• fe102f359c Build current documentation Morris Jobke 2018-01-29 01:15:00 +01:00
• f4a50e88f5 [CSE] Ignore renames for downloaded files. Tomaz Canabrava 2018-01-28 23:59:53 +01:00
• 682bb2ad43 [CSE] Save the encrypted name relation on downloads Tomaz Canabrava 2018-01-28 23:50:12 +01:00
• d38e5e1529 [CSE] Bypass rename if it's e2e Tomaz Canabrava 2018-01-28 23:48:51 +01:00
• 7b123650da [CSE] Search for name, not mangled name. Tomaz Canabrava 2018-01-28 23:48:25 +01:00
• 0c94142c97 [CSE] More debug output Tomaz Canabrava 2018-01-28 23:47:58 +01:00
• e8849a2cf9 [CSE] Save the relation of the file / encrypted file names on the db Tomaz Canabrava 2018-01-28 22:26:07 +01:00
• 11946d9ef8 Bump Roeland Jago Douma 2018-01-28 20:21:12 +01:00
• 4ee1f1fe1a Foo Roeland Jago Douma 2018-01-28 20:19:37 +01:00
• 3c084bb6eb Bump drone image Roeland Jago Douma 2018-01-28 19:55:52 +01:00
• 45eefb27cf Bump AppImage Drone Roeland Jago Douma 2018-01-28 19:56:27 +01:00
• e9a7a56359 [CSE] Store the encrypted file name on the SyncFilePtr Tomaz Canabrava 2018-01-28 18:37:01 +01:00
• a003d216a5 [CSE] Implementation of the setE2eRelation Tomaz Canabrava 2018-01-28 18:05:28 +01:00
• 32eaaa0601 [CSE] GetMangledName implementation Tomaz Canabrava 2018-01-28 17:50:10 +01:00
• be817748f8 [CSE] Reset the new Queries on close Tomaz Canabrava 2018-01-28 17:46:20 +01:00
• b909bb6977 [CSE] Change the Database to handle Encrypted Files Tomaz Canabrava 2018-01-28 16:41:07 +01:00
• a0d9fc4354 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-28 02:18:53 +01:00
• 72f629a7dc Added secrets to .drone.yml István Váradi 2018-01-27 08:50:28 +01:00
• e4b2d27c65 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-27 02:18:50 +01:00
• d1aacac294 Tray: Change icon for unresolved conflicts #6277 Christian Kamm 2018-01-23 14:11:20 +01:00
• 9ad6f1485e Printing environment István Váradi 2018-01-26 12:54:35 +01:00
• 459b6ab1e7 Trigger another build in the hope that it will see the previous commit István Váradi 2018-01-26 12:41:27 +01:00
• 85140d3784 Reverting to upper-case key variable names István Váradi 2018-01-26 12:28:14 +01:00
• e322bd706f SocketAPI: "Open in browser" and disable Share entries when sharing is disabled. Olivier Goffart 2018-01-23 16:38:47 +01:00
• c846a329a8 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-26 02:18:34 +01:00
• 040507fce6 Merge pull request #135 from nextcloud/oc_up Roeland Jago Douma 2018-01-25 20:31:35 +01:00
• 7a1f32894b Try if the variables are lower-case István Váradi 2018-01-25 17:21:02 +01:00
• 1acd7db5f8 Dummy commit to trigger a new build István Váradi 2018-01-25 17:16:59 +01:00
• de929eb566 Adjust the Move To Trash patch Olivier Goffart 2018-01-25 14:35:21 +01:00
• c5d37dfedc Move remote-deleted files to trash Oleg Solovyov 2017-12-25 13:46:38 +03:00
• e2e99da446 Bump appimage drone image Roeland Jago Douma 2018-01-25 14:31:14 +01:00
• bcb9553925 Use Qt5DBus_FOUND instead of the old WITH_DBUS Julius Härtl 2018-01-25 13:42:08 +01:00
• eae00f9969 Use std::chrono::milliseconds to represent milliseconds Olivier Goffart 2018-01-23 22:51:25 +01:00
• aa7e47f525 Fix new icon naming Roeland Jago Douma 2018-01-25 12:04:50 +01:00
• 48bce4c6b0 Merge remote-tracking branch 'oc/master' into oc_up Roeland Jago Douma 2018-01-25 11:17:04 +01:00
• c1bf90ddad [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-25 02:18:51 +01:00
• 84b26e0d4d Merge pull request #133 from nextcloud/fix-notification-dismiss-button Roeland Jago Douma 2018-01-24 19:29:21 +01:00
• 3d162745af Merge pull request #131 from nextcloud/nextcloud_subdir Julius Härtl 2018-01-24 17:59:48 +01:00
• 7a69e19e4d Uses QString::number to get a string equivalent of the notification_id number. Camila San 2018-01-24 16:59:20 +01:00
• 02988229b1 FolderStatusModel: don't use deprecated QModelIndex::child Olivier Goffart 2018-01-24 10:19:54 +01:00
• b418bf6db4 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-24 02:18:35 +01:00
• 4892b0ec43 Properly fill EncryptedFile Roeland Jago Douma 2018-01-23 21:31:00 +01:00
• 21d55c3321 No sharing in metadata yet and PEM as PKCS#8 Roeland Jago Douma 2018-01-23 21:02:52 +01:00
• 5e7f72b8df Attempt to pass the key in the environment István Váradi 2018-01-23 19:51:13 +01:00
• ed9300f924 Commit to trigger build István Váradi 2018-01-23 19:42:34 +01:00
• 72b9beb79c Merge remote-tracking branch 'origin/2.4' Olivier Goffart 2018-01-23 14:08:15 +01:00
• 883080b557 Windows shell extension: port to the new protocol Olivier Goffart 2018-01-19 19:44:10 +01:00
• ebfac84c69 Shell integration: Make nautilus work with multiselections Christian Kamm 2018-01-22 10:22:51 +01:00
• 3c2622d2de Shell integration: Update nautilus for GET_MENU_ITEMS Christian Kamm 2018-01-19 11:32:08 +01:00
• 982c591ec9 SocketApi: add a way to disable menu entries Olivier Goffart 2018-01-19 14:02:46 +01:00
• 1782ae3c08 SocketAPI: Make it easier to add or remove item in the action menu Olivier Goffart 2018-01-18 15:17:29 +01:00
• 7ce009ef49 If status.php fails check <server>/nextcloud/status.php Roeland Jago Douma 2018-01-23 13:43:44 +01:00
• 72363155d8 Nautilus integration: Work with python2 and python3 Christian Kamm 2018-01-23 11:47:23 +01:00
• f254ee3211 Nautilus shell integration: Port to Python 3 Olivier Goffart 2018-01-18 14:13:40 +01:00
• 59f2e0634e Protocol: Correct sorting by size #6326 Christian Kamm 2018-01-23 10:28:52 +01:00
• 32bb1e6763 ProtocolItem: Use accessors over magic numbers Christian Kamm 2018-01-23 10:23:32 +01:00
• 497b327d43 ShareLinkWidget: Remove outdated signal connection Christian Kamm 2018-01-22 10:52:25 +01:00
• d831369f86 Protocol: Remove entries for auto resolved conflicts #6316 Christian Kamm 2018-01-22 10:51:53 +01:00
• a2b8724adf Hacky way to drop duplicates (we should really use the fileid!) Roeland Jago Douma 2018-01-23 11:58:05 +01:00
• bb85e2ab2c Reuse existing EncryptedFile Roeland Jago Douma 2018-01-23 11:36:15 +01:00
• c1a1e55207 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-23 02:18:36 +01:00
• c3dbb20ce3 Logger: --logdebug only show owncloud's debug message Olivier Goffart 2018-01-21 10:43:27 +01:00
• 33beb7aade Don't generate values after we use them Roeland Jago Douma 2018-01-22 15:24:54 +01:00
• cae6bbc853 [CSE] Start the download process Tomaz Canabrava 2018-01-22 14:08:32 +01:00
• e2b89c5afe TextXmlParse: Add truncated-xml testcase #6317 Christian Kamm 2018-01-22 14:05:08 +01:00
• ba4712c922 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-22 02:18:54 +01:00
• cf2fa2ea35 [CSE] Get the tag of the encrypted file to feed the metadata Tomaz Canabrava 2018-01-21 21:59:19 +01:00
• 5d6817e165 [CSE] Save the tag while encrypting. Tomaz Canabrava 2018-01-21 21:49:24 +01:00
• 261cedce3f [CSE] Do not quit if encryption fails Tomaz Canabrava 2018-01-21 21:40:53 +01:00
• 2d872f2a8d [CSE] Add missing files Tomaz Canabrava 2018-01-21 21:26:05 +01:00
• 009562da1e [CSE] Remove lambas with lambdas Tomaz Canabrava 2018-01-21 21:25:06 +01:00
• d5a76ea70d [CSE] Remove the DecryptionJob Tomaz Canabrava 2018-01-21 21:24:02 +01:00
• 4a2d0ab9e9 [CSE] Move code to display minemonic out of the libsync Tomaz Canabrava 2018-01-21 19:50:40 +01:00
• a19eb59461 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-21 02:18:35 +01:00
• 484ec95596 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-20 02:18:50 +01:00
• 5a97ddde5a Merge remote-tracking branch 'origin/2.4' Olivier Goffart 2018-01-19 13:41:29 +01:00
• b8539eb329 Get rid of the StopWatch in the PropagateUpload job Olivier Goffart 2018-01-19 11:11:53 +01:00
• b9c7aa8df3 Sync: Deal with file/folder conflicts #6312 Christian Kamm 2018-01-17 10:59:47 +01:00
• 6f5b3eb4d7 [tx-robot] updated from transifex Jenkins for ownCloud 2018-01-19 02:18:35 +01:00
• 6d613fb4d5 Quick and dirty way of showing the mnemonic for now Roeland Jago Douma 2018-01-18 22:10:55 +01:00
• 127e675838 Merge pull request #6310 from owncloud/appveyor Dominik Schmidt 2018-01-18 18:08:09 +01:00
• c1b5412c16 Exclude regex: Use named captures Christian Kamm 2018-01-17 15:22:19 +01:00