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 #2183 from owncloud/fix-shared-statuses-again	Bernhard Posselt	2013-03-11	2	-62/+51
\|\ \| \| \| \|	Fix #2080 and fix #2141
\| *	Update share.js	Bernhard Posselt	2013-03-08	1	-2/+2
\| \| \| \| \| \|	Added HTML escaping
\| *	Fix #2080 and fix #2141	Michael Gapczynski	2013-03-07	2	-62/+51
\| \|
* \|	Merge pull request #2218 from owncloud/fix-mounting-all	Bernhard Posselt	2013-03-11	1	-1/+1
\|\ \ \| \| \| \| \| \|	Fix variable for mounting for all users, fix #357
\| * \|	Fix variable for mounting for all users, fix #357	Michael Gapczynski	2013-03-09	1	-1/+1
\| \| \|
* \| \|	Merge pull request #1786 from owncloud/shared-folder-etags	Bernhard Posselt	2013-03-11	6	-53/+219
\|\ \ \ \| \| \| \| \| \| \| \|	Include etags for the root of the shared folder
\| * \| \|	Fix correctFolders and retrieve the correct storage cache	Michael Gapczynski	2013-03-08	2	-17/+17
\| \| \| \|
\| * \| \|	not only files can be reshared but also folders	Björn Schießle	2013-03-08	1	-1/+1
\| \| \| \|
\| * \| \|	Fix share hook for updater	Michael Gapczynski	2013-03-08	1	-2/+14
\| \| \| \|
\| * \| \|	use pre_unshare hook, otherwise the share is already removed. Which means ↵	Björn Schießle	2013-03-08	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that we have no chance to determine which folder has to be updated
\| * \| \|	Merge branch 'master' into shared-folder-etags	Michael Gapczynski	2013-03-07	61	-456/+632
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Conflicts: apps/files_sharing/lib/sharedstorage.php
\| * \| \|	itemSource parameter should be fileSource	Michael Gapczynski	2013-03-07	1	-2/+2
\| \| \| \|
\| * \| \|	Update Shared folders ETags of users with reshares	Michael Gapczynski	2013-03-06	1	-5/+11
\| \| \| \|
\| * \| \|	Move hook connectors from shared storage to app.php, add post_unshare hook	Michael Gapczynski	2013-03-05	2	-4/+5
\| \| \| \|
\| * \| \|	Merge branch 'master' into shared-folder-etags	Michael Gapczynski	2013-03-05	540	-7851/+9785
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_sharing/appinfo/app.php
\| * \| \| \|	Fix group post_shared hook	Michael Gapczynski	2013-03-04	1	-14/+14
\| \| \| \| \|
\| * \| \| \|	Fix variable name in Shared_Updater	Michael Gapczynski	2013-03-02	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update ETag when file is shared	Michael Gapczynski	2013-03-02	2	-0/+11
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into shared-folder-etags	Michael Gapczynski	2013-02-28	857	-16126/+24650
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_sharing/lib/sharedstorage.php
\| * \| \| \| \|	Fix target path and reuse mtime	Michael Gapczynski	2013-02-26	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Correct parent folders' ETags for all users with access to a shared file	Michael Gapczynski	2013-02-26	5	-2/+106
\| \| \| \| \| \|
\| * \| \| \| \|	Fix variable	Michael Gapczynski	2013-02-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Return unknown free space for shared root folder so we can still upload ↵	Michael Gapczynski	2013-02-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	partial files
\| * \| \| \| \|	Fix WebDAV uploading of partial shared files	Michael Gapczynski	2013-02-23	1	-27/+46
\| \| \| \| \| \|
\| * \| \| \| \|	Include etag field for folder contents	Michael Gapczynski	2013-02-23	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Include etags for the root of the shared folder	Michael Gapczynski	2013-02-19	1	-3/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2184 from tripflex/master	Bernhard Posselt	2013-03-10	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove php_value from .htaccess causing 500 errors, fixes #2176
\| * \| \| \| \| \|	remove php_value	Myles McNamara	2013-03-07	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	php_value can only be used with mod_php, using it with FCGI will cause 500 Internal Server errors. This needs to be set in php.ini manually or set using ini_set().
* \| \| \| \| \| \|	Merge pull request #2224 from owncloud/ldap_version_bump	Michael Gapczynski	2013-03-10	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LDAP: fancy version for release, no code change
\| * \| \| \| \| \| \|	LDAP: fancy version for release, no code change	Arthur Schiwon	2013-03-10	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #2217 from owncloud/mountconfig-location	Lukas Reschke	2013-03-10	2	-5/+12
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|	Store the global mount configuration file in the datadir
\| * \| \| \| \| \|	Store the global mount configuration file in the datadir	Robin Appelman	2013-03-10	2	-5/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1584 from owncloud/ocs_multiple_methods	Tom Needham	2013-03-09	13	-94/+264
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
\| * \ \ \ \ \ \	Merge in master	Tom Needham	2013-03-09	231	-1636/+2339
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Rebase to current master	Tom Needham	2013-03-05	1389	-33246/+89446
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add further capabilities to /cloud/capabilitites api call	Tom Needham	2013-02-10	6	-1/+63
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	more code style	Tom Needham	2013-02-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Code style and remove OAuth code	Tom Needham	2013-02-10	1	-11/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change capabilities exposure for files_versions since it extends files	Tom Needham	2013-02-10	1	-3/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove debug call, correct app identifier	Tom Needham	2013-02-10	2	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix api result merging.	Tom Needham	2013-02-09	5	-9/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge in master	Tom Needham	2013-02-09	838	-10671/+20944
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Use OC_User::isAdminUser() in lib/api.php	Tom Needham	2013-02-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'ocs_capabilities' into ocs_multiple_methods	Tom Needham	2013-02-09	1012	-30311/+65034
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Add capabilities exposure to the versioning app	Tom Needham	2013-02-09	3	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Remove accidental inclusion of apps repo.	Tom Needham	2013-02-09	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Change strucutre of cloud/capabilities response	Tom Needham	2013-02-09	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Fix merge conflict	Tom Needham	2013-02-04	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	fixing variable name type	Thomas Mueller	2013-01-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into ocs_capabilities	Thomas Mueller	2013-01-31	1051	-26145/+59113
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/ocs/cloud.php