Olivier Goffart
ebee52ea8a
Merge branch '1.5'
2014-01-09 12:32:08 +01:00
Jenkins for ownCloud
78b1d3c347
[tx-robot] updated from transifex
2014-01-09 02:06:59 -05:00
Mr. Jenkins
bf4f6d78b8
[tx-robot] updated from transifex
2014-01-09 01:26:14 -05:00
Klaas Freitag
e5804b5d12
Use a more Qt'ish folder recursing method, remove unused class.
...
Added unit test.
2014-01-08 14:36:42 +01:00
Klaas Freitag
e5d43c2b9c
Add a utility function to write a random file.
2014-01-08 14:36:42 +01:00
Klaas Freitag
a522cebf0c
Add missing switch case.
2014-01-08 14:36:42 +01:00
Olivier Goffart
1bc4089d95
Fix hiding temporary files on windows
...
tmpFileName is a relative path, and we need an absolute path to
pass to the function that hides the files
2014-01-08 13:33:16 +01:00
Olivier Goffart
d931e0bcc2
Test that permissions are kept
...
(issue #820 )
2014-01-08 13:19:28 +01:00
Olivier Goffart
b7b06a8795
Preserve the permission of the file we download
...
Related to issue #820
2014-01-08 13:17:35 +01:00
Olivier Goffart
b8090a134d
Add test for issue 1329
2014-01-08 12:55:58 +01:00
Olivier Goffart
4006e490f3
Do not write the removed folder on the DB
...
Should fix #1329
2014-01-08 12:51:42 +01:00
Daniel Molkentin
f37f5ccf69
Display version in Mac OS Bundle again
2014-01-08 11:15:28 +01:00
Jenkins for ownCloud
4e2b2274a4
[tx-robot] updated from transifex
2014-01-08 02:07:00 -05:00
Mr. Jenkins
1d6d915bd2
[tx-robot] updated from transifex
2014-01-08 01:26:12 -05:00
Klaas Freitag
273463daf4
Fix progress for the case that the source file changes during upload.
...
If the source file changes, the overall transmission size is not longer
correct. Fixed that by pushing the change over the previously calculated
size to csyncthread. Also set the mtime and size in the item object in
propagator to avoid doublicate uploading.
2014-01-07 15:42:21 +01:00
Klaas Freitag
7da84dbe44
Check on timer member is zero.
2014-01-07 10:30:41 +01:00
Jenkins for ownCloud
24644164ca
[tx-robot] updated from transifex
2014-01-07 02:07:16 -05:00
Mr. Jenkins
474c63fb8f
[tx-robot] updated from transifex
2014-01-07 01:26:31 -05:00
Jenkins for ownCloud
3a1a3f7282
[tx-robot] updated from transifex
2014-01-06 02:07:16 -05:00
Mr. Jenkins
a80ed93e76
[tx-robot] updated from transifex
2014-01-06 01:26:44 -05:00
Mr. Jenkins
91ecbb25f2
[tx-robot] updated from transifex
2014-01-04 01:26:32 -05:00
Mr. Jenkins
4e9198ddc6
[tx-robot] updated from transifex
2014-01-02 01:26:56 -05:00
Olivier Goffart
b022209356
Merge pull request #1323 from scop/master
...
Don't discard user CXXFLAGS, append to them instead.
2013-12-31 06:47:19 -08:00
Mr. Jenkins
2cc3cbe522
[tx-robot] updated from transifex
2013-12-31 01:26:15 -05:00
hefee
4e0496f74d
respect XDG_CONFIG_HOME for getting user config dir.
...
Under linux the XDG Base Directory Specification define different
enviroment variables where to store what.
2013-12-31 02:10:44 +01:00
Jenkins for ownCloud
c3ecc5b224
[tx-robot] updated from transifex
2013-12-30 02:06:58 -05:00
Ville Skyttä
1c9a4784c7
Don't discard user CXXFLAGS, append to them instead.
2013-12-30 00:30:48 +02:00
Jenkins for ownCloud
9f1d89e330
[tx-robot] updated from transifex
2013-12-29 02:06:59 -05:00
Mr. Jenkins
b7ce760b65
[tx-robot] updated from transifex
2013-12-29 01:26:15 -05:00
Jenkins for ownCloud
27ce6cc6fe
[tx-robot] updated from transifex
2013-12-28 02:07:01 -05:00
Mr. Jenkins
134a34183f
[tx-robot] updated from transifex
2013-12-28 01:26:13 -05:00
Mr. Jenkins
b0ded64de6
[tx-robot] updated from transifex
2013-12-27 01:26:13 -05:00
Jenkins for ownCloud
9745248c81
[tx-robot] updated from transifex
2013-12-26 02:06:59 -05:00
Mr. Jenkins
fcbfd7fdc4
[tx-robot] updated from transifex
2013-12-26 01:26:14 -05:00
Jenkins for ownCloud
02461f7ff7
[tx-robot] updated from transifex
2013-12-25 02:06:58 -05:00
Jenkins for ownCloud
26c8dbf14c
[tx-robot] updated from transifex
2013-12-24 02:06:58 -05:00
Mr. Jenkins
1f6e355b4b
[tx-robot] updated from transifex
2013-12-24 01:26:12 -05:00
Mr. Jenkins
c6e0a18a5c
[tx-robot] updated from transifex
2013-12-22 01:26:47 -05:00
Daniel Molkentin
c9c56ee55a
Merge pull request #1313 from csware/close-button
...
Close dialog if button was clicked not just pressed
2013-12-21 00:09:11 -08:00
Jenkins for ownCloud
22bcda65ce
[tx-robot] updated from transifex
2013-12-21 02:07:31 -05:00
Mr. Jenkins
b896f6a434
[tx-robot] updated from transifex
2013-12-21 01:26:54 -05:00
Sven Strickroth
8743be6f11
Close dialog if button was clicked not just pressed
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-12-21 03:36:43 +01:00
Klaas Freitag
38cc564aed
Show proper sync status in tray, incl. Pause status.
2013-12-20 15:16:52 +01:00
dragotin
8b9a8ebeaf
Merge pull request #1308 from owncloud/fix-installer-fallbacl-en-1.5
...
fixes #1305 - thanks very much @deepdiver1975
2013-12-20 03:11:22 -08:00
Thomas Müller
900397c05e
fixes #1305
...
Installer will fallback to English in case there are no translations available for the current system language
2013-12-20 10:02:30 +01:00
Mr. Jenkins
cd9e3d27c3
[tx-robot] updated from transifex
2013-12-20 01:26:39 -05:00
Klaas Freitag
72b479c1e0
Added proxy support to owncloudcmd.
2013-12-19 16:48:10 +01:00
Klaas Freitag
d17be6f1ff
Do the neon ssl initialization.
...
This fixes bug #1298 and also probably #1297 . More tests needed.
2013-12-19 13:33:31 +01:00
Jenkins for ownCloud
1df295cb32
[tx-robot] updated from transifex
2013-12-19 02:07:19 -05:00
Mr. Jenkins
d3dba72ef9
[tx-robot] updated from transifex
2013-12-19 01:26:30 -05:00
