Jenkins for ownCloud
cb57cda87a
[tx-robot] updated from transifex
2015-03-31 02:18:45 -04:00
Lukas Reschke
71e8910e02
Use 1.8 troubleshooting link
2015-03-30 17:32:19 +02:00
Daniel Molkentin
f2fa812b0b
Updater: Give context as to which app is about to be updated
...
Fixes #3040
2015-03-30 14:44:34 +02:00
Markus Goetz
ef89582d7e
Propagator: Fix compile
2015-03-30 08:41:53 +02:00
Jenkins for ownCloud
ae74a21305
[tx-robot] updated from transifex
2015-03-29 02:18:47 -04:00
Jenkins for ownCloud
32af63764c
[tx-robot] updated from transifex
2015-03-29 01:15:23 -04:00
Jenkins for ownCloud
61ff90409d
[tx-robot] updated from transifex
2015-03-28 02:18:42 -04:00
Olivier Goffart
426d2338d9
Settings: New UI that intergate the selective sync within the account settings
2015-03-27 16:50:35 +01:00
Christian Kamm
ba0c3256fa
Remove unused HttpConfigFile.
2015-03-27 13:20:10 +01:00
Markus Goetz
b6fe5d2cff
Propagator: Debug output regarding OC-ETag
...
We can remove this in some time, but currently it is interesting
to see for what server setup is no ETag but an OC-ETag.
2015-03-27 13:16:11 +01:00
Markus Goetz
9123fac545
owncloudcmd: Always trail path with /
...
Else the csync code vs the Qt code get confused.
2015-03-27 13:15:43 +01:00
Markus Goetz
c6bc388001
Proxy: More debug, always set returned system proxy
2015-03-27 11:53:58 +01:00
Christian Kamm
ea985a85af
ProtocolWidget: Always add seconds to the DateTime locale. #2535
2015-03-27 11:25:30 +01:00
Christian Kamm
dfd9d8725c
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
doc/installing.rst
2015-03-27 11:19:59 +01:00
Christian Kamm
2578832002
Fix clang warnings about deleting incomplete 'Account'.
2015-03-27 11:11:44 +01:00
Markus Goetz
cfada67aa6
Proxy: Fix compile harder
2015-03-27 11:02:19 +01:00
Christian Kamm
5483682281
CookieJar: Don't accidentally overwrite cookies. #2808
...
Calling save() in the CookieJar destructor was problematic. For instance
we sometimes create a new QNAM with a new CookieJar and then call
setCookieJar() on it to assign some other jar. That destroy the fresh
jar and potentially overwrite cookies.
Also explicitly saving the account's cookies when the account is saved
is more explicit and thus more reliable than counting on the Account
destructor to do it.
2015-03-27 10:49:24 +01:00
Christian Kamm
2a8c23aac3
Account: Destroy on exit.
...
During shutdown we want the account object to be deleted and
therefore we need to be able to remove the strong reference
in AccountManager.
2015-03-27 10:43:14 +01:00
Christian Kamm
88bc96fc4c
ConValidator: Delete instance if no credentials.
2015-03-27 10:43:14 +01:00
Christian Kamm
588129d852
HttpCreds: Delete password from old location. #2186
2015-03-27 10:40:19 +01:00
Jenkins for ownCloud
0889991c38
[tx-robot] updated from transifex
2015-03-27 02:18:47 -04:00
Markus Goetz
5c87a35fe4
Proxy: Fix compile
2015-03-26 18:36:37 +01:00
Markus Goetz
418185af9a
Qt4: Fix compile
2015-03-26 15:17:16 +01:00
Roeland Jago Douma
4b56cc6e08
On creation of a share always retrieve the share
...
This makes sure that if a default expiration date is set this is reflected in
the dialog. #2889
2015-03-26 13:48:33 +01:00
Christian Kamm
3cef771868
HttpCreds: Fill pw dialog with previous password. #2848 #2879
2015-03-26 09:25:45 +01:00
Jenkins for ownCloud
59b20de7cd
[tx-robot] updated from transifex
2015-03-26 02:18:43 -04:00
Markus Goetz
e0ae34f01b
SslButton: Make menu creation lazy
...
Saves ~200msec on my not-so-old MBP on OS X.
For #3007 #2990
2015-03-25 15:41:23 +01:00
Christian Kamm
a9a24c96fc
Themes: Cache icons instead of rebuilding a lot.
2015-03-25 14:59:28 +01:00
Markus Goetz
a202203325
Proxy: Fix issues with previous patch
...
This is for #2993 and #2802
2015-03-25 12:25:49 +01:00
Markus Goetz
83c3d76966
Proxy: Look up system proxy from different thread
...
We should actually upstream this into QNAM.
This is for #2993 and #2802
2015-03-25 08:52:23 +01:00
Markus Goetz
99734f8d72
Account: Unusued variable
2015-03-25 08:52:23 +01:00
Jenkins for ownCloud
570a0bb586
[tx-robot] updated from transifex
2015-03-25 02:18:53 -04:00
Daniel Molkentin
450a815d61
Add user id param
2015-03-24 22:24:09 +01:00
Olivier Goffart
dafc2d2b73
Sync engine: Check the blacklist for the right tree
...
When the operation is download, we have a INSTRUCTION_NONE for the local
tree, but we should not check the blacklist just yet.
2015-03-24 12:23:04 +01:00
Jocelyn Turcotte
0bd2edd33a
Revert "Switch back to an existing sha"
...
This reverts commit 48c9222578
2015-03-24 10:24:25 +01:00
Jenkins for ownCloud
807267cfdb
[tx-robot] updated from transifex
2015-03-24 02:18:42 -04:00
Daniel Molkentin
48c9222578
Switch back to an existing sha
2015-03-23 22:40:57 +01:00
Daniel Molkentin
b5ea56df73
Add docker buildscript for win32
2015-03-23 22:24:43 +01:00
Carla Schroder
d55d8c0152
add note re linux password managers
2015-03-23 10:57:05 -07:00
Carla Schroder
2fdf6dd8f2
Merge pull request #3008 from owncloud/passman
...
add note re password managers
2015-03-23 10:55:24 -07:00
Carla Schroder
5b8c9eb16f
add note re password managers
2015-03-23 10:52:57 -07:00
Olivier Goffart
9c05150c12
SSLButton: Fix a crash
...
Made with danimo.
Attempt to fix a crash seen on breakpad reports.
(cc06b990-0c10-40eb-bcec-4d3902150320)
2015-03-23 18:30:53 +01:00
Daniel Molkentin
c7eb85ef78
Activity: Correctly restore column sizes
...
Fixes : #3005
2015-03-23 18:22:25 +01:00
Olivier Goffart
4df455f2e0
Add-folder Wizard: Select the newly created folder
2015-03-23 16:50:37 +01:00
Olivier Goffart
653a00d63d
Add-folder wizard: Make sure there is a scrollbar if folder names are too long
...
Fixes #2962
2015-03-23 16:32:41 +01:00
Jocelyn Turcotte
3c9acdf724
Fix a crash when accessing a dangling UploadDevice pointer #2984
...
This is largely a guess, but this is the only place where we use
a QIODevice to push data through QNAM and that the QIODevice isn't
a direct child of the QNetworkReply.
Fix the issue by making sure that we don't go back to the event loop
and possibly handle network events between the destruction of the
upload QIODevice and the QNetworkReply, which might lead to QNAM
dereferencing a dangling QIODevice pointer.
2015-03-23 16:14:54 +01:00
Olivier Goffart
e81d1ab9b8
application: --confdir option with invalid direcotry now exit
...
Show an error and exit if an invalid directory (eg, a file) is passed to --confdir
Fixes : #2453
2015-03-23 15:02:27 +01:00
Olivier Goffart
9d7cf6b852
Merge remote-tracking branch 'origin/1.8'
2015-03-23 14:37:16 +01:00
Jocelyn Turcotte
ad5620efb5
Disable asserts in official builds
...
Make sure that we define NDEBUG in all configurations.
Also remove inconsistent defines:
WIN32: We don't use
_DEBUG;_WINDOWS;_USRDLL: Should be defined by the compiler if necessary
OCCONTEXTMENU_EXPORTS: We currently don't use dllimport anyway
This also update the binary submodule with an updated build.
2015-03-23 13:53:09 +01:00
RealRancor
1f327d683a
Added point and missing newline and fixed typo
2015-03-23 13:31:52 +01:00
