1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-26 04:42:45 +01:00
Commit Graph

11836 Commits

Author SHA1 Message Date
Olivier Goffart
073de7a8e0 Merge remote-tracking branch 'origin/2.5' 2018-04-24 13:02:37 +02:00
Thomas Boerger
397206134f Dropped .travis.yml from repo 2018-04-24 12:54:22 +02:00
Thomas Boerger
a12986a952 Build clang and gcc on drone 2018-04-24 12:54:22 +02:00
Thomas Boerger
5270b76520 Dropped .travis.yml from repo 2018-04-24 12:52:27 +02:00
Thomas Boerger
f0dae03d06 Build clang and gcc on drone 2018-04-24 12:52:27 +02:00
Christian Kamm
4268f793fb Share dialog: Don't hide account settings before showing #6185
At least on windows and linux. OSX would need tests first since
the addition was originally supposed to help with OSX problems,
see #3783.
2018-04-24 10:09:23 +02:00
Olivier Goffart
1ef7ca1b09 sqlite: Update bundled version to 3.23.1
For OS X and Windows.
2018-04-24 09:16:06 +02:00
Jenkins for ownCloud
dd5265a5f8 [tx-robot] updated from transifex 2018-04-24 02:18:31 +02:00
Jenkins for ownCloud
84a692435e [tx-robot] updated from transifex 2018-04-23 15:28:10 +02:00
Olivier Goffart
c1fb5e6b20 Wizard: Move the 'Skip folder configuration' in a radio button
Issue #3664
2018-04-23 13:29:01 +02:00
Olivier Goffart
e0b554ada9 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-04-23 13:22:01 +02:00
Christian Kamm
1508b562ad 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-04-23 12:24:32 +02:00
Christian Kamm
4390bbf838 SocketAPI: Remove SHARE_STATUS
It was never used by a shell integration.
2018-04-23 12:24:32 +02:00
Jenkins for ownCloud
a4d049464b [tx-robot] updated from transifex 2018-04-23 02:18:31 +02:00
Jenkins for ownCloud
0073b7581f [tx-robot] updated from transifex 2018-04-22 02:18:33 +02:00
Jenkins for ownCloud
1ce3e4c27a [tx-robot] updated from transifex 2018-04-21 02:18:32 +02:00
Markus Goetz
69e5d55956 Logging: Avoid the word "Error"
The old code printed "QNetworkReply::NoError"
2018-04-20 15:26:34 +02:00
Christian Kamm
7cce30942e CMake: Add a default placeholder_suffix
To make themes work that don't define it explicitly.
2018-04-20 15:08:08 +02:00
Jenkins for ownCloud
71db7fef77 [tx-robot] updated from transifex 2018-04-20 02:18:32 +02:00
Markus Goetz
b6f1ba38a6 Placeholders: Support for macOS #6290 2018-04-19 19:24:29 +02:00
Christian Kamm
f6a075ef54 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-04-19 17:04:56 +02:00
Olivier Goffart
c5701f635a Fix test: QTemporaryDir::filePath was added in Qt 5.9 2018-04-19 17:01:31 +02:00
Olivier Goffart
2bf1f27c80 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-04-19 16:44:11 +02:00
Christian Kamm
a5271b529b LocalDiscoveryTracker: Add unit test #6120 2018-04-19 10:58:46 +02:00
Christian Kamm
7c558394c1 LocalDiscoveryTracker: Separate from Folder and move to libsync
To allow relevant code to be closer together and for testing in
unittests without having to get a gui Folder.

See #6120
2018-04-19 10:58:46 +02:00
Jenkins for ownCloud
d2d5439c5c [tx-robot] updated from transifex 2018-04-19 02:18:39 +02:00
Olivier Goffart
c82aa10a66 ChangeLog: update for 2.5 2018-04-18 15:04:56 +02:00
Olivier Goffart
38f1c5b7d2 Logger: Guard zlib usage by ZLIB_FOUND
Similar to the use for the checksum.
I know that zlib is required in principle, but i don't have it
in one of my test building environment, and it is easier to just
disable it.
2018-04-18 15:01:30 +02:00
Christian Kamm
985a657f48 Merge remote-tracking branch 'origin/master' 2018-04-18 11:14:08 +02:00
Christian Kamm
9e8464e114 Merge branch 'placeholder-prototype' 2018-04-18 11:02:53 +02:00
Olivier Goffart
02b818af04 Download: Use the <s:message> from the reply in the error message if any
Issue: #6459
2018-04-18 10:57:16 +02:00
Olivier Goffart
0fdfb2cba3 Add a test for resuming downloads 2018-04-18 10:57:16 +02:00
Christian Kamm
a9561f494b Doc: Add showExperimentalOptions to conffile.rst 2018-04-18 10:27:51 +02:00
Christian Kamm
b7412a4f09 Wizards: Show placeholder option only if showExperimentalOptions is set
This config file option will also control other features in the future.
2018-04-18 10:27:51 +02:00
Christian Kamm
ba1309b3a4 Wizards: Add placeholder option and warning to account wizard
Also add the warning dialog to the option in the folder wizard.
2018-04-18 10:27:51 +02:00
Christian Kamm
70b4dc99dc NSIS: Register placeholder extension
Also change the placeholder suffix config option to not include the dot,
the dotless form is needed in the nsis script.
2018-04-18 10:27:51 +02:00
Christian Kamm
65a2b1aa8a Placeholders: Fix migration issues
Some edgecases weren't covered and didn't have tests yet.
2018-04-18 10:27:51 +02:00
Christian Kamm
fb3e3edcbd SyncOptions: Add default placeholder suffix
Otherwise each test has to set this up anew.
2018-04-18 10:27:51 +02:00
Christian Kamm
c2f84d7c3e Placeholders: Ignore placeholder files in older clients
To do this, we add the placeholder extension to the user exclude file
automatically. However, newer clients shouldn't use that exclude
pattern: so we also add version directives that allow making exclude
patterns dependent on the client version.
2018-04-18 10:27:51 +02:00
Christian Kamm
8358dabbfd Folder: Simplify relative path computation
It was done manually in several places after folderForPath() calls.
2018-04-18 10:27:51 +02:00
Christian Kamm
8b6ae04155 Placeholders: Download from shell integration 2018-04-18 10:27:51 +02:00
Olivier Goffart
87433bfe87 Placeholder: The extension is now a branding option 2018-04-18 10:27:51 +02:00
Olivier Goffart
9bd583b0e5 Placeholders: Fixup clicking on placeholder after previous change
Now that the name in the db is the name of the placeholder file,
we need to adjust the call to downloadPlaceholder
2018-04-18 10:27:51 +02:00
Christian Kamm
01bb241e48 Placeholders: Safe migration to older client versions
Now the db entries for placeholders will have the full placeholder
paths. That way older clients will, on remote discovery, delete the
placeholders and download the real files.
2018-04-18 10:27:51 +02:00
Christian Kamm
e2f2c9a153 Placeholders: Deal with conflicts when a placeholder exists
So "foo.owncloud" exists but the user adds a new "foo".
2018-04-18 10:27:51 +02:00
Olivier Goffart
a41d385607 Placeholders: install mimetype on linux 2018-04-18 10:27:51 +02:00
Olivier Goffart
a8b4526d65 Placeholders: Add an checkbox in the FolderWizard to enable the placeholder feature 2018-04-18 10:27:51 +02:00
Olivier Goffart
a2191474eb Placeholders: Move the placeholder option from the account to the folder 2018-04-18 10:27:51 +02:00
Olivier Goffart
cc8497916d PlaceHolders: Trigger a download of the placeholder and open it 2018-04-18 10:27:51 +02:00
Christian Kamm
798e60c9f6 On-demand downloading: Placeholder-file based prototype
- Controled by an option.
- New remote files start out as ItemTypePlaceholder, are created with a
  .owncloud extension.
- When their db entry is set to ItemTypePlaceholderDownload the next
  sync run will download them.
- Files that aren't in the placeholder state sync as usual.
- See test cases in testsyncplaceholders.

Missing:
- User ui for triggering placeholder file download
- Maybe: Going back from file to placeholder?
2018-04-18 10:27:51 +02:00