Markus Goetz
f07d3d069e
Updater on OS X: Only allow if in /Applications #2931
2015-05-07 13:04:25 +02:00
Markus Goetz
e300e3c744
Wizard: Fix lock icon #1447
2015-05-07 13:04:25 +02:00
Klaas Freitag
b9df8290c9
Merge pull request #3208 from owncloud/dev/gcc5
...
Compile with GCC 5 - thanks for the pr
2015-05-07 09:52:36 +02:00
Christian Kamm
73e2254a80
AccountState: Treat *any* 503 as a temporary error. #3113
2015-05-07 09:21:52 +02:00
Jenkins for ownCloud
352c2957b2
[tx-robot] updated from transifex
2015-05-07 02:18:55 -04:00
Hefee
23b6426dfa
Compile with GCC 5
...
this fixes the error and makes complete oCC compile with GCC 5.
error: ISO C does not support '__FUNCTION__' predefined identifier
[-Wpedantic]
According to the porting guide:
The fix is either to use the standard predefined identifier __func__
(since C99), or to use the __extension__ keyword.
2015-05-07 01:15:55 +02:00
Jocelyn Turcotte
7ea1baaf2d
Merge pull request #2920 from remixtj/utility_SHGetKnownFolderPath
...
Use dynamic library loading for detecting the correct path for links
2015-05-06 17:22:46 +02:00
Daniel Molkentin
77a28a81eb
Bump to 1.9
2015-05-06 17:01:05 +02:00
Daniel Molkentin
24f751d981
master is 2.0
2015-05-06 16:59:23 +02:00
Jocelyn Turcotte
9ef8658122
shell_integration on OSX: Avoid too many RETRIEVE_FILE_STATUS following UPDATE_VIEW #3122
...
Do not request the status of all entries in the cache. Instead force Finder
to request the ones that it deems necessary by keeping the old statuses
in a separate dictionary which are only used while the new status arrives.
2015-05-06 16:56:50 +02:00
Jocelyn Turcotte
0a67719f2f
shell_integration on OSX: Do not fill the cache with unsolicited statuses #3122
2015-05-06 16:56:50 +02:00
Jocelyn Turcotte
04d820f9cf
shell_integration on OSX: Remove dead code
...
removeIcons isn't called and clearFileNameCacheForPath was always
called with a "nil" path.
Remove the return value of askForIcon which was always 0, and use
that value explicitly at the only call site.
Remove the "-1" code path in iconByPath since setIcons prevents
-1 from getting into _fileNamesCache in all cases.
2015-05-06 16:56:50 +02:00
Jocelyn Turcotte
931dd59844
Don't hardcode the source directory in deploy.sh
2015-05-06 16:56:50 +02:00
Jocelyn Turcotte
a6500d8068
Work around the Qt PUT corruption bug with Qt < 5.4.2 #2425
...
Since QNonContiguousByteDeviceThreadForwardImpl::reset will
call UploadDevice::reset with a BlockingQueuedConnection, this
allows us to reset the HTTP channel along with its buffers
before they get the chance to be reused with a subsequent request.
2015-05-06 16:56:50 +02:00
Jocelyn Turcotte
0d5d2c578d
shell_integration on Windows: Avoid too many RETRIEVE_FILE_STATUS following UPDATE_VIEW #3122
...
Do not request the status of all entries in the cache. Instead force
explorer to request the ones that it deems necessary by keeping the old
statuses in a separate dictionary which are only used while the new status
arrives.
2015-05-06 16:48:34 +02:00
Jocelyn Turcotte
77679790db
shell_integration on Windows: Don't fill the cache with unsolicited statuses #3122
...
Only keep the status updates if explorer is going to display it.
2015-05-06 16:48:33 +02:00
Christian Kamm
8d93af21a1
Doc: Fix the section config values should be in.
2015-05-06 15:55:25 +02:00
ckamm
7c0c7da9bf
Merge pull request #1928 from willyaranda/patch-1
...
Clarify the remotePollInterval variable
2015-05-06 15:53:11 +02:00
Luca Lorenzetto
027365aaa6
Additional code cleanup
2015-05-06 15:09:41 +02:00
Jocelyn Turcotte
58867baf33
Merge pull request #3183 from christian-burger/fix-for-windows-explorer-extension-when-syncing-whole-drive
...
Windows Explorer: fix issues when syncing whole drive.
2015-05-06 14:54:19 +02:00
Klaas Freitag
ee71024496
Changelog: Clearify changelog entries.
2015-05-06 11:43:58 +02:00
Daniel Molkentin
b1f326054f
Update Changelog
2015-05-06 11:25:04 +02:00
Daniel Molkentin
bceb40ed80
Disable setSslConfiguration calls for older Qt version
...
This is only required for client certs, which currently have
no GUI anyway and are experimental.
2015-05-06 11:20:16 +02:00
Daniel Molkentin
fd684eda52
1.8.1 final
2015-05-06 10:51:11 +02:00
Daniel Molkentin
f315423811
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
2015-05-06 10:04:22 +02:00
Christian Kamm
9e3c3353bd
IgnoreListEditor: Remove invalid connect. #3201
...
This has been around ever since the ignore editor was
added and the slot never existed.
2015-05-06 09:34:45 +02:00
Christian Burger
79f7ea0965
refactoring as requested in pull request
2015-05-05 16:34:01 +01:00
Markus Goetz
07ffff3d77
SyncEngine: Fix accidental re-discovery because of broken version table
...
Bug had been triggered by d63abef718
2015-05-05 17:07:13 +02:00
Luca Lorenzetto
f3bdfef9cf
Integrating feedbacks provided by jturcotte
2015-05-05 16:42:34 +02:00
Daniel Molkentin
bfba6f752c
Remove dead code
2015-05-05 10:23:59 +02:00
Jenkins for ownCloud
9b34427a1c
[tx-robot] updated from transifex
2015-05-05 02:18:50 -04:00
Daniel Molkentin
5fba476076
1.8.0 RC2
2015-05-04 13:43:56 +02:00
Klaas Freitag
d63abef718
SyncEngine: Handle upgrade case from 1.8.0
...
If 1.8.0 caused missing data in the local tree, this patch gets it
back. For that, the usage of the journal for remote repository is
disabled at the first start.
2015-05-04 13:40:25 +02:00
Christian Burger
018cc54a94
Windows Explorer: fix issues when syncing whole drive.
...
When the local sync target is just a drive letter (e.g. "X:\"), neither
the display of the sync status via file icon overlay, nor the creation of a
share link works. In the latter case no pop-up comes up and no server
request is done.
QDir::cleanPath() usually removes trailing slashes, but not if the path to
be cleaned is just "X:\". In that case the trailing slash is kept. This
commit accounts for that exception.
2015-05-04 10:29:25 +01:00
Jenkins for ownCloud
cdba8a7f2f
[tx-robot] updated from transifex
2015-05-04 02:18:49 -04:00
Jenkins for ownCloud
21967a130b
[tx-robot] updated from transifex
2015-05-03 02:18:47 -04:00
Jenkins for ownCloud
08e78d5d6f
[tx-robot] updated from transifex
2015-05-02 02:18:47 -04:00
Jenkins for ownCloud
fe68e1e82c
[tx-robot] updated from transifex
2015-05-01 02:18:22 -04:00
Jenkins for ownCloud
25ac3bfdb7
[tx-robot] updated from transifex
2015-04-30 03:27:54 -04:00
Markus Goetz
4700c604b1
Proxy: Register meta type #3170
2015-04-29 14:54:08 +02:00
Jenkins for ownCloud
356fa737c5
[tx-robot] updated from transifex
2015-04-29 02:18:49 -04:00
Olivier Goffart
e02f1a222e
FolderMan: refactor some function to take a Folder* instead of an alias
...
I want to remove this dependency of alias in the code because we might get
rid of it entierly later
2015-04-28 17:49:05 +02:00
Olivier Goffart
e4694a6db8
Setup wizard: Do not remove all the folders of all theother acocunts when adding an account
...
Also we need the alias to be unique
2015-04-28 17:46:45 +02:00
Olivier Goffart
e5ad1b27b4
Settings dialog: show the first account page at start
2015-04-28 11:39:27 +02:00
Olivier Goffart
92e259c276
Add folder: Do not add at other accounts folder to know if you can add a folder
2015-04-28 11:29:35 +02:00
Olivier Goffart
f81918173b
Account settings: show the folder of the right account
2015-04-27 19:09:48 +02:00
Olivier Goffart
4006bcdaed
Wizard: Setup the folder in the right account
2015-04-27 17:43:07 +02:00
Olivier Goffart
3e4886725a
Folder: remove the member references to the FolderDefinition members
2015-04-27 17:33:59 +02:00
Olivier Goffart
f688bda759
Wizard: Save the settings after adding an account
...
So the account persist even if the client is not properly closed
2015-04-27 17:19:46 +02:00
Olivier Goffart
ac855858de
owncloud gui: move a comment where it belongs
...
The code was moved long time ago in commit ea1c95100
2015-04-27 17:14:25 +02:00
