nextcloud-desktop-pachulo:upstream/pr/6277

Last commit made on 2018-05-15
Get this branch:
git clone -b upstream/pr/6277 https://git.launchpad.net/nextcloud-desktop-pachulo

Branch merges

Branch information

Name:
upstream/pr/6277
Repository:
lp:nextcloud-desktop-pachulo

Recent commits

ad750f5... by Christian Kamm <email address hidden>

Tray: Change icon for unresolved conflicts #6277

5e2270b... by Julius Haertl

Merge pull request #247 from nextcloud/adds-etag-navigation-apps

Checks for 304 response in the navigation apps request

d629f22... by Camila San <email address hidden>

Changes from qCWarning to qCDebug.

Signed-off-by: Camila San <email address hidden>

bbff83f... by Camila San <email address hidden>

Only updates the list of apps when there is a change in the server (not 304 status).

Signed-off-by: Camila San <email address hidden>

402dc6c... by Camila San <email address hidden>

Checks for http status code before building navigation apps menu.

Signed-off-by: Camila San <email address hidden>

23a759e... by Camila San <email address hidden>

Adds 304 http status code as valid.

Signed-off-by: Camila San <email address hidden>

77ebcce... by Camila San <email address hidden>

Adds methods to set/get navigation apps etag response header.

Signed-off-by: Camila San <email address hidden>

d728687... by Camila San <email address hidden>

Adds function to add raw header to the request.

Function added to be able to add If-None-Match to save the ETag.

Signed-off-by: Camila San <email address hidden>

3b0b0fe... by Camila Ayres <email address hidden>

Merge pull request #282 from ivaradi/master

Fix Debian build (another attempt)

ceb83c3... by István Váradi

Merge branch 'master' of github.com:nextcloud/client