Roeland Douma [Fri, 30 Oct 2015 10:01:03 +0000 (11:01 +0100)]
Merge pull request #4033 from owncloud/share_object
Add share manager and the share objects
Klaas Freitag [Fri, 30 Oct 2015 09:36:38 +0000 (10:36 +0100)]
Merge pull request #4040 from owncloud/phil-davis-changelog-master
ChangeLog typos that reverted in merge from 2.0
Roeland Jago Douma [Thu, 29 Oct 2015 20:47:47 +0000 (21:47 +0100)]
Use proper QFlags
Now the ShareTypes and Permissions are part of the Share class (which is
a bit better abstracted away).
Phil Davis [Thu, 29 Oct 2015 17:50:48 +0000 (23:35 +0545)]
ChangeLog typos that reverted in merge from 2.0
Hopefully the last place I need to submit this again :)
Roeland Jago Douma [Thu, 29 Oct 2015 15:56:23 +0000 (16:56 +0100)]
Act properly if OCS endpoint returned an error (OCS error)
For now pass it on to the gui. So at least they know something is wrong.
Olivier Goffart [Thu, 29 Oct 2015 15:43:30 +0000 (16:43 +0100)]
SyncEngine: Don't whipe the white list if the sync was aborted
Issue #4018
Olivier Goffart [Thu, 29 Oct 2015 14:01:29 +0000 (15:01 +0100)]
Discovery: conding style: use const references for function parameters
Klaas Freitag [Thu, 29 Oct 2015 15:34:15 +0000 (16:34 +0100)]
Merge branch '2.0'
Conflicts:
ChangeLog
Roeland Jago Douma [Thu, 29 Oct 2015 15:03:47 +0000 (16:03 +0100)]
Use QLatin1Char
Klaas Freitag [Thu, 29 Oct 2015 14:46:02 +0000 (15:46 +0100)]
Add version suffix git.
Klaas Freitag [Thu, 29 Oct 2015 14:44:56 +0000 (15:44 +0100)]
Merge branch '2.0.2' into 2.0
Conflicts:
ChangeLog
Roeland Jago Douma [Thu, 29 Oct 2015 13:27:49 +0000 (14:27 +0100)]
Shares do not have parents
Also some pointer cleanups
Roeland Jago Douma [Thu, 29 Oct 2015 13:00:28 +0000 (14:00 +0100)]
Proper foreach
Roeland Jago Douma [Thu, 29 Oct 2015 12:57:22 +0000 (13:57 +0100)]
Properly cleanup OCS jobs
Roeland Jago Douma [Thu, 29 Oct 2015 12:48:53 +0000 (13:48 +0100)]
Proper const usage
Roeland Jago Douma [Thu, 29 Oct 2015 12:39:29 +0000 (13:39 +0100)]
Fix typos
Roeland Jago Douma [Thu, 29 Oct 2015 12:31:36 +0000 (13:31 +0100)]
Make sure enforced passwords are properly respected
Fixes for old and new servers
Roeland Jago Douma [Thu, 29 Oct 2015 10:47:14 +0000 (11:47 +0100)]
Added getPublicUpload to LinkShare
so the gui does not have to know abou the internal permissions
Roeland Jago Douma [Thu, 29 Oct 2015 10:09:10 +0000 (11:09 +0100)]
Add share manager and the share objects
Klaas Freitag [Thu, 29 Oct 2015 14:37:31 +0000 (15:37 +0100)]
Revert "Config: Use monochrome icons per default on MacOSX."
This reverts commit
546cab3f6202393f58088b5edc7fa6d3fb538a44.
For OEMs this patch causes an empty tray icon set.
Olivier Goffart [Thu, 29 Oct 2015 13:33:29 +0000 (14:33 +0100)]
Quota: handle special negative value for the quota #3940
Don't show a progress bar if there is an unkown or unlimited total
Olivier Goffart [Thu, 29 Oct 2015 11:44:28 +0000 (12:44 +0100)]
Merge remote-tracking branch 'origin/2.0'
Olivier Goffart [Wed, 28 Oct 2015 12:25:49 +0000 (13:25 +0100)]
Propagator: Keep a meaningfull error with old server and invalid file names
We changed the discovery code not to ignore files whose filename contains
charachter invalid on windows. (Because newer versions of the server
supports them)
Servers older than 8.1 will just say "Bad Request" as an error and it's a
regression against previous client version. So keep nice error even with
older server.
Relates to #3736
Christian Kamm [Thu, 29 Oct 2015 10:59:11 +0000 (11:59 +0100)]
Hidden files: Consider .* hidden everywhere #4023
This seems to be the only place where we did this only on
non-windows OSes.
ckamm [Thu, 29 Oct 2015 09:40:24 +0000 (10:40 +0100)]
Merge pull request #3951 from ckamm/checksum
Checksums stored in database #3735
Christian Kamm [Thu, 29 Oct 2015 08:48:36 +0000 (09:48 +0100)]
--version also shows Qt version
That makes it much easier for people reporting bugs.
Christian Kamm [Thu, 29 Oct 2015 08:35:42 +0000 (09:35 +0100)]
Propagator: Add blacklisting of disk space errors #2939
Jenkins for ownCloud [Thu, 29 Oct 2015 06:18:59 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Wed, 28 Oct 2015 19:42:53 +0000 (20:42 +0100)]
State application name in update notification
Fixes #4020
Markus Goetz [Wed, 28 Oct 2015 16:03:47 +0000 (17:03 +0100)]
ChangeLog: Mention propagator removal
Christian Kamm [Wed, 28 Oct 2015 13:42:44 +0000 (14:42 +0100)]
Checksum: Don't lose it on metadata update #3735
Also improve tests.
Christian Kamm [Wed, 28 Oct 2015 13:22:29 +0000 (14:22 +0100)]
Checksum: Fixes after review
Christian Kamm [Wed, 28 Oct 2015 10:00:03 +0000 (11:00 +0100)]
Checksum: Put checksum type into separate column #3735
Olivier Goffart [Wed, 28 Oct 2015 12:24:57 +0000 (13:24 +0100)]
Fix Qt4 compilation
Markus Goetz [Wed, 28 Oct 2015 10:25:02 +0000 (11:25 +0100)]
sync-exclude.lst: More likely matching files first
Markus Goetz [Wed, 28 Oct 2015 10:18:44 +0000 (11:18 +0100)]
Exclude: Add .fuse_hidden #3999
No matter if we sync hidden files or not, those are files we should not sync
Markus Goetz [Wed, 28 Oct 2015 10:06:50 +0000 (11:06 +0100)]
Merge branch 'kill_legacy_propagator'
Markus Goetz [Wed, 28 Oct 2015 09:59:02 +0000 (10:59 +0100)]
legacy propagator: Remove more code
Christian Kamm [Wed, 28 Oct 2015 09:04:15 +0000 (10:04 +0100)]
csync tests: Remove unused function
Christian Kamm [Wed, 28 Oct 2015 08:59:33 +0000 (09:59 +0100)]
Checksum: Disallow ADLER32, use Adler32 #3735
Christian Kamm [Thu, 15 Oct 2015 07:54:01 +0000 (09:54 +0200)]
Checksum: Fix recomputation when forced in cfg file #3735
Don't recompute the checksum on each upload when the server does not
advertise supporting checksums.
Christian Kamm [Thu, 15 Oct 2015 07:39:49 +0000 (09:39 +0200)]
Checksum: Add env variables to disable #3735
Christian Kamm [Wed, 14 Oct 2015 13:45:44 +0000 (15:45 +0200)]
Propagate: Store computed checksums in db during upload #3735
Christian Kamm [Wed, 14 Oct 2015 13:29:27 +0000 (15:29 +0200)]
Propagate: On download store checksum header in db #3735
Christian Kamm [Wed, 14 Oct 2015 13:03:19 +0000 (15:03 +0200)]
SyncJournal: Add checksumHeader column to metadata table #3735
Christian Kamm [Wed, 14 Oct 2015 13:03:40 +0000 (15:03 +0200)]
Checksums: Improvement in async computation and validation #3735
Christian Kamm [Wed, 14 Oct 2015 11:41:51 +0000 (13:41 +0200)]
Revert "In case of empty checksum type, emit validated."
This reverts commit
b05ca526a46c8a306ccfb4aca0d5cf94881ba14f.
The checksum type setting should not matter for downloads.
Christian Kamm [Wed, 28 Oct 2015 08:53:54 +0000 (09:53 +0100)]
PropagateUpload: Fix double-emission of finished #3844
Christian Kamm [Wed, 28 Oct 2015 08:53:06 +0000 (09:53 +0100)]
Fix compile after pull request merge
It conflicted with the optimization in
f18b40f7e7890a659d20f1d3bbd3125a3089b612
Klaas Freitag [Wed, 28 Oct 2015 08:28:35 +0000 (09:28 +0100)]
Merge pull request #4004 from owncloud/fix_hidden_detection
Fix hidden detection
Olivier Goffart [Mon, 19 Oct 2015 16:53:36 +0000 (18:53 +0200)]
Folder Model: The item needs to be selectable for the currenIndex to appear selected
And we set the current index in AccountSettings::slotLinkActivated
Olivier Goffart [Mon, 19 Oct 2015 16:46:39 +0000 (18:46 +0200)]
Account Settings: A link should make sure all the parents are expanded
Klaas Freitag [Wed, 7 Oct 2015 15:59:33 +0000 (17:59 +0200)]
FolderStatusModel: Check for null argument at start.
Klaas Freitag [Wed, 7 Oct 2015 16:00:21 +0000 (18:00 +0200)]
AccountSettings: Display a link for undecided dirs in the sub text.
This only works in case the index is known. If not, no link is
shown, but we wait for the next update of the model.
Klaas Freitag [Mon, 5 Oct 2015 10:06:26 +0000 (12:06 +0200)]
AccountSettings: Add index to undecided folder to be able to select it.
Klaas Freitag [Tue, 1 Sep 2015 13:37:37 +0000 (15:37 +0200)]
Enable external links in the label.
Klaas Freitag [Tue, 1 Sep 2015 13:37:01 +0000 (15:37 +0200)]
Add slot to handle clicks on folder names.
Olivier Goffart [Tue, 27 Oct 2015 15:07:59 +0000 (16:07 +0100)]
IgnoreFiles: Fix the socket API would not load the new custom ignored files #3496
We did not flush or closed the file after having modified it from the UI.
So when the socket api was reloading it, it wouldn't be able to load
the newly added rules
Olivier Goffart [Tue, 27 Oct 2015 15:06:38 +0000 (16:06 +0100)]
SocketApi: Fix returning ignore for the root item all the time
Olivier Goffart [Tue, 27 Oct 2015 14:10:24 +0000 (15:10 +0100)]
Dolphin integration: fix error icons
Olivier Goffart [Tue, 27 Oct 2015 12:51:56 +0000 (13:51 +0100)]
FolderStatusModel: reset also if a folder was renamed #4011
Olivier Goffart [Tue, 27 Oct 2015 12:42:25 +0000 (13:42 +0100)]
Settings Dialog: don't put padding on the toolbar extension
Otherwise the extension just disapear with some styles (see Issue #3795)
Olivier Goffart [Tue, 27 Oct 2015 11:58:59 +0000 (12:58 +0100)]
Merge pull request #3997 from owncloud/phil-davis-patch-1
ChangeLog 2.0.2 minor typos for 2.0 branch
Olivier Goffart [Tue, 27 Oct 2015 11:52:33 +0000 (12:52 +0100)]
FolderDelegate: put the progressbar in place of the remote or local folder #3403 #3569
So the size of the delegate does not change
Olivier Goffart [Tue, 27 Oct 2015 11:12:21 +0000 (12:12 +0100)]
Use the term folder sync connection in more places #3757
Olivier Goffart [Tue, 27 Oct 2015 09:31:54 +0000 (10:31 +0100)]
AccountSettings: don't disable pause when offline (#4010)
Klaas Freitag [Mon, 26 Oct 2015 13:24:05 +0000 (14:24 +0100)]
Discovery: Fix detection of hidden files.
In the discovery phase we want to detect that dot-files are hidden
on Linux and Mac.
This fixes strange behaviour seen in issue #3980
Olivier Goffart [Mon, 26 Oct 2015 11:31:07 +0000 (12:31 +0100)]
Download: Soft errors for error while resuming (#4000)
Olivier Goffart [Mon, 26 Oct 2015 09:06:10 +0000 (10:06 +0100)]
SocketAPI: don't trim the command #3297
Jenkins for ownCloud [Sun, 25 Oct 2015 06:19:01 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 24 Oct 2015 06:18:59 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Fri, 23 Oct 2015 15:24:45 +0000 (17:24 +0200)]
Folder::wipe: We need to shut the socket API down before removing the DB
Because the DB stays open and locked.
Should fix #3824
Phil Davis [Fri, 23 Oct 2015 15:36:31 +0000 (21:21 +0545)]
ChangeLog 2.0.2 minor typos for 2.0 branch
These changes were committed to 2.0.2-rc1 branch https://github.com/owncloud/client/pull/3957/files https://github.com/owncloud/client/commit/
6da2139a1bc4069f1cd1dfb017502f089c3af26f but that branch was never merged up into 2.0 (or 2.0.2-rc2) so the changes never went anywhere.
These changes could also be applied on 2.0.2-rc2 and 2.0.2 branch for completeness - then they would be in every branch in which they have appeared.
Olivier Goffart [Fri, 23 Oct 2015 15:11:19 +0000 (17:11 +0200)]
SyncEngine: remove unused functions
Olivier Goffart [Fri, 23 Oct 2015 15:06:14 +0000 (17:06 +0200)]
Delete all files: make the 'Keep' on by default
On windows, we need to specify at least one AcceptRole.
Otherwise the DestructiveRole might become the default
Issue #3824
Olivier Goffart [Fri, 23 Oct 2015 14:19:40 +0000 (16:19 +0200)]
SettingsDialog: use QWidgetAction for the toolbar so the extension works
When the toolbar is full because there is no enough room, make the extension
of the toolbar work, by using QWidgetAction::createWidget instead of
QToolBar::insertWidget
There should not be prolem when the window is too narrow.
Relates #3832
Markus Goetz [Fri, 23 Oct 2015 13:36:01 +0000 (15:36 +0200)]
Merge pull request #3995 from owncloud/return-code-of-version-and-help
owncloudcmd: Make returncode 0 for --version and --help
Joas Schilling [Fri, 23 Oct 2015 13:17:29 +0000 (15:17 +0200)]
Make returncode 0 for --version and --help
Olivier Goffart [Fri, 23 Oct 2015 13:13:15 +0000 (15:13 +0200)]
FolderStatusModel: fix getting the size of the folder in the selective sync (#3986)
Regressed since
d610693af104e98f934878f228f6da57a2380fb2. The problem
is that the _size vector contains the pathToRemove and that it was removed
before.
Reorganize a bit the code so there is only one loop that has still all the
information.
Jenkins for ownCloud [Fri, 23 Oct 2015 06:19:00 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Thu, 22 Oct 2015 00:29:27 +0000 (02:29 +0200)]
csync_vio: reuse the information from readdir in stat
On unix we don't safe much (otherwise csync would have been
designed differently).
On windows however, the readdir already fetch all the info, so we
can as well use it.
We still have to query for the file id but we might optimize that later
Olivier Goffart [Thu, 22 Oct 2015 15:57:34 +0000 (17:57 +0200)]
Network Settings: Adjust the bandwidth limit option with old Qt
- Disable the whole group box
- Add a tooltip explaining why it is disabled
- Make sure it is disabled in the settings in case of upgrade
- Do a runtime check in case the running Qt is greater
Daniel Molkentin [Thu, 22 Oct 2015 14:20:59 +0000 (16:20 +0200)]
Revert "Settings dialog: remove the close button #3713"
This reverts commit
ebee6f0bc266bd68809a3f553bce14bde5116fdf.
Unix window managers do not have a reliable way of hinting buttons,
so we need the close button.
Olivier Goffart [Thu, 22 Oct 2015 10:31:52 +0000 (12:31 +0200)]
csync_exclude: Don't ignore invalid char client side (#3736)
If the server does not support it, then the server will reply with an error
Olivier Goffart [Thu, 22 Oct 2015 10:23:44 +0000 (12:23 +0200)]
test/CMakeLists.txt: remove comments
Jenkins for ownCloud [Thu, 22 Oct 2015 06:19:02 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Wed, 21 Oct 2015 23:13:35 +0000 (01:13 +0200)]
Folder: set csync verbosity to 0 if the Logger is not there
csync_log was still accounting for 8% of the local discovery (because
of vsnprintf and asprintf)
Olivier Goffart [Wed, 21 Oct 2015 22:20:13 +0000 (00:20 +0200)]
Logger: speedup the sync discovery when the log is innactive
The sync throw a lot of log message, and QDateTime::fromCurrentTime is
quite expensive. So don't call it if it's not needed.
Daniel Molkentin [Wed, 21 Oct 2015 16:49:58 +0000 (18:49 +0200)]
Merge remote-tracking branch 'origin/2.0'
Daniel Molkentin [Wed, 21 Oct 2015 16:49:38 +0000 (18:49 +0200)]
Merge pull request #3982 from owncloud/20-update
update 3-dot menu
Carla Schroder [Wed, 21 Oct 2015 16:44:38 +0000 (09:44 -0700)]
update 3-dot menu
Olivier Goffart [Wed, 21 Oct 2015 16:40:04 +0000 (18:40 +0200)]
Sharing: change coding style of enum
From all upper case to camel case
This hopefully fix the Windows build which fails because DELETE seems
to be a macro
Roeland Douma [Wed, 21 Oct 2015 14:55:59 +0000 (16:55 +0200)]
Merge pull request #3773 from owncloud/split_sharedialog
Split sharedialog code
Olivier Goffart [Wed, 21 Oct 2015 14:01:44 +0000 (16:01 +0200)]
SyncEngine: keep a static pointer to the codec
The QTextCodec for UTF-8 is not going to change during the application life time.
So no need to look it up for every file
Olivier Goffart [Wed, 21 Oct 2015 13:44:16 +0000 (15:44 +0200)]
csync_statedb: Use the index in csync_statedb_get_below_path
Make an index from the path, and make a query that uses the index
Olivier Goffart [Wed, 21 Oct 2015 12:17:30 +0000 (14:17 +0200)]
csync_update: Don't fetch the etag in the local discovery from the DB
We don't need it, and it's slow.
This saves a lot of DB queries
(Also replaced a strlen>0 with a faster check)
Markus Goetz [Wed, 21 Oct 2015 13:55:41 +0000 (15:55 +0200)]
sqlite: Update to version 3.9.1
For OS X and Windows.
This is in line with the tests/benchmarks Olivier is doing on ArchLinux.
Daniel Molkentin [Wed, 21 Oct 2015 07:54:02 +0000 (09:54 +0200)]
2.0.2 final
Daniel Molkentin [Wed, 21 Oct 2015 07:53:34 +0000 (09:53 +0200)]
Finalize ChangeLog, adjust formatting
Daniel Molkentin [Wed, 21 Oct 2015 07:48:18 +0000 (09:48 +0200)]
set version suffix back to git