Klaas Freitag
|
5294f446a2
|
Merge branch 'master' of gitorious.org:owncloud/mirall
Conflicts:
src/mirall/owncloudinfo.cpp
src/mirall/owncloudsetupwizard.cpp
src/mirall/owncloudwizard.cpp
|
2012-08-24 11:16:58 +02:00 |
|
Jenkins for ownCloud
|
dd2ac61200
|
[tx-robot] updated from transifex
|
2012-08-24 02:03:36 +02:00 |
|
Jenkins for ownCloud
|
d2c7087395
|
[tx-robot] updated from transifex
|
2012-08-23 02:02:45 +02:00 |
|
Jenkins for ownCloud
|
6836732a5c
|
[tx-robot] updated from transifex
|
2012-08-22 16:25:50 +02:00 |
|
Jenkins for ownCloud
|
bd39fbeefd
|
[tx-robot] updated from transifex
|
2012-08-21 02:03:27 +02:00 |
|
Jenkins for ownCloud
|
d5570ab55e
|
[tx-robot] updated from transifex
|
2012-08-20 02:02:42 +02:00 |
|
Jenkins for ownCloud
|
e52b51b5d6
|
[tx-robot] updated from transifex
|
2012-08-19 02:03:13 +02:00 |
|
Jenkins for ownCloud
|
e6e0dd35a3
|
[tx-robot] updated from transifex
|
2012-08-18 02:03:05 +02:00 |
|
Klaas Freitag
|
d733aac0e8
|
Fix QLatin1String issues.
|
2012-08-17 18:13:17 +03:00 |
|
Klaas Freitag
|
a8296a6b6e
|
Removed unneeded win32 headers.
|
2012-08-17 18:00:03 +03:00 |
|
Klaas Freitag
|
094f791400
|
Removed unused file temporarydir.
|
2012-08-17 17:55:15 +03:00 |
|
Jenkins for ownCloud
|
6ff09ddfd7
|
[tx-robot] updated from transifex
|
2012-08-17 02:03:02 +02:00 |
|
Jenkins for ownCloud
|
6497ee701a
|
[tx-robot] updated from transifex
|
2012-08-16 02:04:24 +02:00 |
|
Klaas Freitag
|
3669b43332
|
Merge branch 'master' of gitorious.org:owncloud/mirall
|
2012-08-15 18:17:02 +03:00 |
|
Klaas Freitag
|
58d75e7bfe
|
Show pathes in platform specific notation
|
2012-08-15 18:16:44 +03:00 |
|
Jenkins for ownCloud
|
706b9e4e09
|
[tx-robot] updated from transifex
|
2012-08-15 02:04:21 +02:00 |
|
Klaas Freitag
|
dc54fa563f
|
Update to version 1.0.5 with Changelog entry.
|
2012-08-14 13:26:24 +03:00 |
|
Klaas Freitag
|
1b7ad22e2e
|
Fix setup dialog: Use https if checkbox is activated.
|
2012-08-14 13:23:06 +03:00 |
|
Klaas Freitag
|
e975ec6200
|
Merge branch 'master' of gitorious.org:owncloud/mirall
|
2012-08-14 12:23:45 +03:00 |
|
Jenkins for ownCloud
|
4e62abe542
|
[tx-robot] updated from transifex
|
2012-08-14 02:03:03 +02:00 |
|
Klaas Freitag
|
6b98958de6
|
Fatal error if svn2ico is missing.
|
2012-08-13 15:05:40 +03:00 |
|
Jenkins for ownCloud
|
3f360c7e7b
|
[tx-robot] updated from transifex
|
2012-08-13 02:02:27 +02:00 |
|
Thomas Mueller
|
2827a4724b
|
removing mirall_zh_CN.GB2312.ts as this file format is not supported and causes conflicts with mirall_zh_CN.ts
|
2012-08-12 23:47:51 +02:00 |
|
Jenkins for ownCloud
|
b9a7ce65a7
|
[tx-robot] updated from transifex
|
2012-08-12 23:33:05 +02:00 |
|
Thomas Mueller
|
6a69200ae7
|
transifex configuration added
|
2012-08-12 23:31:27 +02:00 |
|
Klaas Freitag
|
4012e3ff25
|
Updated translation list in installer template
|
2012-08-10 13:25:36 +03:00 |
|
Klaas Freitag
|
32a8866218
|
New translations added.
|
2012-08-10 12:22:30 +03:00 |
|
Klaas Freitag
|
ff7f20ec8e
|
updated changelog for version 1.0.4
|
2012-08-10 12:21:53 +03:00 |
|
Klaas Freitag
|
a34601f0ba
|
Updated translations german and russian.
|
2012-08-10 12:20:46 +03:00 |
|
Klaas Freitag
|
74c6c4e7c9
|
cleanups and improved error messaging on proxy problems.
|
2012-08-09 15:13:20 +03:00 |
|
Klaas Freitag
|
9e30fe4ea5
|
Do not stop syncing if local directories are write protected.
|
2012-08-09 12:12:54 +03:00 |
|
Klaas Freitag
|
d743f7f4b3
|
Fixed and cleaned redirect bug, make sync work again.
|
2012-08-08 23:11:07 +03:00 |
|
Klaas Freitag
|
8117b9802b
|
Connect ocInfo only if needed in ownCloud setup wizard.
|
2012-08-08 16:52:12 +03:00 |
|
Klaas Freitag
|
08d925a8fa
|
read proxy setting from cfg file rather than from Qt proxy object.
|
2012-08-08 16:48:21 +03:00 |
|
Klaas Freitag
|
58ca49c8bd
|
QLatin1String fix.
|
2012-08-08 16:47:56 +03:00 |
|
Klaas Freitag
|
aeb0499833
|
read proxy settings from config file rather than from Qt proxy obj.
|
2012-08-08 16:47:25 +03:00 |
|
Klaas Freitag
|
c4a6827ab3
|
Add libproxy dlls.
|
2012-08-08 16:46:00 +03:00 |
|
Klaas Freitag
|
01ec65441e
|
Merge branch 'master' of gitorious.org:owncloud/mirall
|
2012-08-06 17:44:53 +03:00 |
|
Klaas Freitag
|
80f2699c80
|
handle proxy port correctly.
|
2012-08-06 17:44:23 +03:00 |
|
Klaas Freitag
|
70838442c9
|
Fixed error handling on remote dir create.
|
2012-08-06 17:43:24 +03:00 |
|
Dominik Schmidt
|
5d6c9339f8
|
Disable not building in bundle mode on OSX. Unless someone tests that codepath, it's probably better not to allow anyone to build it especially not by default
|
2012-08-06 16:01:43 +02:00 |
|
Klaas Freitag
|
d694525d8f
|
Simplify loading of the exclude file on various platforms.
|
2012-08-06 16:13:35 +03:00 |
|
Klaas Freitag
|
c916f5cbd9
|
connect owncloudinfo signals more selective.
|
2012-08-06 15:00:22 +03:00 |
|
Klaas Freitag
|
83bda2c8d5
|
handle HTTP status 301 -> redirect.
|
2012-08-06 14:59:59 +03:00 |
|
Klaas Freitag
|
a00086759e
|
connect the owncloudinfo signals more selective.
|
2012-08-06 14:59:18 +03:00 |
|
Klaas Freitag
|
4b869cfb10
|
do not write CA Certs on its own, use methods in mirallconfigfile.
|
2012-08-06 14:58:24 +03:00 |
|
Klaas Freitag
|
f5717348f8
|
QLatin1String fix
|
2012-08-06 14:58:11 +03:00 |
|
Klaas Freitag
|
4cad29331f
|
- set ownCloudUrl and known CA Certs.
|
2012-08-06 14:57:26 +03:00 |
|
Klaas Freitag
|
54c2368dbb
|
Push version to upcoming version 1.0.4
|
2012-08-06 14:54:47 +03:00 |
|
Klaas Freitag
|
84a588ccf0
|
Fix signal connection and initialize the dialog pointer to zero.
|
2012-08-06 11:13:26 +03:00 |
|