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 pull request #17328 from owncloud/revert-15363-ext-ocp	Thomas Müller	2015-07-02	9	-70/+49
\|\ \| \| \| \|	Revert "Use OCP classes as much as possible in files_external"
\| *	Revert "Use OCP classes as much as possible in files_external"	Thomas Müller	2015-07-02	9	-70/+49
\| \|
* \|	Merge pull request #17077 from owncloud/files-scan-absolute-path	Morris Jobke	2015-07-02	1	-3/+5
\|\ \ \| \| \| \| \| \|	fix getting mount points when passing a path to the files:scan command
\| * \|	handle error during setup	Robin Appelman	2015-06-29	1	-3/+5
\| \| \|
* \| \|	Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block	Vincent Petry	2015-07-02	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Fix duplicated line in doc block
\| * \| \|	Fix duplicated line in doc block	Joas Schilling	2015-07-02	1	-1/+0
\| \| \| \|
* \| \| \|	Merge pull request #17316 from ↵	Joas Schilling	2015-07-02	5	-5/+5
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	owncloud/master-delete-ocsid-from-db-if-none-specified [Master] Delete OCS ID from DB if none is specified
\| * \| \|	Bump versions	Lukas Reschke	2015-07-02	5	-5/+5
\| \| \| \|
* \| \| \|	Merge pull request #17246 from owncloud/share-lock-owner-parent	Joas Schilling	2015-07-02	3	-10/+134
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	lock parent folders for the owner when locking a shared file as recipient
\| * \| \|	only lock the parent folders	Robin Appelman	2015-07-01	2	-2/+13
\| \| \| \|
\| * \| \|	lock parent folders for the owner when locking a shared file as recipient	Robin Appelman	2015-07-01	3	-10/+123
\| \| \| \|
* \| \| \|	[master] Remove OCS IDs	Lukas Reschke	2015-07-02	5	-5/+0
\| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-07-02	40	-22/+116
\| \| \|
* \| \|	Fix scanFile signature to avoid boring warning	Vincent Petry	2015-07-01	1	-1/+3
\|/ /
* \|	Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes	Vincent Petry	2015-07-01	1	-13/+7
\|\ \ \| \| \| \| \| \|	Catch more error codes thrown by federated shares
\| * \|	Catch more error codes thrown by federated shares	Vincent Petry	2015-07-01	1	-13/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Most of the time it doesn't make sense to forward Guzzle's RequestException, so we convert it to StorageNotAvailable instead. This prevents unpredictable error codes to block access to unrelated folders needlessly.
* \| \|	Use OCP classes as much as possible in files_external	Robin McCorkell	2015-07-01	9	-49/+70
\|/ /
* \|	Merge pull request #16535 from rullzer/ocs_share_api_url	Morris Jobke	2015-07-01	2	-0/+55
\|\ \ \| \| \| \| \| \|	OCS Share API link shares now always have an url
\| * \|	OCS Share API link shares now always have an url	Roeland Jago Douma	2015-05-22	2	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To make sure clients have the correct and latest link add an url field to all OCS Share API return statements on public link shares. * Added unit tests
* \| \|	Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util	Morris Jobke	2015-07-01	12	-33/+33
\|\ \ \ \| \| \| \| \| \| \| \|	Move core apps from OC_Log::write to OCP\Util
\| * \| \|	Move core apps from OC_Log::write to OCP\Util	Roeland Jago Douma	2015-05-18	12	-33/+33
\| \| \| \|
* \| \| \|	Merge pull request #15475 from rullzer/files_sharing_OCP_DB	Morris Jobke	2015-07-01	7	-14/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Move files sharing app (mostly) to OCP\DB
\| * \| \| \|	Move files sharing app (mostly) to OCP\DB	Roeland Jago Douma	2015-05-18	7	-14/+14
\| \|/ / /
* \| \| \|	Merge pull request #17255 from owncloud/fix-17119	Thomas Müller	2015-07-01	9	-1/+389
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[LDAP] Filter user groups obtained by memberof
\| * \| \| \|	tests solidity	Arthur Schiwon	2015-06-30	3	-0/+24
\| \| \| \| \|
\| * \| \| \|	adjust unit test	Arthur Schiwon	2015-06-30	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	integration test	Arthur Schiwon	2015-06-30	5	-0/+331
\| \| \| \| \|
\| * \| \| \|	ensure groups match filter when using memberOf to read users group, refs #17119	Arthur Schiwon	2015-06-26	2	-1/+30
\| \| \| \| \|
* \| \| \| \|	Fixing ctor calls and ctor itself to not break usage in calendar and ↵	Thomas Müller	2015-06-29	2	-2/+2
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	contacts .....
* \| \| \|	Merge pull request #17083 from owncloud/share-etag-update-target	Vincent Petry	2015-06-29	2	-10/+38
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	take share target into account when updating recipient etags
\| * \| \| \|	Unit test for etag update on custom share folder	Vincent Petry	2015-06-26	1	-8/+36
\| \| \| \| \|
\| * \| \| \|	take share target into account when updating recipient etags	Robin Appelman	2015-06-22	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-06-29	36	-4/+44
\| \| \| \| \|
* \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-06-28	22	-10/+68
\| \| \| \| \|
* \| \| \| \|	Add missing annotations for parameters	Lukas Reschke	2015-06-27	2	-9/+16
\| \| \| \| \|
* \| \| \| \|	Merge pull request #17163 from owncloud/update-licenses	Lukas Reschke	2015-06-27	118	-114/+327
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update license headers
\| * \| \| \| \|	update license headers and authors	Morris Jobke	2015-06-25	118	-114/+327
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #17199 from ↵	Lukas Reschke	2015-06-27	2	-0/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	owncloud/feature/show-error-when-shareservice-dies add check if server returns a 500 and display error
\| * \| \| \| \| \|	add check if server returns a 500 and display error	Clark Tomlinson	2015-06-26	2	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	resolves https://github.com/owncloud/core/issues/17170
* \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-06-27	18	-4/+46
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Signature of overriding method should match the parent	Olivier Paroz	2015-06-26	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #17008 from owncloud/fix-17006	Björn Schießle	2015-06-26	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve splitting of username and remote adress when username contains an `@`
\| * \| \| \| \| \|	Use \OC\HintException and translate the hint	Joas Schilling	2015-06-22	1	-0/+4
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #17082 from owncloud/shared-etag-propagate-file	Thomas Müller	2015-06-26	4	-12/+51
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix etag propagation for single file shares
\| * \| \| \| \| \|	add some docs	Robin Appelman	2015-06-25	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix etag propagation for single file shares	Robin Appelman	2015-06-24	3	-12/+37
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add unit test for single file share etag propagation	Robin Appelman	2015-06-24	1	-0/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-06-26	44	-40/+14
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #17152 from owncloud/LDAP/AD-Typo	Morris Jobke	2015-06-25	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ldap/ad typo
\| * \| \| \| \| \|	Dropped an S from the mouseover	Lukas Reschke	2015-06-24	1	-1/+1
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.