Olivier Goffart
a61a780c2a
Merge pull request #3388 from owncloud/hardlinks
...
csync: Do not ignore hard links anymore
2015-07-01 14:27:48 +02:00
Olivier Goffart
575ca50aac
csync: Do not ignore hard links anymore
...
There is no reason to ignore them. Downloading a file that is hardlinked
will break the link.
Will solve syncing NTFS directories #3241
2015-07-01 13:05:08 +02:00
Olivier Goffart
4a541a9ab4
Merge remote-tracking branch 'origin/maser'
2015-06-30 13:52:38 +02:00
Olivier Goffart
ec5894ef7a
Fix Qt4 build
2015-06-30 11:29:59 +02:00
Daniel Molkentin
c4bc1da171
Merge pull request #3380 from owncloud/doxygenify
...
Structure developer documentation
2015-06-29 18:57:23 +02:00
Daniel Molkentin
66e8aaeabc
Use doxygen style everywhere
2015-06-29 18:56:09 +02:00
Daniel Molkentin
eff4daa00b
Merge remote-tracking branch 'origin/master' into doxygenify
...
Conflicts:
src/gui/quotainfo.h
2015-06-29 18:45:55 +02:00
Daniel Molkentin
0735aa1fbd
Structure developer documentation
...
- rename target "doc-dev"
- group into modules
- move to doc/dev
2015-06-29 18:43:21 +02:00
Olivier Goffart
076f8ea105
Merge pull request #3097 from owncloud/translatable-remaining-time
...
make the remaining time string translatable and support plural forms
2015-06-29 18:30:44 +02:00
Markus Goetz
ef1e6add4f
Settings: Auto download bandwidth limit #1485
2015-06-29 17:43:25 +02:00
Olivier Goffart
ec3fc50e0e
FolderMan: store folders in a QMap instead of a QHash so they are kept in order
...
Issue #1529
2015-06-29 15:49:47 +02:00
Markus Goetz
360a0eeee1
OS X overlays deploy.sh: Update output
2015-06-29 15:16:43 +02:00
Olivier Goffart
7a324ff25b
Utility: improve the function to conver a duration to string
...
- Make it translatable
- Make use of the %n so that it supports plurals (but this will only
take effect if we have an english translation)
- Only put two units. eg: "5 years 7 months" instead of
"5 years 7 months 12 days 34 minutes 23 seconds"
Even when it is "2 hours 23 minutes" the amount of second does not
matter, especially since the estimation is likely to be boggus anyway
Issues #2672 and #3097
2015-06-29 14:59:28 +02:00
Olivier Goffart
389faa4bcb
Merge pull request #3378 from owncloud/quota-only-when-ui-visible
...
QuotaInfo: only request the quota when the UI is visible
2015-06-29 10:56:52 +02:00
Olivier Goffart
23ccaa2821
QuotaInfo: add a comment about long running job
...
To document the change made two commits ago
2015-06-29 10:57:32 +02:00
Olivier Goffart
51c10de672
QuotaInfo: make sure that we always check the quota every 30 seconds
2015-06-26 18:04:27 +02:00
Olivier Goffart
84fdc8c6c0
Merge remote-tracking branch 'origin/1.8'
2015-06-26 17:54:35 +02:00
Olivier Goffart
516509b4ed
csync_statedb: fix leak
...
Spotted by coverity (CID 98061)
2015-06-26 17:01:43 +02:00
Olivier Goffart
236951d9b3
QuotaInfo: allow only one job at the same time
2015-06-26 16:58:34 +02:00
Olivier Goffart
e7d7646151
QuotaInfo: only request the quota when the UI is visible
2015-06-26 15:43:19 +02:00
Olivier Goffart
7757886ebc
SystemTray menu: remove the quota information
...
It makes no sens anymore with multi account and users will see it
from the dialog anyway.
2015-06-26 13:32:02 +02:00
Olivier Goffart
61a1a0bb2d
PropfindJob: fix a debug output message
...
Prpfind job can be used for more than getting the quota
2015-06-26 13:32:02 +02:00
Christian Kamm
77941b5ba7
IgnoreEditor: Make UI more explicit. #3172
...
People were mistaking the checkbox for something that enables
and disables specific ignore patterns. Now it's much more
explicit.
2015-06-26 10:46:13 +02:00
Christian Kamm
10aaf18129
FolderMan: Make folderSyncStateChange() signal reliable. #3354
2015-06-26 10:09:03 +02:00
Daniel Molkentin
f4c816f378
Implement doxygen supoort to create developer documentation
...
Fixes #3371
2015-06-25 16:50:30 +02:00
Olivier Goffart
7332afa171
Fix Qt4 build
...
QTRY_VERIFY was private API in Qt4
2015-06-25 14:39:48 +02:00
Olivier Goffart
db87d2a18e
QuotaJob: remove and use a PropfindJob instead
...
This remove code duplication because the QuotaJob was just a duplication
of the propfind jobs with the properties hardcoded.
2015-06-25 14:39:48 +02:00
Olivier Goffart
d7555cc14e
Test for transchecksumvalidator: Do not use arbitrary waiting time
...
Just stop the loop when we have the result.
This will hopefully fix the jenkins build
2015-06-25 12:45:09 +02:00
Olivier Goffart
29fecb029e
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
src/gui/accountsettings.cpp
src/gui/accountsettings.h
2015-06-25 12:30:52 +02:00
Jenkins for ownCloud
13a15a6256
[tx-robot] updated from transifex
2015-06-25 02:18:56 -04:00
Olivier Goffart
494f08de8c
Theme: add a non-inline destructor
...
That way we do not need to include QIcon in theme.h
So the header can be included (indirrectly) from cmd.cpp
which is not compiled with the QtGui include paths
2015-06-24 10:14:55 +02:00
Jenkins for ownCloud
678b6affa2
[tx-robot] updated from transifex
2015-06-24 02:18:58 -04:00
Klaas Freitag
1fa5fa91a8
Added removal of *.tmp to Changelog.
2015-06-23 14:31:06 +02:00
Klaas Freitag
fc99070b54
Revert "Exclude *.tmp (as requested in #2424 )"
...
Too many people complained about that the entry can not be removed
if this should be synced. Users that want that one be synced please
add it to the user exclude list.
This reverts commit 5860e5a46b
2015-06-23 14:08:46 +02:00
Markus Goetz
4d21800a05
Merge pull request #3365 from owncloud/LukasReschke-patch-1
...
Add CI job state
2015-06-23 11:26:39 +02:00
Lukas Reschke
e3278c8312
Add CI job state
2015-06-23 11:07:27 +02:00
Jenkins for ownCloud
eca3d48510
[tx-robot] updated from transifex
2015-06-23 02:19:02 -04:00
Olivier Goffart
c56cb2235c
Missing EXPORT macro
2015-06-23 00:53:32 +02:00
Daniel Molkentin
bf9bb26d19
Bump to 1.8.3 final
2015-06-22 16:28:35 +02:00
Jocelyn Turcotte
18efc5eb65
shell_i: Add a way to fail the build if the signing key doesn't match
...
This tries to catch error at build time instead of having
to check the OS X console for errors afterward.
2015-06-22 13:55:19 +02:00
Jocelyn Turcotte
9797782682
shell_i: Build the extension with the '-' identity by default
...
This allows developers to build and run the extension by default.
Official packages bundles will be re-signed after the build, we
The SocketApi prefix can be set at configure time through cmake and
should match the key that will be used to sign the whole .app bundle
(including the embedded FindexSync .appex bundle).
2015-06-22 13:55:19 +02:00
Jocelyn Turcotte
121577340a
shell_i: Cleanup and build fix
...
Don't use absolute paths for resources
2015-06-22 13:55:19 +02:00
Daniel Molkentin
01efba99af
Bump to 1.8.3rc3, update ChangeLog
2015-06-22 08:44:29 +02:00
Jenkins for ownCloud
6e469662d3
[tx-robot] updated from transifex
2015-06-22 02:18:53 -04:00
Jenkins for ownCloud
4bc94c17ea
[tx-robot] updated from transifex
2015-06-21 02:18:54 -04:00
Jenkins for ownCloud
1820d4018e
[tx-robot] updated from transifex
2015-06-20 02:19:01 -04:00
Jocelyn Turcotte
0320627263
shell_i: Use a more specific name for ContentManager
...
Since we use that class to lookup the NSBundle using bundleForClass
use a more specific name to avoid any clash with any othe liferay
extension. I couldn't figure out from the documentation if that is
only resolved using the class name, but found some warnings on
stackoverflow and better be safe than sorry for what it costs.
2015-06-19 16:50:11 +02:00
Christian Kamm
f130a2716e
Update: Check exclusion when reading from db. #3172
2015-06-19 14:58:47 +02:00
Christian Kamm
deb5e68e15
Ignores: Force a remote discovery after ignore list change #3172
...
The problem was that the modified ignore pattern was not applied
to the parts of the remote tree we simply retrieve from the db
because the folder etag didn't change.
Even worse, if one removed an ignore pattern, the un-ignored
files would not be synced correctly.
With this change, a modification to the ignore list always results
in a full remote discovery. This guarantees that we find un-ignored
files.
2015-06-19 14:58:47 +02:00
Jocelyn Turcotte
9a9897ea1e
Shibboleth: Let the webview use its own QNAM #3359
...
Since we periodically recreatet the QNAM owned by the Account,
the web view could end up holding a dangling pointer to it.
Let the web view use its own QNAM, but make sure that the cookie
jars are shared so that we can grab the session token given
by the server.
2015-06-19 12:33:11 +02:00
