Jenkins for ownCloud
b468767184
[tx-robot] updated from transifex
2015-11-25 01:15:38 -05:00
Markus Goetz
76ce9ff8c4
Activity List: Improve double click handling on filenames #4168
2015-11-24 14:25:16 +01:00
Christian Kamm
23ed68c8dd
Re-apply ee69ab2021
2015-11-24 13:45:02 +01:00
Christian Kamm
2982c79444
Settings: Fix "Choose what to sync" #4187
...
There was a duplicate connect() due to a merge problem (?) in
7e4c0bd515
2015-11-24 13:41:00 +01:00
Christian Kamm
7e56408331
SelectiveSync: Show Apply/Cancel less
...
Before the selective sync status text and apply/cancel buttons
were shown as soon as any folder was expanded. This changes it
to only show when the model is dirty (or a big folder confirmation
is needed).
This is nice because we auto-open the folder list sometimes
and having the apply/cancel buttons visible makes users think a
decision is needed.
2015-11-24 13:01:10 +01:00
Christian Kamm
bcfdcec3ee
Share dialog: Adjust layout #4119
2015-11-24 12:30:53 +01:00
Christian Kamm
f96d94f143
ShareDialog: Only link share if capabilities allow #4179
2015-11-24 11:58:10 +01:00
Christian Kamm
adea301e5b
Blacklist: Clear on successful chunk upload #3934
2015-11-24 10:09:55 +01:00
Christian Kamm
f9dc569b0a
Share dialog: Don't close on enter
...
Setting default=false was not enough.
2015-11-24 09:58:18 +01:00
Christian Kamm
f7932bb0c7
ShareDialog: Completion uses MatchContains #4123
...
For Qt 5.2.0+ only.
2015-11-24 09:10:26 +01:00
Jenkins for ownCloud
f20e052ad7
[tx-robot] updated from transifex
2015-11-24 02:19:20 -05:00
Jenkins for ownCloud
02daca9cb9
[tx-robot] updated from transifex
2015-11-24 01:15:44 -05:00
Markus Goetz
b52a3a415c
Connectivity: Improve reconnecting after network change/disconnect #4167
2015-11-23 21:48:26 +01:00
Markus Goetz
33dcb0c8d9
PropagateLocalRemove: Add debug
...
Was not in log so far
2015-11-23 21:48:25 +01:00
Markus Goetz
709da37be2
Activities: Only emit debug when actually refreshing
2015-11-23 21:48:25 +01:00
Christian Kamm
2458f07ca1
Checksums: Reuse the discovery checksum where possible
2015-11-23 14:13:10 +01:00
Christian Kamm
6cf5fc7f7d
Permissions: Keep more user permissions
...
t4.pl discovered that it'd needlessly override permissions sometimes
2015-11-23 13:24:05 +01:00
Christian Kamm
10db6cee6c
Rename files
2015-11-23 12:09:25 +01:00
Christian Kamm
3b7927366a
csync_update: Remove disabled inode check
2015-11-23 12:01:42 +01:00
Christian Kamm
a25f094c4c
Checksums: Don't reupload if size and checksum are unchanged #3235
...
* Compute the content checksum (in addition to the optional
transmission checksum) during upload (.eml files only)
* Add hook to compute and compare the checksum in csync_update
* Add content checksum to database, remove transmission checksum
2015-11-23 11:59:56 +01:00
Christian Kamm
bdf830f691
Add an experimental ProppatchJob #3235
2015-11-23 11:59:56 +01:00
Christian Kamm
bd72642a58
ShareLink: Always initialize expire date #4075
2015-11-23 09:42:16 +01:00
Jenkins for ownCloud
b3f5885a50
[tx-robot] updated from transifex
2015-11-23 02:18:23 -05:00
Jenkins for ownCloud
aa168ec8b9
[tx-robot] updated from transifex
2015-11-22 02:18:42 -05:00
Olivier Goffart
d89cb3e575
Dolphin plugin: build by default
2015-11-21 12:17:26 +01:00
Olivier Goffart
9e1f215f22
Dolphin plugin: build with QStringBuilder
2015-11-21 12:17:26 +01:00
Jenkins for ownCloud
ffd0b19660
[tx-robot] updated from transifex
2015-11-21 02:18:42 -05:00
Olivier Goffart
0020211857
owncloudcmd: Don't do a check that file are older than 2s ( #4160 )
...
This is required for the smashbox test to pass
2015-11-20 15:16:09 +01:00
Jenkins for ownCloud
1a59b4e208
[tx-robot] updated from transifex
2015-11-20 02:18:48 -05:00
Klaas Freitag
94e7c762bf
ActivityWidget: display if the server does not support acitivities.
...
If the server does not have the activities app enabled, it says so now.
Fix for #4163
2015-11-19 16:01:51 +01:00
Klaas Freitag
421c6a92f3
NetworkJobs: JSON network job now reports OCS reply code.
...
The signal jsonReceived() now not only delivers the raw json string, but
also the status code that came as OCS reply.
Also, fixed a typo in the signals name (recieved => received).
2015-11-19 16:01:51 +01:00
Olivier Goffart
d6aa667971
ShareDialog: remove the "Premissions" label and adjust the size of the scrollarea ( #3737 )
2015-11-19 12:32:50 +01:00
Olivier Goffart
575fc9acbd
ShareDialog: show an error if the sharing API is disabled ( #4126 )
2015-11-19 12:00:53 +01:00
Olivier Goffart
d581550130
Fix compilation warning
2015-11-19 10:50:52 +01:00
Olivier Goffart
952a134745
Sharing: document that the two Type enum are linked
2015-11-19 10:50:21 +01:00
Olivier Goffart
887aa952fe
ShareDialog: Keep default server permissions by default ( #4152 )
2015-11-19 10:49:39 +01:00
Jenkins for ownCloud
5f715a7af7
[tx-robot] updated from transifex
2015-11-19 02:19:06 -05:00
Klaas Freitag
eea982fb14
Merge pull request #4162 from owncloud/phil-davis-patch-1
...
tagLastSuccessfullETagRequest comment wording
2015-11-19 07:36:44 +01:00
Jenkins for ownCloud
5a7eebe16e
[tx-robot] updated from transifex
2015-11-19 01:15:40 -05:00
Phil Davis
55a96af7cc
tagLastSuccessfullETagRequest comment wording
...
Improve this to say what I think it means.
2015-11-19 11:02:15 +05:45
Klaas Freitag
8abaf92083
Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060
2015-11-18 17:00:19 +01:00
Klaas Freitag
b0c29d5c66
Merge pull request #4159 from owncloud/fix_3490
...
csync updater: Handle file firewall reply codes correctly: Ignore the files.
Fixes #3490
2015-11-18 16:55:53 +01:00
Olivier Goffart
41a6f6df84
FolderStatusModel: add hints for translators ( #4158 )
2015-11-18 16:35:11 +01:00
Olivier Goffart
4984da7e0d
Activity Widget: Fix runtime warning
...
Fix the warning:
QLayout: Attempting to add QLayout "" to OCC::ActivitySettings "", which already has a layout
It was caused because one layout was created with the wrong parent
2015-11-18 15:32:39 +01:00
Klaas Freitag
be88e5a2c3
csync_update: refactor a bit and remove redundant code.
2015-11-18 15:31:55 +01:00
Klaas Freitag
e7ad7d405c
csync_update: Add missing comment about 403 forbidden handling.
2015-11-18 15:31:55 +01:00
Klaas Freitag
62d26814b2
SyncEngine: Handle 403 Forbidden properly.
...
A 403 is a reply code sent from the file firewall to indicate that
this directory is forbidden to use for the user.
The patch handles it by setting the state to IGNORED.
This addresses #3490
2015-11-18 15:31:55 +01:00
Markus Goetz
f2d8143511
Activity View: Update only if visible and when becoming visible #4083
2015-11-18 15:25:29 +01:00
Markus Goetz
3c1a605f62
Connectivity: Also accept SyncEngine etag as received ETag
...
Avoids requests on startup.
For #3964
2015-11-18 14:51:28 +01:00
Klaas Freitag
300c1c2055
Merge remote-tracking branch 'origin/depclean' into 2.1
...
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
2015-11-18 14:43:41 +01:00