Jenkins for ownCloud
054e557531
[tx-robot] updated from transifex
2014-12-04 02:06:11 -05:00
Jenkins for ownCloud
3020dc75ab
[tx-robot] updated from transifex
2014-12-04 01:25:22 -05:00
Klaas Freitag
9ea359de52
GUI: Check if there are sync folders configured and how proper msg.
...
This fixes #2264
2014-12-03 17:11:42 +01:00
Klaas Freitag
c5daf7d1b6
Mac installer: Make the installer background brandable for MacOSX.
2014-12-03 14:37:59 +01:00
Christian Kamm
b7d7f424c5
FolderMan: only touch _currentSyncFolder when done #2407
...
Also simplity terminateSyncProcess() to always terminate the
*current* sync run. Only one can be running at a time anyway.
2014-12-03 13:46:37 +01:00
Daniel Molkentin
e1fa6f1a0d
fix_frameworks is no longer required
...
This is taken care of by macdeployqt.py, which is
run during "make install"
2014-12-03 13:41:12 +01:00
Olivier Goffart
a23e0fef8d
Update binary submodule
2014-12-03 11:18:01 +01:00
Olivier Goffart
0fd0b08c09
Windows shell integration: Always release the lock before calling win32 API
...
May help for 2515
2014-12-03 09:11:38 +01:00
Jenkins for ownCloud
ce1690b450
[tx-robot] updated from transifex
2014-12-03 01:25:27 -05:00
Markus Goetz
46bd473664
Folders: Move ETag check scheduling to FolderMan
...
Only 1 check per time is able to run now.
For #2553
Might improve #2479 #2485 #2534
2014-12-02 22:32:54 +01:00
Daniel Molkentin
6030fec6cb
Fix typo
2014-12-02 15:08:15 +01:00
Daniel Molkentin
b7323dc403
Merge branch 'master' into rename_client
2014-12-02 14:33:28 +01:00
Daniel Molkentin
c6d74d6c12
Fix typo
2014-12-02 14:33:17 +01:00
Daniel Molkentin
a42709f814
Namespace fixes
2014-12-02 14:20:13 +01:00
Daniel Molkentin
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
Olivier Goffart
8fbb55a0c8
Wizard: Fix escaping of error message.
...
An url can contains % signs, so if it does, the errors formating was wrong
because of the use of QString::args
Also, the error is in html format, and we need to let the message box know
that, otherwise we will just see <br/>
2014-12-02 10:22:46 +01:00
Olivier Goffart
f046a7e7fe
Wizard: Attempts to really close the database when starting the backup
...
Still for issue #1989
2014-12-02 10:22:46 +01:00
Markus Goetz
92ce707268
Bandwidth: Fix issue with removed download jobs
...
The measuring broke when a job that is currently measuring was removed.
2014-12-02 09:37:48 +01:00
Daniel Molkentin
3f5887cc03
Merge pull request #2565 from owncloud/accountsettings_itemsontop
...
Refactor generic settings dialog
2014-12-01 15:01:45 +01:00
Olivier Goffart
fb3f5d86cf
Fix compilation after merge
2014-12-01 14:41:39 +01:00
Olivier Goffart
512492bf30
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/propagatedownload.cpp
2014-12-01 14:37:47 +01:00
Olivier Goffart
2477c3914e
csync_update: Ignore a difference of time of exactly one hour
...
Issue #2438
2014-12-01 13:53:30 +01:00
Daniel Molkentin
afee1ee1c0
Make all ptr-based members either const or check for their existance
2014-12-01 13:08:49 +01:00
Daniel Molkentin
f233593909
Add missing accounts icon
2014-12-01 13:07:44 +01:00
Olivier Goffart
3253cc38b2
Propagator upload: Mark error while opening the file as SoftError
...
Because otherwise a lot of error are shown to the user when
the user deletes a directory that is syncing
Task #1981
2014-12-01 12:22:52 +01:00
Olivier Goffart
b154e1baa1
Nautilus shell integration: Use fallback when XDG_RUNTIME_DIR is not defined
...
Same fallback as in Qt5
Task #2477
2014-12-01 12:06:09 +01:00
Daniel Molkentin
714599aeaa
Refactor generic settings dialog
...
- move items on top like on Mac OS (right is free for accounts now)
- The account icon no longer reflects the current status (in prep for multi-account)
2014-12-01 11:37:06 +01:00
Jenkins for ownCloud
119a9983a9
[tx-robot] updated from transifex
2014-11-30 01:25:22 -05:00
Jenkins for ownCloud
8866494c94
[tx-robot] updated from transifex
2014-11-29 02:06:10 -05:00
Jenkins for ownCloud
2e06b4be66
[tx-robot] updated from transifex
2014-11-29 01:25:23 -05:00
Jenkins for ownCloud
0ec2e71f58
[tx-robot] updated from transifex
2014-11-28 01:25:25 -05:00
Olivier Goffart
fc3a8b944e
Propagator: Don't forget to mark the direcotry as finished if its first job fails
...
Otherwise we would go ahead and propagate the content of the directory
2014-11-27 15:36:13 +01:00
Olivier Goffart
2ed2ef3b28
Propagator QNAM: Fix resuming
...
We forgot to account the fact that we could have been resuming when
comparing the size of the Content-lenght to the size of the temporary file
2014-11-27 14:50:49 +01:00
Markus Goetz
a3c5da90d2
Update issue_template.md
2014-11-27 13:10:14 +01:00
Olivier Goffart
e7e91b6931
Revert "Folder: Don't blindly trigger sync on first EtagJob result"
...
We need to do a sync even if the etag was empty because we do not know
if this is because the etag really changed or because it was new.
Also, some part of the code rely on this fact to schedule a sync.
The fact that there is two sync with 30 sec at the beginning is not
a big problem, because we also need to do the sync the put the directory
etag in the db.
This reverts commit 1c001ee138
.
2014-11-27 12:50:36 +01:00
Olivier Goffart
1f9d02e7fa
Shibboleth: Fix our implemtnation of CookieJar::deleteCookie
...
It was deleting too many cookies.
That function is virtual in Qt5 and is used when adding cookie.
But some Shibboleth have several cookies with the same name, and we need to keep them.
Our implementaiton was meant to delete all the shiboleth cookies when we want to log out
2014-11-27 12:26:59 +01:00
Markus Goetz
0895ca3e4a
Update issue_template.md
2014-11-27 12:09:06 +01:00
Jenkins for ownCloud
2ee70db7cd
[tx-robot] updated from transifex
2014-11-26 01:25:24 -05:00
Olivier Goffart
c9c1547813
Compile with Qt4
...
(QSharedPointer::reset is only in Qt5)
2014-11-25 16:24:47 +01:00
Olivier Goffart
9a8c868793
Propagator upload: Remove debug output
2014-11-25 15:34:06 +01:00
Olivier Goffart
13ec5da84e
neon jobs: Start them in their thread.
2014-11-25 15:08:32 +01:00
Klaas Freitag
3e34d000f2
Propagator: Add the chunk size to PUT requests.
2014-11-25 10:21:33 +01:00
Olivier Goffart
12203461f0
Import the dolphin plugin
2014-11-24 15:06:08 +01:00
Olivier Goffart
a337564864
shell_integration/windows/OCShellExtensions/OCUtilTest: remove
...
We do not need it anymore
2014-11-24 14:53:37 +01:00
Olivier Goffart
734db6f932
propagate Upload: Let the poll job count for a job
...
In order to avoid that there are many concurrent poll jobs that takes
all the QNAM channel and causes timeouts of queued jobs
2014-11-24 13:33:13 +01:00
Olivier Goffart
d76e3c0488
Parallel chunk upload: abort all chunks if one of them errors out
2014-11-24 12:05:25 +01:00
Olivier Goffart
c0de20dda0
UploadDevice: reduce debug verbosity
2014-11-24 12:05:25 +01:00
Markus Goetz
79c37f9fe4
Poll Jobs: Properly use DB index
...
Why do we sometimes use 0-based, sometimes 1-based indices?
2014-11-24 11:35:39 +01:00
Jenkins for ownCloud
7f520a6f28
[tx-robot] updated from transifex
2014-11-24 01:25:22 -05:00
Jenkins for ownCloud
23f72ecf7b
[tx-robot] updated from transifex
2014-11-23 01:25:22 -05:00