12609 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oleg Solovyov	09ade2b892	- add description for moveToTrash variable	2018-05-15 18:22:36 +02:00
Christian Kamm	1fa88c9820	FolderStatusModel: Refresh folders on Problem sync #6337 ... We don't want to refresh too frequently. But Problem is very close to Success and very common.	2018-05-15 18:08:17 +02:00
Christian Kamm	ad750f569c	Tray: Change icon for unresolved conflicts #6277	2018-05-15 17:58:10 +02:00
Olivier Goffart	2fcd7b20b8	SocketAPI: "Open in browser" and disable Share entries when sharing is disabled. ... This adds "Open in browser" entry in the menu (Issue #5903) Also mark the entries as disabled when the file is not yet on the server. If re-sharing is not allowed for that file, a disabled explaination entry is added to the menu. If sharing is disabled globaly in the branding or in the server, the share entry will not be present. (Issues #4205 and #4608) Meta issue #6292	2018-05-15 17:39:30 +02:00
Oleg Solovyov	f9fe24feb9	Move remote-deleted files to trash ... Squashed from https://github.com/owncloud/client/pull/6265 Linux only, Hidden option, disabled by default	2018-05-15 17:23:38 +02:00
Julius Härtl	5e2270bd57	Merge pull request #247 from nextcloud/adds-etag-navigation-apps ... Checks for 304 response in the navigation apps request	2018-05-08 06:55:41 +02:00
Camila San	d629f2259d	Changes from qCWarning to qCDebug. ... Signed-off-by: Camila San <hello@camila.codes>	2018-05-07 18:19:29 +02:00
Camila San	bbff83fe7c	Only updates the list of apps when there is a change in the server (not 304 status). ... Signed-off-by: Camila San <hello@camila.codes>	2018-05-07 18:03:51 +02:00
Camila San	402dc6c33b	Checks for http status code before building navigation apps menu. ... Signed-off-by: Camila San <hello@camila.codes>	2018-05-07 18:03:51 +02:00
Camila San	23a759ef4a	Adds 304 http status code as valid. ... Signed-off-by: Camila San <hello@camila.codes>	2018-05-07 18:03:51 +02:00
Camila San	77ebccee72	Adds methods to set/get navigation apps etag response header. ... Signed-off-by: Camila San <hello@camila.codes>	2018-05-07 18:03:51 +02:00
Camila San	d7286872f6	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 <hello@camila.codes>	2018-05-07 18:03:42 +02:00
Camila Ayres	3b0b0fea33	Merge pull request #282 from ivaradi/master ... Fix Debian build (another attempt)	2018-05-06 19:23:31 +02:00
István Váradi	ceb83c3709	Merge branch 'master' of github.com:nextcloud/client	2018-05-06 18:28:34 +02:00
István Váradi	a602df065e	Fixed the name of the Qt WebEngine package	2018-05-06 17:12:17 +02:00
István Váradi	181f3bbd26	Added build dependency on qt5webengine-dev (#281)	2018-05-06 16:17:16 +02:00
István Váradi	7e210cfcb3	Merge branch 'master' of github.com:nextcloud/client	2018-05-06 10:24:21 +02:00
István Váradi	fee2872a98	Added build dependency on qt5webengine-dev	2018-05-06 09:53:49 +02:00
Roeland Jago Douma	880f256a62	Merge pull request #278 from ivaradi/master ... Fix Debian build	2018-05-03 22:20:44 +02:00
István Váradi	7827fe4151	Fix Debian build	2018-05-03 19:02:49 +02:00
Roeland Jago Douma	e40bddb2c2	Merge pull request #276 from nextcloud/no_debian ... Build no debian while it fails	2018-05-03 14:38:38 +02:00
Roeland Jago Douma	ed3a723ad2	Build no debian while it fails ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-03 14:28:11 +02:00
Roeland Jago Douma	889c930b36	Merge pull request #75 from nextcloud/new_flow ... Add weblogin flow for NC > 12	2018-05-03 14:07:44 +02:00
Roeland Jago Douma	56e17c25b2	Change loading bar to NC blue ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-03 13:55:27 +02:00
Roeland Jago Douma	ef2d113930	Mark credentials as valid if there is no error ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Roeland Jago Douma	35e8d0437d	Address comments ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Roeland Jago Douma	6809f12e68	Allow the user to sign in again ... If the user is signed out (for whatever reason). Show a popup with the loginflow again. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Roeland Jago Douma	ac1664b525	Actually use webflow credentails ... * Detect invalid auth (if the users token is removed for example) * Properly store and fetch from keychain Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Roeland Jago Douma	6b43d80c01	Start with persisting credentials ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Roeland Jago Douma	356f9b4831	Actually connect properly to server ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Roeland Jago Douma	715c738ebf	Add urlschema handler so w can catch the nc:// urls ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Roeland Jago Douma	c763a6e7fb	Show webview with page ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Roeland Jago Douma	c4a88fe57e	Add QWebView as a dependency ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Camila Ayres	9338dadaab	Merge pull request #265 from k1l1/log_files_path ... Put log files somewhere else #221 (name conflict)	2018-05-02 15:30:34 +02:00
Kilian Pfeiffer	56c1d79c49	fixes windows crash / renaming changed	2018-04-30 16:09:04 +02:00
Camila Ayres	64cbc88474	Merge pull request #251 from nextcloud/clientSideEncryptionV4 ... Client side encryption v4.	2018-04-26 19:56:55 +02:00
Kilian Pfeiffer	cd926e5b84	resolving name conflict in logfiles	2018-04-24 15:47:23 +02:00
Morris Jobke	a41546834e	Merge pull request #262 from nextcloud/update-transifex-config ... Update transifex config and move it to a proper place	2018-04-23 19:59:41 +02:00
Morris Jobke	3a763f4d9c	Update transifex config and move it to a proper place ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2018-04-23 15:45:34 +02:00
Roeland Jago Douma	81ae682e87	Revert "Make different program so it doesn't mess with existing config" ... This reverts commit c04d1f1f69.	2018-04-22 21:04:37 +02:00
Roeland Jago Douma	75609c1b2c	Merge pull request #254 from ad1rie1/FIX32BitApplication ... Fix #6394	2018-04-22 20:57:36 +02:00
Camila Ayres	25b40cc852	Merge pull request #255 from ad1rie1/FixDeprecatedTR ... Fix Use of Deprecated trUtf8.	2018-04-20 11:11:05 +02:00
Adrien	8e52f1237b	Fix Use of Deprecated trUtf8	2018-04-19 12:02:26 +02:00
Julius Härtl	00336bd71d	Merge pull request #253 from k1l1/log_files_path ... Put log files somewhere else #221	2018-04-19 11:43:29 +02:00
Adrien	5f0a021c04	Fix #6394	2018-04-19 11:35:03 +02:00
Kilian Pfeiffer	40b1f051a4	log files are visible now	2018-04-17 17:59:03 +02:00
Kilian Pfeiffer	faf64958ec	changed paths of logfiles	2018-04-17 15:54:05 +02:00
Tomaz Canabrava	7432d6a814	Merge branch 'master' into clientSideEncryptionV4	2018-04-10 16:18:58 +02:00
Daniel Nicoletti	16aa54ed64	Do not create new db entries when the remote tree does not have proper values	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	3e05bd1da0	Do not detach encrypted files vector	2018-04-09 13:23:52 +02:00