Daniel Molkentin
72f3b5457e
Use HTTPS for update check
2012-10-09 17:46:41 +02:00
Daniel Molkentin
e45dfdb3b2
Dirty qnam/proxy export is no longer required
2012-10-09 17:19:09 +02:00
Daniel Molkentin
19a4f8fc64
_accessManager is already initialized in the ctor
2012-10-09 17:15:46 +02:00
Daniel Molkentin
a8d6c083e3
Make code more readable.
2012-10-09 10:10:41 +02:00
Daniel Molkentin
861a66f8cb
Make PAC work on Windows
2012-10-09 03:08:39 +02:00
Daniel Molkentin
3db60b4fe7
Massive simplification of proxy support.
...
Purposefully separated from last commit, but
associated with it: No more need for special
cases after libocsync got fixed do adhere properly.
2012-10-09 02:35:08 +02:00
Daniel Molkentin
c93721258e
Working PAC support
...
This goes along with e0f02c in csync/dav.
2012-10-09 02:35:08 +02:00
Jenkins for ownCloud
088a6412b1
[tx-robot] updated from transifex
2012-10-09 02:10:53 +02:00
Daniel Molkentin
6459f574cc
Prepare for Mac package signing.
2012-10-09 01:40:43 +02:00
Daniel Molkentin
fdfafb6e70
NSI: add proper version of ocsync.conf
2012-10-09 01:40:43 +02:00
Klaas Freitag
48d5261ba7
Use Max instead of Min of course
2012-10-08 20:43:16 +02:00
Klaas Freitag
23c598a907
Only replace the scheme at the beginning of string
2012-10-08 16:21:18 +02:00
Daniel Molkentin
d7b94c7f96
Use HttpProxy instead of Socks5Proxy.
2012-10-08 11:08:01 +02:00
Jenkins for ownCloud
3b5bc2c13f
[tx-robot] updated from transifex
2012-10-07 02:10:33 +02:00
Jenkins for ownCloud
0b885b3cb4
[tx-robot] updated from transifex
2012-10-06 02:10:14 +02:00
Klaas Freitag
20a875a682
Fix SYCCONFIGDIR => SYSCONFDIR.
2012-10-05 23:01:43 +02:00
Daniel Molkentin
34b8c39878
Quick hack: do not crash on windows when pausing sync
2012-10-05 22:53:42 +02:00
Klaas Freitag
a646f72980
Merge branch 'master' of github.com:owncloud/mirall
2012-10-05 22:47:54 +02:00
Klaas Freitag
aa56d1ebea
Fix SYSCONFIGDIR install of the sync-exclude file.
2012-10-05 22:47:08 +02:00
Daniel Molkentin
0ee938ac9b
Prepend slash to remote folder
2012-10-05 22:42:35 +02:00
Klaas Freitag
06b2e1f645
Simplify url string from textfield to avoid unwanted spaces.
2012-10-05 22:33:16 +02:00
Klaas Freitag
7e1c58b602
Fix include path search.
2012-10-05 17:13:23 +02:00
Klaas Freitag
e0a21ebfd6
Fix to find the header even from installed ocsync packages.
2012-10-05 17:02:39 +02:00
Daniel Molkentin
06a1cfe642
Anther fix for sync pausing
2012-10-05 12:59:58 +02:00
Daniel Molkentin
cb6d056a1f
Don't hardcode packag name on Mac
2012-10-05 12:18:45 +02:00
Daniel Molkentin
ae93e2aa10
Fix OS X bundle generation
2012-10-05 11:59:50 +02:00
Daniel Molkentin
7d52884699
Fix cmake for windows wrt libocsync renaming
2012-10-05 12:10:33 +04:00
Klaas Freitag
1442b4d42c
Merge branch 'master' of github.com:owncloud/mirall
2012-10-05 10:03:50 +02:00
Klaas Freitag
736a8dc457
fixed name of the csync owncloud module.
2012-10-05 10:03:16 +02:00
Jenkins for ownCloud
b06ab27711
[tx-robot] updated from transifex
2012-10-05 02:08:37 +02:00
Daniel Molkentin
3a983b428f
Fix bug when trying to pause a running sync
2012-10-04 14:08:23 +02:00
Klaas Freitag
e50479cae5
Push version to 1.1.0 beta3
2012-10-04 13:09:00 +02:00
Jenkins for ownCloud
a8307abe64
[tx-robot] updated from transifex
2012-10-04 02:09:59 +02:00
Jenkins for ownCloud
1e96c1b7bd
[tx-robot] updated from transifex
2012-10-03 02:08:23 +02:00
Daniel Molkentin
c42f77cf23
Consistency fix: name ui and src alike
2012-10-03 00:45:54 +02:00
Daniel Molkentin
d169bc24bf
ownCloudInfo must not include sslErrorDialog
2012-10-03 00:43:43 +02:00
Klaas Freitag
4d11e41e97
Merge branch 'master' of github.com:owncloud/mirall
2012-10-02 17:42:56 +02:00
Klaas Freitag
0007579ab8
Initialize pointer before use.
2012-10-02 17:42:37 +02:00
Daniel Molkentin
1752c23002
Use themed app name in password dialog.
2012-10-02 16:54:46 +02:00
Klaas Freitag
732ed57360
Merge branch 'master' of github.com:owncloud/mirall
2012-10-02 13:25:28 +02:00
Klaas Freitag
fabb353158
Use Qt proxy setting in csync in case its "default proxy"
2012-10-02 13:24:10 +02:00
Klaas Freitag
9ce10e7fe7
removed wrong header from filelist.
2012-10-02 13:18:36 +02:00
Klaas Freitag
11706c4e3e
Fix header.
2012-10-02 13:17:37 +02:00
Klaas Freitag
de60d53a78
Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog
...
Conflicts:
src/mirall/application.cpp
src/mirall/application.h
src/mirall/owncloudinfo.cpp
2012-10-02 12:34:06 +02:00
Jenkins for ownCloud
4256d0fd8a
[tx-robot] updated from transifex
2012-10-02 02:08:21 +02:00
Jenkins for ownCloud
5587da946f
[tx-robot] updated from transifex
2012-10-01 02:11:06 +02:00
Lukas Reschke
0b06982929
Optimize PNG files
...
This lossless optimization, reduces the filesize at about 25% for each
image
2012-09-30 15:27:46 +02:00
Lukas Reschke
e220de5236
Add .htaccess to sync exclude
...
ownCloud Server blacklists .htaccess files for security reasons - so it's useless to try to sync it.
See isBlacklisted() - fed34aecfa/lib/filesystem.php (L388)
2012-09-30 16:20:50 +03:00
Jenkins for ownCloud
3fc8e1c339
[tx-robot] updated from transifex
2012-09-30 02:08:03 +02:00
Jenkins for ownCloud
d21407181b
[tx-robot] updated from transifex
2012-09-29 02:07:39 +02:00