nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	Lukas Reschke	2016-06-27	42	-252/+387
\|\
\| *	Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyload	Vincent Petry	2016-06-27	1	-0/+4
\| \|\ \| \| \| \| \| \|	Quickfix: do not lazy load auth mechanisms for ext storages
\| \| *	Quickfix: do not lazy load auth mechanisms for ext storages	Vincent Petry	2016-06-27	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some auth mechanisms like SessionCredentials need to register hooks early, so they cannot be lazy loaded.
\| * \|	Merge pull request #25237 from owncloud/search-filelistnextpageresults	Vincent Petry	2016-06-27	2	-4/+29
\| \|\ \ \| \| \| \| \| \| \| \|	Prerender file list pages to include search results
\| \| * \|	Prerender file list pages to include search results	Vincent Petry	2016-06-24	2	-4/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When filtering the file list, if a result is on an unrendered page, make sure to call _nextPage() to prerender the pages in order to display all matching results.
\| * \| \|	Merge pull request #25261 from owncloud/app-password-login-name	Vincent Petry	2016-06-27	4	-2/+28
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	show which login name to use for the new app password
\| \| * \| \|	fix layout	Christoph Wurst	2016-06-24	3	-6/+24
\| \| \| \| \|
\| \| * \| \|	show which login name to use for the new app password	Christoph Wurst	2016-06-24	3	-0/+8
\| \| \|/ /
\| * \| \|	Merge pull request #25263 from ↵	Christoph Wurst	2016-06-27	1	-0/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	owncloud/decryptall-keepencryptionenabledforsingleuser Keep encryption enabled if decrypting for single user
\| \| * \| \|	Keep encryption enabled if decrypting for single user	Vincent Petry	2016-06-24	1	-0/+3
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When decrypting all files of a single user, the admin usually does not intend encryption to be suddenly disabled for everyone. This fix reenables encryption after decrypting for a single user. Decrypting for all users will still disable encryption globally.
\| * \| \|	Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms	Vincent Petry	2016-06-27	10	-45/+214
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add explicit delete permission to link shares
\| \| * \| \|	Repair step to adjust link share delete permissions	Vincent Petry	2016-06-24	3	-1/+111
\| \| \| \| \|
\| \| * \| \|	Add explicit delete permission to link shares	Vincent Petry	2016-06-24	7	-44/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link shares always allowed deletion, however internally the permissions were stored as 7 which lacked delete permissions. This created an inconsistency in the Webdav permissions. This fix makes sure we include delete permissions in the share permissions, which now become 15. In case a client is still passing 7 for legacy reasons, it gets converted automatically to 15.
\| * \| \| \|	Merge pull request #25258 from owncloud/integritycheck-whennotinstalled	Vincent Petry	2016-06-27	1	-3/+12
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make code integrity check work when OC is not installed yet
\| \| * \| \| \|	Make code integrity check work when OC is not installed yet	Vincent Petry	2016-06-24	1	-3/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #25252 from owncloud/authtoken-removetooltipondisconnect	Morris Jobke	2016-06-27	1	-0/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove tooltip when disconnecting token
\| \| * \| \| \| \|	Remove tooltip when disconnecting token	Vincent Petry	2016-06-23	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #25129 from owncloud/remove-ie	Vincent Petry	2016-06-27	10	-203/+11
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	Remove ie8+9 support
\| \| * \| \| \| \|	remove ie8+9 support	Hendrik Leppelsack	2016-06-23	10	-203/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #25247 from owncloud/fed-unshare-fail	Vincent Petry	2016-06-27	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove a fed share from the local table before trying to notify the remote server
\| \| * \| \| \| \| \|	Remove a fed share from the local table before trying to notify the remote ↵	Robin Appelman	2016-06-23	1	-2/+2
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	server
\| * \| \| \| \| \|	Merge pull request #25251 from owncloud/authtoken-assetpipelinefix	Vincent Petry	2016-06-27	3	-11/+11
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use OC.Backbone instead of Backbone directly in authtoken JS code
\| \| * \| \| \| \| \|	Use OC.Backbone instead of Backbone directly in authtoken JS code	Vincent Petry	2016-06-23	3	-11/+11
\| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes asset pipeline issue with the auth token in personal page
\| * \| \| \| \| \|	Merge pull request #25154 from owncloud/token-login-check-loginname	Vincent Petry	2016-06-27	2	-2/+41
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	check login name when authenticating via token and basic auth
\| \| * \| \| \| \| \|	check login name when authenticating with client token	Christoph Wurst	2016-06-24	2	-2/+41
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2016-06-27	10	-0/+32
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #233 from nextcloud/allow-users-to-change-global-credentials	Morris Jobke	2016-06-27	2	-3/+216
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow regular users to specify global credentials password
\| * \| \| \| \| \| \|	Allow regular users to specify global credentials password	Lukas Reschke	2016-06-27	2	-3/+216
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While the UI is existent the feature simply doesn't work because admin privileges are required for the controller. This adds proper permission checks and also unit tests. To test this: 1. Enable external storage 2. Login as non-admin user 3. Go to personal page and try to change global credentials
* \| \| \| \| \| \| \|	Merge pull request #221 from nextcloud/password_policy_events	Morris Jobke	2016-06-27	8	-64/+142
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add events to check passwords with the password policy app
\| * \| \| \| \| \| \| \|	verify user password on change	Bjoern Schiessle	2016-06-27	5	-26/+95
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove old hook, no longer needed	Bjoern Schiessle	2016-06-27	2	-32/+17
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	check password for link shares	Bjoern Schiessle	2016-06-27	3	-9/+33
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #190 from nextcloud/add-wnd-1	Lukas Reschke	2016-06-27	3	-0/+182
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Add "Login credentials" and "User Provided"
\| * \| \| \| \| \| \|	Add "Login credentials" and "User Provided"	Lukas Reschke	2016-06-21	3	-0/+182
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds the "Login Credentials" and "User Provided" option to the external storage implementation, it is basically done by reverting 176fb191b7ec1c742b70295ca2a315d8cc1f1ea0 from https://github.com/owncloud/core/pull/22432. This was taken from owncloud/core which is AGPL licensed.
* \| \| \| \| \| \| \|	Merge pull request #226 from nextcloud/master-upstream-sync	Lukas Reschke	2016-06-26	247	-657/+2501
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Master] upstream sync
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into master-upstream-sync	Lukas Reschke	2016-06-26	247	-657/+2501
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2016-06-26	18	-2/+114
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2016-06-25	8	-2/+130
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge pull request #25259 from owncloud/search-fixsearchfromotherfilelists	Christoph Wurst	2016-06-24	1	-2/+9
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix search result link for file results outside default list
\| \| \| * \| \| \| \| \| \|	Hide search results after switching directory	Vincent Petry	2016-06-24	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear.
\| \| \| * \| \| \| \| \| \|	Fix search result link for file results outside default list	Vincent Petry	2016-06-24	1	-2/+2
\| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When outside the "All files" list, the search result link must properly redirect to the "All files" list.
\| \| * \| \| \| \| \| \|	Merge pull request #25257 from owncloud/comments-showerroronsave	Christoph Wurst	2016-06-24	3	-8/+12
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|	Show error message when posting an invalid comment
\| \| \| * \| \| \| \| \|	Show error message when posting an invalid comment	Vincent Petry	2016-06-24	3	-8/+12
\| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When an internal server error occurs while creating or updating a comment, display a proper error notification in the UI.
\| \| * \| \| \| \| \|	Merge pull request #25171 from owncloud/files_external-list-all	Vincent Petry	2016-06-24	5	-10/+81
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|	Add option to `occ files_external:list` to show all configured mounts
\| \| \| * \| \| \| \|	Add option to `occ files_external:list` to show all configured mounts	Robin Appelman	2016-06-23	5	-10/+81
\| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	Merge pull request #25239 from owncloud/setupchecks-preventreload	Vincent Petry	2016-06-24	1	-2/+4
\| \| \|\ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|	Don't reload page in case of auth errors during setup checks
\| \| \| * \| \| \|	Don't reload page in case of auth errors during setup checks	Vincent Petry	2016-06-23	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If an error occurs during setup checks, do not let the global ajax error handler reload the page.
\| \| * \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2016-06-24	82	-6/+336
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	Merge pull request #25238 from owncloud/files-trashlistnamecorruption	Vincent Petry	2016-06-23	2	-0/+24
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|	Fix trashed file name corruption when rerendering trashbin list
\| \| \| * \| \|	Fix trashed file name corruption when rerendering trashbin list	Vincent Petry	2016-06-23	2	-0/+24
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The trashbin code does some gymnastics with the file data at render time. This fix makes sure that the modifications done on the file data are only local to the rendering code and doesn't affect the actual file data from the file list.