Klaas Freitag
a6987ad703
Mac overlays: Fix allocations, use icns, correct query type.
2014-08-01 10:59:49 +02:00
Klaas Freitag
5642e40bc8
Mac Overlays: Add icon containers 1.st part
2014-08-01 10:59:48 +02:00
Mackie Messer
50d178feaa
MacOSX shell integration code plus icons.
2014-08-01 10:59:48 +02:00
Klaas Freitag
753aa9132e
Merge pull request #2013 from owncloud/fix-man-dir-16
...
Fix issue#2004 -- mandir must be man1, not man
2014-07-30 17:38:25 +02:00
Daniel Molkentin
8d71328192
Windows Overlay Icons
2014-07-30 17:20:55 +02:00
Olivier Goffart
cfdfd6a860
wizard: don't call initializePage
...
It is called automatically by QWizard and do not need to be called explicitly
But setVisibla(false) don't really have an effect there since show() is going
to be called on the page
2014-07-30 12:36:30 +02:00
Jenkins for ownCloud
17b320f7dc
[tx-robot] updated from transifex
2014-07-30 01:25:24 -04:00
Olivier Goffart
8df14ee845
Long running put: fix some bugs
2014-07-29 22:56:36 +02:00
Jürgen Weigert
0c9d57228d
Fix issue#2004 -- mandir must be man1, not man
2014-07-29 18:29:55 +02:00
Olivier Goffart
550d6d66d1
Long Running Put: Better error reporting
2014-07-29 15:51:22 +02:00
Olivier Goffart
f1ad82d0ba
t2.pl Fix the test testing that moving a file that was just added do not create duplicate
2014-07-29 13:58:21 +02:00
Jenkins for ownCloud
2fb283749c
[tx-robot] updated from transifex
2014-07-29 01:25:24 -04:00
Olivier Goffart
7480d34742
Long Running Put: store into the database so they can be resumed at startup
2014-07-28 15:37:37 +02:00
Olivier Goffart
5254c9785c
shibboleth: Fix connection when the URL do not have a path
...
When the url do not have a path (for example: "http://example.com " as
opposed to "http://example.com/ "), its path is not a prefix of the
root path of the cookie (usually '/')
By adding the dav path, we make sure the URL has a path.
This made a bug when the owncloud url was just a domain name and did not
have a path
2014-07-28 13:50:24 +02:00
Klaas Freitag
0f37484b8a
Bumped the release number to 1.6.2, Changelog additions.
2014-07-28 11:44:10 +02:00
Jenkins for ownCloud
5a4c023fc9
[tx-robot] updated from transifex
2014-07-28 02:06:11 -04:00
Jenkins for ownCloud
e8afac3a01
[tx-robot] updated from transifex
2014-07-28 01:25:19 -04:00
Jenkins for ownCloud
6284517dc9
[tx-robot] updated from transifex
2014-07-27 01:25:21 -04:00
Jenkins for ownCloud
80c096b6f1
[tx-robot] updated from transifex
2014-07-26 01:25:23 -04:00
Olivier Goffart
04cc513bbd
Poll for long running PUT: WIP
...
Some PUT, may take a long time on the server to process (for example, the
last chunk). It may take more time that the timeout.
So in that case the server may reply with an url that we can poll for the etag
This patch is still work in progress
2014-07-25 13:30:48 +02:00
Markus Goetz
f004d5085d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
2014-07-25 12:37:27 +02:00
Klaas Freitag
98e21ae0ad
SocketAPI: Connect REGISTER_FOLDER to Foldermans events.
2014-07-25 12:20:38 +02:00
Klaas Freitag
00274722ce
nautilus plugin: Adopted to latest socket api changes.
2014-07-25 12:11:21 +02:00
Klaas Freitag
8b93678e3d
SocketAPI: Added REGISTER_PATH and UNREGISTER_PATH
...
to inform the plugins about the top sync directories.
Also cleaned the code a bit.
2014-07-25 12:11:21 +02:00
Olivier Goffart
3d0c009719
propagator_qnam: Limit the HTTP buffer size when downloading
...
Otherwise the buffer might fill up too quickly and get too large and consume
too much memory which could lead to crash in extreme cases
Should fix issue #1974
2014-07-24 15:43:28 +02:00
dark-eye
1b3ec955b1
Merge pull request #2000 from dark-eye/fix_folder_status_ui_ignore_new_line_inoverall_text
...
Fix folder status ui ignore new line inoverall text
2014-07-24 12:52:15 +03:00
Olivier Goffart
208011f6ab
propagator_qnam: add debug output in cae the file changed localy
...
In order to debug https://github.com/owncloud/core/issues/9781
2014-07-24 11:17:59 +02:00
Daniel Molkentin
f84e0010ee
NSIS: ICU rebumped to 5.3 as per build service change
2014-07-24 10:07:46 +02:00
Klaas Freitag
c97f46d403
Bump version to 1.6.2 rc2 plus Changelog
2014-07-24 09:58:23 +02:00
Jenkins for ownCloud
5356898efc
[tx-robot] updated from transifex
2014-07-24 01:25:23 -04:00
Klaas Freitag
1fb52f0d8b
HTTPCreds: Do delete the WritePasswordJob to not leak memory.
2014-07-23 17:59:02 +02:00
Klaas Freitag
d4de024f15
Propagator: Fix local file name clash detection.
...
Need to normalize the output of QFileInfo::canonicalFilePath() before
comparing to a server side path.
See https://bugreports.qt-project.org/browse/QTBUG-39622
This fixes #1998 and #1999
2014-07-23 17:56:46 +02:00
Olivier Goffart
1d9d88ca85
Always use the dummy crendential while trying to determine the credentials
...
Otherwise the SHibbolethCredential may be set and it has hook to intercept 401
This should fix issue #1908
2014-07-23 14:38:50 +02:00
Eran
2ca8805cda
Removed uneed code
2014-07-23 15:09:28 +03:00
Eran
8e5c41e6f3
Merge https://github.com/owncloud/mirall into fix_folder_status_ui_ignore_new_line_inoverall_text
2014-07-23 13:53:05 +03:00
Eran
0f7efbc22e
fixed bug where the overall text caused in the folder view the to defrom
2014-07-23 13:52:02 +03:00
Jenkins for ownCloud
6b7bd07c97
[tx-robot] updated from transifex
2014-07-23 01:25:21 -04:00
Klaas Freitag
8d85516e72
tx.pl: Add a chunking update test, test for precondition failed.
2014-07-22 18:07:34 +02:00
Klaas Freitag
0f4cf74ae0
SyncEngine: allow to do a post upgrade script in debug mode.
2014-07-22 18:07:02 +02:00
Klaas Freitag
4dfe0fad7d
tests: Big file chunking, change an existing big file to trigger update
...
This failed on oC7
2014-07-22 10:45:03 +02:00
Jenkins for ownCloud
2e91ea8093
[tx-robot] updated from transifex
2014-07-22 01:25:22 -04:00
Klaas Freitag
77e3480b2f
csync oC Util: set field flag correctly to avoid etag memleak.
...
The fields varialbe should contain or'ed flags of the fields set
in the csync_vio_file_stat_t struct. The problem was that the field
for CSYNC_VIO_FILE_STAT_FIELDS_PERM was assigned rather than or'ed
which makes the release function for the struct not freeing the
etag memory => memleak.
2014-07-21 13:19:36 +02:00
Jenkins for ownCloud
bca1ef42fc
[tx-robot] updated from transifex
2014-07-21 01:25:21 -04:00
Jenkins for ownCloud
010ab7119e
[tx-robot] updated from transifex
2014-07-20 01:25:22 -04:00
Jenkins for ownCloud
3cb93510ac
[tx-robot] updated from transifex
2014-07-19 01:25:30 -04:00
Olivier Goffart
8a88ca6f34
Merge branch 'il'
...
Conflicts:
src/mirall/propagator_legacy.h
2014-07-18 17:00:38 +02:00
Olivier Goffart
81d786733d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/propagator_qnam.cpp
src/mirall/propagator_qnam.h
2014-07-18 16:59:29 +02:00
Olivier Goffart
336e74b992
csync_owncloud: fix the name of the permissions property
2014-07-18 16:52:04 +02:00
Olivier Goffart
beb9300b4e
network limit: Never wait more than 10 seconds
...
When using the "Limit automatically" limit, we wait for 25% of the time
it took to upload something.
However, if we go to sleep while uploading, the time it took to upload may take
days. And waiting for 25% of a day is too long.
So never wait for more than 10 seconds
This may be related to issue #1880
2014-07-18 12:27:02 +02:00
Klaas Freitag
74b3e2ce3f
tests: Another try to get around the jenkins test problem.
2014-07-18 12:20:14 +02:00