Jenkins for ownCloud
d3662d0e34
[tx-robot] updated from transifex
2014-10-31 01:25:27 -04:00
Markus Goetz
cf6219bb6f
NetworkJobs: Improve timeout handling and increase timeout by 5 sec
2014-10-30 11:54:58 +01:00
Christian Kamm
45eeb5065f
Download: Avoid overwriting file with case conflict. #1914
2014-10-30 09:06:53 +01:00
Jenkins for ownCloud
f563eb1f63
[tx-robot] updated from transifex
2014-10-30 01:25:30 -04:00
Carla Schroder
2c1f31cecb
Update autoupdate.rst
...
Corrected configuration file location
2014-10-29 09:56:17 -07:00
Klaas Freitag
ef16c409ef
Merge pull request #2393 from svkurowski/issue-2215
...
Switch monochrome systray icon color depending on systray brightness
2014-10-29 14:54:33 +01:00
Klaas Freitag
1029f9521c
tests: exit t5.pl if running against ownCloud 6
...
t5.pl checks the environment variable SERVER_VERSION and if that equals
"owncloud6" it bails out after a check of the sharing ocs api.
2014-10-29 14:24:36 +01:00
Klaas Freitag
825eca078d
tests: make t1.pl work on jenkins, for that disable a size compare.
2014-10-29 14:01:58 +01:00
Olivier Goffart
1eccfb798f
Add missing license headers
...
Part of #2068
2014-10-29 13:30:46 +01:00
Klaas Freitag
b9b9f3c136
Propagator: Schedule a resync immediately if file is modified during upload
2014-10-29 13:10:56 +01:00
Olivier Goffart
7810da51a8
Propagator: report error when deleting directories
...
Will help to understand why a directory cannot be removed
Will help for #2348
2014-10-29 12:23:48 +01:00
Olivier Goffart
a470138450
Windows Shell Integration: refresh the cache on UPDATE_VIEW
...
Attempt to fix #2383
2014-10-29 11:00:51 +01:00
Christian Kamm
4e20a02fe5
SyncJournalDB: Add filesize column to metadata.
...
* Alter table to include column.
* Make get/set in SyncJournalDB store and load it.
* Make csync recover the stat_t's size member from it.
2014-10-29 09:53:36 +01:00
Markus Goetz
7bad731ad2
CheckServerJob: Guard again null reply
...
Lucia had reported a crash in this function
2014-10-29 09:38:20 +01:00
Jenkins for ownCloud
eeb54290b3
[tx-robot] updated from transifex
2014-10-29 01:25:27 -04:00
Daniel Molkentin
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
Carla Schroder
94be12b9e4
Merge branch 'updater' of https://github.com/owncloud/mirall into updater
2014-10-28 15:01:34 -07:00
Carla Schroder
1862fb77ff
Correct Linux section on disabling update notifications
2014-10-28 14:57:18 -07:00
Markus Goetz
782463589e
ownSql: Also mention filename
2014-10-28 21:50:09 +01:00
Markus Goetz
ff570c4a6b
ownSql: Don't set busy timeout on bad object
2014-10-28 21:46:30 +01:00
Carla Schroder
06b619f0ed
Update autoupdate.rst
...
Typo correction
2014-10-28 12:19:05 -07:00
Carla Schroder
f5cc6cfd07
Fix typos and clean up wording
2014-10-28 11:56:49 -07:00
Carla Schroder
0f5cf00e35
Update The Automatic Updater manual page with current information
2014-10-28 11:52:58 -07:00
Klaas Freitag
105ff694f2
SyncEngine: Handle 503 condition as soft error to properly handle etags.
...
Otherwise the ETags could be removed from the db and cause file
deletes.
2014-10-28 17:13:21 +01:00
Jenkins for ownCloud
26ff6be63c
[tx-robot] updated from transifex
2014-10-28 01:25:42 -04:00
Daniel Molkentin
47e3da9ebf
Merge pull request #2414 from owncloud/fix_2365
...
Doc: Fix build documentation, adjust it to 1.7.
2014-10-27 16:15:14 -04:00
Daniel Molkentin
b7ce5ba82a
Doc: Fix build documentation, adjust it to 1.7.
...
Fixes #2365
2014-10-27 16:14:32 -04:00
Olivier Goffart
5723abe6eb
Merge remote-tracking branch 'origin/fix_service_unavailable' into 1.7
2014-10-27 20:49:46 +01:00
Daniel Molkentin
95a9b0427c
doc: Fix markup in build.rst
2014-10-27 14:54:23 -04:00
Klaas Freitag
0692fea9d8
discovery: handle 503 reply code from server for directories
...
503 for directories means that the dir is a mounted directory from an
external mount which currently is not available. The directory is
ignored and not traversed into during discovery phase.
2014-10-27 19:21:12 +01:00
Markus Goetz
b0882a5cd2
Fix compile
2014-10-27 17:18:49 +01:00
Markus Goetz
4c1a0005e6
Make two more asserts usable in nondebug
2014-10-27 16:01:18 +01:00
Markus Goetz
05ceed926c
SyncEngine: Log for an assert, return -1 for nondebug compile
2014-10-27 15:52:17 +01:00
Klaas Freitag
b691521662
tests: Fix CSync Journal test, use real CSYNC struct from csync_private.
...
This fixes bug #2396
2014-10-27 13:15:33 +01:00
Olivier Goffart
ce300d88ee
Wizard: show the choice to start a clean sync if the directory exist even on new accounts
...
Task #2406
2014-10-27 13:05:17 +01:00
Brandon Coleman
05c0249672
correct spelling on user is empty error.
2014-10-27 07:59:31 -04:00
Brandon Coleman
2498c13078
options are required at the beginning of owncloudcmd.
...
Conflicts:
src/owncloudcmd/owncloudcmd.cpp
2014-10-27 07:59:31 -04:00
Klaas Freitag
ab5dae741a
Show GIT SHA sum in cmake output.
2014-10-27 11:54:22 +01:00
Olivier Goffart
cddad94e45
Selective Sync: change the label text
...
to specify that the files will be removed from the local folder
Task #2404
2014-10-27 11:33:25 +01:00
Jenkins for ownCloud
2f0a40c1c8
[tx-robot] updated from transifex
2014-10-27 01:25:20 -04:00
Daniel Molkentin
24b07aaaef
Merge pull request #2402 from metrix78/spelling
...
correct spelling on user is empty error.
2014-10-26 21:52:03 -04:00
Brandon Coleman
ece1100d65
options are required at the beginning of owncloudcmd.
2014-10-26 15:33:50 -05:00
Jenkins for ownCloud
3b1ff5bf41
[tx-robot] updated from transifex
2014-10-26 01:25:20 -04:00
Brandon Coleman
e5b03634ae
correct spelling on user is empty error.
2014-10-25 11:01:58 -05:00
Daniel Molkentin
1bd1c61c3c
Merge pull request #2399 from r2evans/patch-1
...
add 64-bit windows registry location
2014-10-25 10:31:04 -04:00
r2evans
9cd81d87b2
add 64-bit windows registry location
2014-10-25 07:25:18 -07:00
Jenkins for ownCloud
59efea1b0e
[tx-robot] updated from transifex
2014-10-25 01:25:22 -04:00
Sascha Vincent Kurowski
59f18583d1
Switch monochrome systray icon color depending on systray brightness.
...
https://github.com/owncloud/mirall/issues/2215
As of version 10.10 Yosemite, Mac OS X offers the user the option to use
a dark version of the dock and menu bar. The systray icon was black even
on the dark menu bar, thus rendering it nearly impossible to spot.
2014-10-24 21:52:41 +02:00
Daniel Molkentin
d0b40bab47
Merge pull request #2391 from owncloud/ignore_windows_reserved_characters
...
Ignore reserved words on Windows
2014-10-24 15:39:21 -04:00
Daniel Molkentin
d76192cce1
Ignore reserved words on Windows
...
Fixes #2385 and #2386
2014-10-24 13:18:57 -04:00
