Jenkins for ownCloud
a0eb4b9c85
[tx-robot] updated from transifex
2015-10-07 01:15:35 -04:00
Klaas Freitag
cb3a301f2c
Merge pull request #3899 from sebasje/sebas/cmake
...
fix multiarch library path for Debian/Ubuntu
2015-10-06 15:36:43 +02:00
Klaas Freitag
6d6903ef62
Merge pull request #3919 from phil-davis/libsynctypos
...
libsync comment and message typos for master
2015-10-06 14:49:54 +02:00
Klaas Freitag
f5daf50dc4
Merge pull request #3920 from phil-davis/guitypos
...
GUI comment and message typos for master
2015-10-06 14:46:00 +02:00
Klaas Freitag
f6631443a1
Merge pull request #3922 from RealRancor/backport_3916_2.0
...
Backport #3916 to 2.0 - thanks
2015-10-06 14:42:40 +02:00
Jenkins for ownCloud
87ad4dd264
[tx-robot] updated from transifex
2015-10-06 02:18:57 -04:00
Jenkins for ownCloud
bb289f63f1
[tx-robot] updated from transifex
2015-10-06 01:15:38 -04:00
RealRancor
67a71ff10f
Backport #3916 to 2.0
2015-10-05 16:22:11 +02:00
Phil Davis
b8ccbbc72a
GUI comment and message typos for master
2015-10-05 10:06:19 +05:45
Phil Davis
f0e17fd9c0
libtypos comment and message typos for master
2015-10-05 09:05:09 +05:45
Klaas Freitag
b09f1d591c
Merge pull request #3916 from RealRancor/fix_rst_syntax
...
Fix linkname in architecture.rst.
2015-10-04 17:59:45 +02:00
Jenkins for ownCloud
6b1bfb4474
[tx-robot] updated from transifex
2015-10-04 02:18:56 -04:00
RealRancor
8fd2b8d829
Fix linkname in architecture.rst.
2015-10-03 21:42:23 +02:00
Jenkins for ownCloud
8158984ad6
[tx-robot] updated from transifex
2015-10-03 02:19:01 -04:00
Jenkins for ownCloud
7b61bcfe10
[tx-robot] updated from transifex
2015-10-03 01:15:41 -04:00
Christian Kamm
d610693af1
SelectiveSync: Apply excludes #3876
2015-10-02 15:56:39 +02:00
Christian Kamm
7d1886684e
FolderWatcher: Use csync exclude code #3805
...
Introduce a global ExcludedFiles instance to avoid loading the global
exclude lists several times.
One could still add per-folder exclude lists by checking these after
the global ones.
2015-10-02 15:56:39 +02:00
Christian Kamm
95fc792745
Tray: Change texts #3657
2015-10-02 15:48:44 +02:00
Christian Kamm
efefc2d986
Merge branch '2.0'
...
Conflicts:
doc/images/menu.png
doc/images/settings_network.png
2015-10-02 15:44:50 +02:00
Christian Kamm
9f8d109a7e
Network errors: Use exception name, if message is empty #2718
2015-10-02 15:25:34 +02:00
Christian Kamm
cf9e5ffb0b
Remove dead code
...
no_recursive_propfind does not exist anymore.
2015-10-02 15:17:19 +02:00
Christian Kamm
3cbd63a77a
Propagation: Try another sync on 423 Locked #3387
...
(cherry picked from commit 24c41ed0da
2015-10-02 14:49:38 +02:00
Christian Kamm
62eeed5201
Propagation: Make 423 Locked a soft error #3387
...
(cherry picked from commit 20ea9015ca
2015-10-02 14:49:30 +02:00
Christian Kamm
1383023b2e
Fix the Qt4 build.
2015-10-02 11:05:15 +02:00
Jenkins for ownCloud
9558822a7c
[tx-robot] updated from transifex
2015-10-02 02:19:01 -04:00
Klaas Freitag
afd081f40b
Settings: Move synclog widget to a seperate dialog.
...
This a first step to integrate the server activity view, see #3732
2015-10-01 16:57:37 +02:00
Christian Kamm
7bf31e56ab
Ignores: Sync after update #3876
2015-10-01 15:39:28 +02:00
Christian Kamm
3812fd0866
Checksums: Prepare 'supported checksums' capability #3735
...
It currently always returns the empty list and thus has no effect.
2015-10-01 15:00:33 +02:00
Christian Kamm
24c41ed0da
Propagation: Try another sync on 423 Locked #3387
2015-10-01 13:05:07 +02:00
Christian Kamm
36e8e9ebf5
Propagator: Download disk space checks #2939
...
* There's a critical 50 MB threshold under which syncs abort
(OWNCLOUD_CRITICAL_FREE_SPACE)
* The sync client always keeps 250 MB free
(OWNCLOUD_FREE_SPACE)
2015-10-01 12:59:05 +02:00
Christian Kamm
12dc372b21
Sync: An initial diskspace check #2939
...
* Before each sync, check that there are at least
250 MB of space available and abort otherwise.
* Can be overridden with OWNCLOUD_MIN_FREE_SPACE
2015-10-01 10:25:35 +02:00
Jenkins for ownCloud
d8c5e58fa1
[tx-robot] updated from transifex
2015-10-01 02:18:59 -04:00
Christian Kamm
20ea9015ca
Propagation: Make 423 Locked a soft error #3387
2015-09-30 14:00:53 +02:00
Klaas Freitag
0c148025a3
SyncLog Dialog WIP
2015-09-30 12:02:05 +02:00
Christian Kamm
d0c2ce276a
Application: Fix crash on early shutdown #3898
2015-09-30 11:40:33 +02:00
Jenkins for ownCloud
9e813c7dcf
[tx-robot] updated from transifex
2015-09-30 02:19:15 -04:00
Klaas Freitag
440687af21
AccountSettings: Disable context menu of sync folders when not connected.
...
This is the second part to fix #3860
2015-09-29 18:19:26 +02:00
Klaas Freitag
77a9b28e14
SetupWizard: Removed unused member variables.
2015-09-29 09:30:40 +02:00
Jenkins for ownCloud
f84654c9b3
[tx-robot] updated from transifex
2015-09-29 02:19:10 -04:00
Sebastian Kügler
a7cf1b04ad
Simplify creating the library path
...
Instead of checking whether the library path ends up somewhere in /usr,
set the architecture prefix, anyway. The library path mechanism is also
used in custom prefixes, without this change, the library gets installed
globally on Debian and Ubuntu, leading to non-standard behaviour and
cross-build problems, as multiple architecture builds of this library
can't be installed alongside each other.
This is the minimal change to correct this behaviour from upstream cmake.
2015-09-29 00:15:39 +02:00
Markus Goetz
641dece89a
Linux: Don't show settings dialog always when launched twice
...
For #3273 #3771 #3485
See also d503221b2e
2015-09-28 23:00:19 +02:00
RealRancor
2c9d418423
Fix registry key syntax in FAQ.
2015-09-27 20:38:53 +02:00
Daniel Molkentin
a08a90a718
Merge pull request #3892 from RealRancor/fix_faq
...
Fix registry key syntax in FAQ.
2015-09-27 20:38:13 +02:00
RealRancor
1cb518cb13
Fix registry key syntax in FAQ.
2015-09-27 20:19:06 +02:00
Jenkins for ownCloud
a897a1805e
[tx-robot] updated from transifex
2015-09-26 02:19:01 -04:00
Jenkins for ownCloud
fe88b48fb1
[tx-robot] updated from transifex
2015-09-26 01:15:34 -04:00
Markus Goetz
574c699382
GUI: Change tray menu order #3657
2015-09-26 00:25:06 +02:00
Klaas Freitag
7b97b96115
Merge pull request #3884 from owncloud/fix_3860
...
AccountSettings: Do not allow to expand folder list when disconnected.
2015-09-25 17:52:39 +02:00
Klaas Freitag
e7e0e5b57f
win32 vio: Add the OPEN_REPARSE_POINTS flag to the CreateFileW call.
...
Otherwise win32 api simply does not open reparse points at all,
such as junctions.
This will improve the user experience of #3813 as we now identify
the junctions as symlinks.... and ignore them properly.
2015-09-25 17:36:41 +02:00
Klaas Freitag
b72e2b146d
AccountSettings: only expand root elements on single click.
...
Also, toggle expanding on single click for root elements.
2015-09-25 13:57:44 +02:00
