Markus Goetz [Tue, 12 May 2015 15:10:53 +0000 (17:10 +0200)]
Propagator: Mention name of conflict file (for debugging)
Markus Goetz [Tue, 12 May 2015 14:26:04 +0000 (16:26 +0200)]
tx.pl: Use HTTP Keep-Alive
Olivier Goffart [Tue, 12 May 2015 14:35:27 +0000 (16:35 +0200)]
BandwidthManager: fix warnings
Unused variables
Olivier Goffart [Tue, 12 May 2015 14:32:00 +0000 (16:32 +0200)]
csync walk tree: Try to find the 'other_node' in the source directory in case of renames
This fixes t2.pl
Jenkins for ownCloud [Tue, 12 May 2015 06:18:49 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Mon, 11 May 2015 14:07:34 +0000 (16:07 +0200)]
Bandwidth Manager: Comment out qDebug
We have not received any grave bug reports for it, not needed anymore.
Markus Goetz [Mon, 11 May 2015 13:41:56 +0000 (15:41 +0200)]
Propagator: Limit length of temporary file name #2789 (fixup)
Fix
22c35c4d15d31ab6fca3dfe4949ae807182bc481
Klaas Freitag [Mon, 11 May 2015 11:35:04 +0000 (13:35 +0200)]
Application: ifdef lock file issue as it only happens on Qt>5.1
However, the fix breaks Qt4 compile, so it needs to be ifdefed.
Not viel hilft viel.
Jenkins for ownCloud [Mon, 11 May 2015 06:18:44 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 10 May 2015 06:18:49 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 9 May 2015 06:18:53 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Fri, 8 May 2015 14:41:41 +0000 (16:41 +0200)]
Propagator: Limit length of temporary file name #2789
Christian Kamm [Fri, 8 May 2015 12:53:38 +0000 (14:53 +0200)]
ShareDialog: Password ui fixes. #3189
* Change the textedit-empty text to be just "Password"
* Hide the 'Copy link' button when the share isn't created yet
* Show the checked and disabled 'Password required' checkbox
when a password is required.
Christian Kamm [Fri, 8 May 2015 12:02:44 +0000 (14:02 +0200)]
Fix startup hang by removing QSettings lock file. #3175
In some situations the .lock file would stay around and
cause subsequent starts of the client to get stuck before
showing the ui.
Christian Kamm [Fri, 8 May 2015 08:17:21 +0000 (10:17 +0200)]
Wizard: Allow SSL cert dialog to show twice. #3168
Normally we never ask twice for the same url, but in the setup wizard
it makes sense to do so.
Christian Kamm [Thu, 7 May 2015 12:10:28 +0000 (14:10 +0200)]
ProtocolWidget: Fix rename message. #3210
For remote renames that are replicated locally the _file member is
overwritten by the target file name when the new entry is added to
the metadata table. Using _originalFile here guarantees that
the affected local file is mentioned.
Jenkins for ownCloud [Fri, 8 May 2015 06:18:56 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Thu, 7 May 2015 15:19:14 +0000 (17:19 +0200)]
Discovery: Test better, treat invalid hrefs as error #3176
Jocelyn Turcotte [Thu, 7 May 2015 12:46:00 +0000 (14:46 +0200)]
Fix the Qt4 build
Following
a6500d80686b7b04aa0a9fbf2a3c084b99dda488
Qt4's moc doesn't expand macros and wouldn't evaluate QT_VERSION_CHECK.
Christian Kamm [Thu, 7 May 2015 09:41:29 +0000 (11:41 +0200)]
Propagator: Overwrite local data only if unchanged. #3156
Christian Kamm [Thu, 7 May 2015 08:23:39 +0000 (10:23 +0200)]
ShareDialog: Improve error reporting for share API fails.
This would have made debugging #3204 and #3136 easier.
Markus Goetz [Tue, 5 May 2015 16:48:57 +0000 (18:48 +0200)]
Updater on OS X: Only allow if in /Applications #2931
Markus Goetz [Tue, 5 May 2015 14:30:57 +0000 (16:30 +0200)]
Wizard: Fix lock icon #1447
Klaas Freitag [Thu, 7 May 2015 07:52:36 +0000 (09:52 +0200)]
Merge pull request #3208 from owncloud/dev/gcc5
Compile with GCC 5 - thanks for the pr
Christian Kamm [Fri, 24 Apr 2015 09:32:47 +0000 (11:32 +0200)]
AccountState: Treat *any* 503 as a temporary error. #3113
Jenkins for ownCloud [Thu, 7 May 2015 06:18:55 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Hefee [Wed, 6 May 2015 23:15:55 +0000 (01:15 +0200)]
Compile with GCC 5
this fixes the error and makes complete oCC compile with GCC 5.
error: ISO C does not support '__FUNCTION__' predefined identifier
[-Wpedantic]
According to the porting guide:
The fix is either to use the standard predefined identifier __func__
(since C99), or to use the __extension__ keyword.
Jocelyn Turcotte [Wed, 6 May 2015 10:54:18 +0000 (12:54 +0200)]
shell_integration on OSX: Avoid too many RETRIEVE_FILE_STATUS following UPDATE_VIEW #3122
Do not request the status of all entries in the cache. Instead force Finder
to request the ones that it deems necessary by keeping the old statuses
in a separate dictionary which are only used while the new status arrives.
Jocelyn Turcotte [Wed, 6 May 2015 10:50:53 +0000 (12:50 +0200)]
shell_integration on OSX: Do not fill the cache with unsolicited statuses #3122
Jocelyn Turcotte [Wed, 6 May 2015 10:49:04 +0000 (12:49 +0200)]
shell_integration on OSX: Remove dead code
removeIcons isn't called and clearFileNameCacheForPath was always
called with a "nil" path.
Remove the return value of askForIcon which was always 0, and use
that value explicitly at the only call site.
Remove the "-1" code path in iconByPath since setIcons prevents
-1 from getting into _fileNamesCache in all cases.
Jocelyn Turcotte [Tue, 5 May 2015 13:01:40 +0000 (15:01 +0200)]
Don't hardcode the source directory in deploy.sh
Jocelyn Turcotte [Mon, 27 Apr 2015 13:04:44 +0000 (15:04 +0200)]
Work around the Qt PUT corruption bug with Qt < 5.4.2 #2425
Since QNonContiguousByteDeviceThreadForwardImpl::reset will
call UploadDevice::reset with a BlockingQueuedConnection, this
allows us to reset the HTTP channel along with its buffers
before they get the chance to be reused with a subsequent request.
Jocelyn Turcotte [Tue, 5 May 2015 09:24:01 +0000 (11:24 +0200)]
shell_integration on Windows: Avoid too many RETRIEVE_FILE_STATUS following UPDATE_VIEW #3122
Do not request the status of all entries in the cache. Instead force
explorer to request the ones that it deems necessary by keeping the old
statuses in a separate dictionary which are only used while the new status
arrives.
Jocelyn Turcotte [Wed, 6 May 2015 13:51:41 +0000 (15:51 +0200)]
shell_integration on Windows: Don't fill the cache with unsolicited statuses #3122
Only keep the status updates if explorer is going to display it.
Klaas Freitag [Wed, 6 May 2015 09:43:58 +0000 (11:43 +0200)]
Changelog: Clearify changelog entries.
Daniel Molkentin [Wed, 6 May 2015 09:25:04 +0000 (11:25 +0200)]
Update Changelog
Daniel Molkentin [Wed, 6 May 2015 09:20:16 +0000 (11:20 +0200)]
Disable setSslConfiguration calls for older Qt version
This is only required for client certs, which currently have
no GUI anyway and are experimental.
Daniel Molkentin [Wed, 6 May 2015 08:51:11 +0000 (10:51 +0200)]
1.8.1 final
Christian Kamm [Wed, 6 May 2015 07:34:45 +0000 (09:34 +0200)]
IgnoreListEditor: Remove invalid connect. #3201
This has been around ever since the ignore editor was
added and the slot never existed.
Markus Goetz [Tue, 5 May 2015 15:06:28 +0000 (17:06 +0200)]
SyncEngine: Fix accidental re-discovery because of broken version table
Bug had been triggered by
d63abef718ebab0717c496dca11a9ad363bf6965
Broken version table in there since some time it seems like.
Jenkins for ownCloud [Tue, 5 May 2015 06:18:50 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Mon, 4 May 2015 11:43:56 +0000 (13:43 +0200)]
1.8.0 RC2
Klaas Freitag [Mon, 4 May 2015 10:14:35 +0000 (12:14 +0200)]
SyncEngine: Handle upgrade case from 1.8.0
If 1.8.0 caused missing data in the local tree, this patch gets it
back. For that, the usage of the journal for remote repository is
disabled at the first start.
Jenkins for ownCloud [Mon, 4 May 2015 06:18:49 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 3 May 2015 06:18:47 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 2 May 2015 06:18:47 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 1 May 2015 06:18:22 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 30 Apr 2015 07:27:54 +0000 (03:27 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Wed, 29 Apr 2015 12:54:08 +0000 (14:54 +0200)]
Proxy: Register meta type #3170
Jenkins for ownCloud [Wed, 29 Apr 2015 06:18:49 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Klaas Freitag [Mon, 27 Apr 2015 09:58:56 +0000 (11:58 +0200)]
Updated version tag rc1
Klaas Freitag [Mon, 27 Apr 2015 09:58:18 +0000 (11:58 +0200)]
Updated changelog for 1.8.1
Jenkins for ownCloud [Mon, 27 Apr 2015 06:18:46 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 26 Apr 2015 06:18:48 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 25 Apr 2015 06:18:46 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Fri, 24 Apr 2015 18:44:38 +0000 (11:44 -0700)]
Update owncloudcmd.rst
Carla Schroder [Fri, 24 Apr 2015 18:34:20 +0000 (11:34 -0700)]
update owncloud and owncloudcmd docs
Conflicts:
doc/owncloudcmd.rst
Carla Schroder [Fri, 24 Apr 2015 17:03:51 +0000 (10:03 -0700)]
Update autoupdate.rst
Carla Schroder [Fri, 24 Apr 2015 17:03:06 +0000 (10:03 -0700)]
Update introduction.rst
Carla Schroder [Fri, 24 Apr 2015 16:56:17 +0000 (09:56 -0700)]
Merge pull request #3160 from owncloud/blockoldclient
add more warning that 1.7 clients and older are blocked
Carla Schroder [Fri, 24 Apr 2015 16:54:05 +0000 (09:54 -0700)]
add more warning that 1.7 clients and older are blocked
Christian Kamm [Fri, 24 Apr 2015 13:20:13 +0000 (15:20 +0200)]
AccountWizard: Fix auth error handling. #3155
The problem was that on network error the networkError() and
finishedWithError() signals both fired. To fix it, I collapse all
error handing into a slot triggered by finishedWithError().
I tested the redirection case and the invalid credentials case.
Jenkins for ownCloud [Fri, 24 Apr 2015 06:18:46 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Thu, 23 Apr 2015 14:15:13 +0000 (16:15 +0200)]
Discovery: Fix another empty-local-directory bug
Markus Goetz [Thu, 23 Apr 2015 11:29:28 +0000 (13:29 +0200)]
Folder: Clear _syncResult better
I had a situation here where we were showing stale desktop notifications when a remote folder
errored out and then sync finished with _syncResult data from previous sync.
Jenkins for ownCloud [Thu, 23 Apr 2015 06:18:48 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Christian Kamm [Wed, 22 Apr 2015 12:45:01 +0000 (14:45 +0200)]
Windows: Fix rename of finished file. #3073
The file was still open and therefore couldn't be renamed...
Jenkins for ownCloud [Wed, 22 Apr 2015 06:18:36 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 22 Apr 2015 05:15:19 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Tue, 21 Apr 2015 20:05:09 +0000 (13:05 -0700)]
note that linux users need password manager
Carla Schroder [Tue, 21 Apr 2015 19:58:22 +0000 (12:58 -0700)]
Merge pull request #3139 from owncloud/updates
add note to restart windows after update
Carla Schroder [Tue, 21 Apr 2015 17:10:16 +0000 (10:10 -0700)]
add note to restart windows after update
Daniel Molkentin [Tue, 21 Apr 2015 13:42:51 +0000 (15:42 +0200)]
create_mac_pkg.sh.cmake: increase space-in-filename resiliance
Markus Goetz [Tue, 21 Apr 2015 08:33:21 +0000 (10:33 +0200)]
ShareDialog: Unused/invalid forward declaration
Jenkins for ownCloud [Tue, 21 Apr 2015 06:18:33 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Mon, 20 Apr 2015 07:46:43 +0000 (09:46 +0200)]
More change to compile with 5.5
The problem is again that QStringList no longer include QDataStream
Jenkins for ownCloud [Mon, 20 Apr 2015 06:18:49 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Sun, 19 Apr 2015 09:01:47 +0000 (11:01 +0200)]
Fix compilation with Qt 5.5
Because of commit
90e7cc172a7521396bb2d49720ee4ceb9a9390b3 in qtbase,
we now need to explicitly include QDataStream
Fixes #2809
Jenkins for ownCloud [Sun, 19 Apr 2015 06:18:31 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 18 Apr 2015 06:18:24 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Fri, 17 Apr 2015 11:22:19 +0000 (13:22 +0200)]
Mac OS: The Resource/ folder in Qt frameworks might not exist
Make sure to create it
Daniel Molkentin [Fri, 17 Apr 2015 10:49:41 +0000 (12:49 +0200)]
Remove wrongly-commited file
Jenkins for ownCloud [Fri, 17 Apr 2015 10:49:42 +0000 (06:49 -0400)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Fri, 17 Apr 2015 10:30:54 +0000 (12:30 +0200)]
Prevent another crash in ~SocketApi #3118
Since the QLocalServer parent of the QLocalSockets gets destroyed
after the _listeners QList, onLostConnection might try to update
an already destroyed list.
Fix the issue by simply making sure that _localServer is destroyed
first.
Olivier Goffart [Fri, 17 Apr 2015 10:18:09 +0000 (12:18 +0200)]
HTTP creds: Fix translation of the password input dialog
tr() needs Q_OBJECT
Daniel Molkentin [Fri, 17 Apr 2015 08:16:09 +0000 (10:16 +0200)]
Merge pull request #3126 from owncloud/equal_user_agents
Use identical User Agents for csync and the Qt parts
Jenkins for ownCloud [Fri, 17 Apr 2015 06:18:43 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Thu, 16 Apr 2015 18:56:00 +0000 (20:56 +0200)]
Use identical User Agents for csync and the Qt parts
Also, use the mirall version for ocsync.
Currently, the csync engine part and the Qt part have different UAs,
and this makes debugging (i.e. reading access logs) difficult. On
top, we haven't increased the ocsync version number in ages. So
as a consequence, I think it would be the best to have ocsync
and the rest share the same version number, and make them identify
with the same user agent.
To ease debugging for our side, we'll still append "(csyncoC)"
for calls made by csync.
Daniel Molkentin [Thu, 16 Apr 2015 14:33:36 +0000 (16:33 +0200)]
OS X: Actually Make the signing script fail on failure
Addresses #3114
Daniel Molkentin [Thu, 16 Apr 2015 14:28:34 +0000 (16:28 +0200)]
Fix mac deployment again
Olivier Goffart [Thu, 16 Apr 2015 09:21:39 +0000 (11:21 +0200)]
Propagate download: Fix restoring files for which the conflict file exists
For issue #3106
1) Always use the actual timestamp from the file in the file system
to create the conflict file. This is important because if one edit a
file several time, they should have different name. Also it makes more
sens to have the mtime of the modified file.
2) Give the correct size to the job so we know when the temporary file
is complete in case of resuming.
Jenkins for ownCloud [Thu, 16 Apr 2015 06:18:36 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Wed, 15 Apr 2015 13:31:47 +0000 (15:31 +0200)]
PropagateDownload: Read the mtime from the file system after writing it
Because file system like FAT only have two second accuracy and would result
in a upload if the mtime in the database is not the same as the one that was
downloaded
Issue #3103
Daniel Molkentin [Wed, 15 Apr 2015 13:33:17 +0000 (15:33 +0200)]
1.8.1 beta 1
Markus Goetz [Wed, 15 Apr 2015 12:58:27 +0000 (14:58 +0200)]
ConfigFile: Remove unused functions
Markus Goetz [Wed, 15 Apr 2015 10:31:08 +0000 (12:31 +0200)]
Translations: Attempt two for Serbian #3083
Jenkins for ownCloud [Wed, 15 Apr 2015 06:18:35 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Tue, 14 Apr 2015 18:00:42 +0000 (20:00 +0200)]
Sort folder sizes SelectiveSyncTreeView numerically
Fixes #3112
Markus Goetz [Tue, 14 Apr 2015 12:56:25 +0000 (14:56 +0200)]
LsColXMLParser: More testing 2
Markus Goetz [Tue, 14 Apr 2015 12:41:48 +0000 (14:41 +0200)]
LsColXMLParser: More testing