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

	Commit message (Expand)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-07-03	18	-4/+70
*	Merge pull request #17159 from owncloud/fix-duplicate-id	Morris Jobke	2015-07-02	1	-1/+1
\|\
\| *	remove duplicate ID in HTML template for public shares	Morris Jobke	2015-06-25	1	-1/+1
* \|	Do not register JS share plugin if core sharing API is disabled	Vincent Petry	2015-07-02	1	-0/+4
* \|	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"	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
\|\ \ \
\| * \| \|	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	Joas Schilling	2015-07-02	1	-1/+0
* \| \| \| \|	Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-s...	Joas Schilling	2015-07-02	5	-5/+5
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	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
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	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
\| \|/ / / \|/\| \| \|
* \| \| \|	[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	Vincent Petry	2015-07-01	1	-13/+7
* \| \| \|	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	Roeland Jago Douma	2015-05-22	2	-0/+55
* \| \| \|	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	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	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
\|\ \ \ \ \
\| * \| \| \| \|	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 contacts...	Thomas Müller	2015-06-29	2	-2/+2
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #17083 from owncloud/share-etag-update-target	Vincent Petry	2015-06-29	2	-10/+38
\|\ \ \ \ \
\| * \| \| \| \|	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 and authors	Morris Jobke	2015-06-25	118	-114/+327
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #17199 from owncloud/feature/show-error-when-shareservice-...	Lukas Reschke	2015-06-27	2	-0/+19
\|\ \ \ \ \ \
\| * \| \| \| \| \|	add check if server returns a 500 and display error	Clark Tomlinson	2015-06-26	2	-0/+19
* \| \| \| \| \| \|	[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
\|\ \ \ \ \ \
\| * \| \| \| \| \|	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
\|\ \ \ \ \ \
\| * \| \| \| \| \|	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