Commit Graph
17214 Commits
Author SHA1 Message Date
Roeland Jago DoumaandGitHub 2236d05d25 Merge pull request #49 from nextcloud/nc_theme
Nextcloud theme
2017-11-20 16:47:31 +01:00
Roeland Jago Douma f0537b20d1 Update with NC icons
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-20 16:14:40 +01:00
Roeland Jago Douma 9878559002 Move to NC theme
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-20 15:46:18 +01:00
Markus Goetz 658a8c0609 mirall.desktop.in: Clean bogus comments #5767 2017-11-20 15:29:39 +01:00
Olivier GoffartandMarkus Goetz e7a91a1169 AccountSettings: Use the proper position to show the menu over sub-folder
The menu can be open with the keyboard shortcut.

(Fixup for the fix of #5596)

Also use popup instead of exec to show the menu: it's safer as it does
not re-enter the event loop.
2017-11-20 15:22:45 +01:00
Roeland Jago Douma 6b3006b325 OwnCloudCPack.cmake to NextcloudCPack.cmake
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-20 14:12:52 +01:00
Roeland Jago Douma 5dc73ffd8b OWNCLOUD.cmake => NEXTCLOUD.cmake
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-20 14:12:52 +01:00
Roeland Jago DoumaandGitHub b835bdc55b Merge pull request #48 from nextcloud/oc_master
Bump to oc master
2017-11-20 13:43:34 +01:00
Roeland Jago Douma 725be9ff54 Merge branch 'master' of https://github.com/owncloud/client into oc_master 2017-11-20 13:29:59 +01:00
Christian Kamm 14a51458ab Link share: Move 'delete' button to the bottom #6163 2017-11-20 12:42:41 +01:00
Christian Kamm aafe7c4732 Merge remote-tracking branch 'origin/2.4' 2017-11-20 11:54:56 +01:00
Christian Kamm 86c2e9e825 Tray: Fix 'Open folder' action creation
It looks like the action was created but not added to the menu. Did this
work with previous Qt versions?
2017-11-20 11:48:55 +01:00
Olivier GoffartandOlivier Goffart 480932a58a Checksum: Ignore unkown OC-Checksum header when downloading...
And if there are several checksums, pick the "best" one.

The case of several checksum was reported in
https://github.com/nextcloud/client_theming/issues/213
2017-11-20 10:51:15 +01:00
Jenkins for ownCloud 529bcab009 [tx-robot] updated from transifex 2017-11-20 02:18:34 +01:00
Jenkins for ownCloud 9a4871abeb [tx-robot] updated from transifex 2017-11-19 02:18:36 +01:00
Jenkins for ownCloud 40665c05ac [tx-robot] updated from transifex 2017-11-18 02:18:36 +01:00
Michael StinglandMarkus Goetz d832312acc Add 2.3.3 System Requirements to client repo (#5996)
I would like to maintain the System Requirements in the client repo.
2017-11-17 15:05:42 +01:00
Jenkins for ownCloud 63cf0e347b [tx-robot] updated from transifex 2017-11-17 02:18:37 +01:00
Olivier Goffartandckamm 2192386d86 test/testsyncengine: test for PR #6168 2017-11-16 13:31:54 +01:00
Christian Kamm e694ffcd03 PropagateDownload: Adjustments to skipping downloads #6153
Previously we required matching mtimes but that's actually
unnecessary when the question is about whether to skip the
download. We will still update the file's metadata.

Also, adjust behavior when the checksum is weak (Adler32):
in these cases we still depend on equal mtimes.
2017-11-16 13:31:54 +01:00
Christian KammandMarkus Goetz eff401d418 Share links: Confirm deletion explicitly #6163
Also add the "Delete" action to the "..." menu.
2017-11-16 11:16:47 +01:00
Roeland Jago Douma 9394fe6e84 Use openssl functions to get random words
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-16 10:45:57 +01:00
Jenkins for ownCloud 7049ccd7ab [tx-robot] updated from transifex 2017-11-16 02:18:53 +01:00
Markus Goetz 8fb2167fca sqlite: Update bundled version to 3.21
For OS X and Windows.
2017-11-15 21:53:53 +01:00
Markus Goetz d0b8528022 Changelog: 2.4 changes up to now 2017-11-15 21:47:34 +01:00
Samuel AlfagemeandMarkus Goetz 13d80beb83 Changelog Updated with latest changes
Web equivalent PR: https://github.com/owncloud/owncloud.org/pull/1318
2017-11-15 13:37:25 +01:00
Christian Kamm 06ce8dd8bd Wizard: Add explanation text when server error is shown #6157
Just showing a box with the message can be surprising.
2017-11-15 11:01:44 +01:00
Olivier GoffartandOlivier Goffart 9a1ea67a35 Theme: Update the wizard size on high dpi screen
Issue #6156
2017-11-15 10:46:08 +01:00
Christian Kamm e616f904b6 Share link: Add tooltip to delete button #6163 2017-11-15 10:16:33 +01:00
Christian Kamm bff24ffd2f PropagateDownload: Fix GET with redirects #6159
The GET jobs were redirected, but the custom incremental handling
in readyRead didn't propagate to the follow-up job.
2017-11-15 10:11:15 +01:00
Jenkins for ownCloud 2cdc969cc5 [tx-robot] updated from transifex 2017-11-15 02:18:34 +01:00
Matthew SetterandChristian Kamm b13fd786b6 Fix broken download link 2017-11-14 12:25:48 +01:00
Matthew SetterandChristian Kamm 89d55d0af8 Fix broken images in the FAQ 2017-11-14 12:25:48 +01:00
Matthew SetterandChristian Kamm d46335aba1 Minor formatting fixes
Fix broken header and table
2017-11-14 12:25:48 +01:00
Matthew SetterandChristian Kamm e417a4b159 Fix title casing to match style guide 2017-11-14 12:25:48 +01:00
Christian Kamm b0f986c740 Private links: Account for overwritehost #6146
Retrieve ocs/v1.php/config to determine the desired host and build the
private link urls with that instead.
2017-11-14 12:14:11 +01:00
Christian Kamm 18091f99d4 Private links: Retrieve numeric file id property #6146
Some servers have non-compliant instance ids (that start with a number)
and thereby make deducing the numeric file id from the full id
unreliable.

To circumvent this problem we retrieve the fileid property from the
server with a PROPFIND.
2017-11-14 12:14:11 +01:00
Christian Kamm 3ae2071129 DetermineAuth: Remove concept of Unknown #6148
This restores 2.3 behavior. Some servers reply 404 to GETs and PROPFINDs
to the remote.php/webdav/ url and used to work. Being more picky would
break them.
2017-11-14 12:10:35 +01:00
Christian Kamm 820ebf4b6e Sql: db close() failing isn't fatal
The assert was made fatal when looking at asserts for #5429 #5518
without having a particular problem in mind. Recent reports weakly
suggest that this might lead to occasional crashes for users when
sqlite_close fails in ways that look ignorable.
2017-11-14 12:10:19 +01:00
Jenkins for ownCloud 161f6baba6 [tx-robot] updated from transifex 2017-11-14 02:18:32 +01:00
Tomaz Canabrava 14aeb6921b [CSE] Fix invalid memory access 2017-11-13 18:15:08 +01:00
Tomaz Canabrava 8adfc28de7 [CSE] Store lock-token and retrieve later 2017-11-13 17:54:19 +01:00
Tomaz Canabrava a0f0e5617a [CSE] Move the e2e object to the Account
This is important as a lot of the code would start
to rely in direct access to the client side encryption
and there are different keys for different accounts.
2017-11-13 17:22:09 +01:00
Tomaz Canabrava 6351c01ee7 [CSE] Remember the token for folders 2017-11-13 17:04:02 +01:00
Tomaz Canabrava e32fd58578 [CSE] handle success and failure of metadata upload. 2017-11-13 17:03:40 +01:00
Tomaz Canabrava 22a2ab8999 [CSE] Start to send the metadata to the server 2017-11-13 16:46:30 +01:00
Jenkins for ownCloud 89d7dbf2cf [tx-robot] updated from transifex 2017-11-13 02:18:32 +01:00
Tomaz Canabrava 4755b8c8a3 [CSE] More warnings 2017-11-12 13:03:52 +01:00
Tomaz Canabrava 19d64e6308 [CSE] Remove warnings 2017-11-12 12:55:12 +01:00
Jenkins for ownCloud b1972e56fa [tx-robot] updated from transifex 2017-11-12 02:18:33 +01:00