15886 Commits (e5def25f40fdffdf7e44ca7bab95b685e16f711c)

 

All Branches   

Search

Author	SHA1	Message	Date
Lukas Reschke	e5def25f40	Add another example to the trusted_domains config ... Users often ask in IRC or the forum how to add another domain. Hopefully they will be able to find it out on their own if we have an example with two domains.	12 years ago
Morris Jobke	2c92ef9e64	Merge pull request #8365 from owncloud/stable6-external-storage-css-fix ... fix layout of external storage config table	12 years ago
Morris Jobke	16ae62f246	fix layout of external storage config table ... Conflicts: apps/files_external/css/settings.css	12 years ago
Frank Karlitschek	53df9c93c4	6.0.3 RC1	12 years ago
blizzz	14c95086a9	Merge pull request #7745 from owncloud/fix_6946_stable6 ... Group Database backend must not gather user details itself but ask user backends, fixes #6946 in stable6	12 years ago
Lukas Reschke	4696b06060	Merge pull request #8261 from owncloud/stable6-backport-8182 ... Backport of #8182	12 years ago
Arthur Schiwon	0a9487ec80	fix after rebase	12 years ago
Arthur Schiwon	fcffccf018	keep the constant to not provoke PHP warnings	12 years ago
Arthur Schiwon	72b90816fa	trim must not be used in empty in PHP < 5.5	12 years ago
Arthur Schiwon	6aeb5996b6	test for group manager's displayNamesInGroup	12 years ago
Arthur Schiwon	af45da94b3	adjust user manager tests	12 years ago
Arthur Schiwon	f93ab1105f	implement getDisplayNames in group manager	12 years ago
Arthur Schiwon	637aa56197	remove now unnecessary test	12 years ago
Arthur Schiwon	649233e54c	clean up group backends	12 years ago
Arthur Schiwon	8d00f1ca1f	LDAP: getDisplayNamesInGroup is not an option for group backends anymore	12 years ago
Arthur Schiwon	60edf98c15	remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends	12 years ago
Thomas Müller	1041617a4e	Merge pull request #8260 from owncloud/stable6-backport-8183-and-co ... Backport of #8183 and #8197	12 years ago
ben-denham	a314508543	Backport of #8164 ... Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition. Moved LdapFilter into a separate js file in user_ldap. Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation. fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh Give hint when composing filter failed fixing some JSHint warnings	12 years ago
Thomas Müller	74241140d2	Update 3rdparty submodule	12 years ago
Lukas Reschke	d3a15b6b07	Check whether the user has permissions to add personal storage backends ... Quick’n dirty back port of #8182 - master has a better fix but that should be good enough… missing return - OCP\JSON::success does not terminate the PHP process - which is good ;-) Use error instead of success Revert "Use error instead of success" This reverts commit e2d5535a5aa436c3896e46f0b9e8ff1bd5640d4d. Use error instead of success	12 years ago
blizzz	1403a85950	Merge pull request #8232 from owncloud/fix_8135 ... LDAP: optimize retrieval of displaynames, fixes #8135	12 years ago
Bernhard Posselt	130f2419f5	Merge pull request #8265 from owncloud/appframework-fix-backports ... Appframework fix backports	13 years ago
Bernhard Posselt	a53ec9ebeb	merge middleware string registration	13 years ago
Bernhard Posselt	33bdab1618	use references for middleware to fix problems on 5.3	13 years ago
Bernhard Posselt	3405342ab6	merge dicontainer	13 years ago
Bernhard Posselt	980b11f096	default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute	13 years ago
Bernhard Posselt	22485fe743	Correctly process request parameters other than GET or POST, dont use globals in the class but inject it	13 years ago
Lukas Reschke	a7bc716b95	Merge pull request #8259 from owncloud/backport-7682-6 ... Backport #7682	13 years ago
Lukas Reschke	9b36224bd4	Backport of #8197 to stable6 ... This extends mimetypes.list.php to be a white-list of known secure mime types as well as offering secure alternatives for know potentially malicious mime types. I kept this in the OC_Helper and OC\Files\Type\Detection classes as each backend has its own way of detecting mime types. This supersedes #8184 as discussed in owncloud/security-tracker#56	13 years ago
Lukas Reschke	9f1788f202	Backport of #8183 to stable6 ... Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...) The migration to base.php ensures that the headers are served to all requests passing base.php	13 years ago
Lukas Reschke	a30040411c	Backport of #7682 to stable6	13 years ago
Lukas Reschke	c4d4065dc2	Use JS as content-type due to mimesniffing	13 years ago
Robin Appelman	d4be12ab21	Verify that a file exists before we share it	13 years ago
Arthur Schiwon	02de48e1ba	add additional comments, PHPdoc and check whether it's really applicable	13 years ago
Arthur Schiwon	97d6db966c	LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example	13 years ago
Arthur Schiwon	cf2fc58c65	Backport of PR #7815, correct LDAP user count on setup with many users ... (occ user:report) LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0 LDAP: fix user report i.e. count for LDAP servers with really many users initialize variable var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop Put inner loop into own method, let's see whether it makes scrutinizer happier	13 years ago
Arthur Schiwon	e1b1ce684d	adjust tests accordingly	13 years ago
Arthur Schiwon	793f20d728	Remove limit and offset manipulation when getting users or groups, because it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint	13 years ago
blizzz	15ebb4b8ad	Merge pull request #8166 from owncloud/ldap_update_email ... Also check for email address on userExists (next to Avatar and Quota)	13 years ago
Arthur Schiwon	80a294b334	LDAP: fetch email from LDAP on userExists check as well (along to Quota and Avatar)	13 years ago
Thomas Müller	6636c14c2a	Merge pull request #8150 from owncloud/backport-8138-stable6 ... To isolate the variable scope used inside the $file it is required in i...	13 years ago
Bernhard Posselt	bf898f90bc	Merge pull request #8151 from owncloud/backport-8137-stable6 ... add requirements to routing	13 years ago
Bernhard Posselt	de7a3861f3	Merge pull request #8119 from Raydiation/stable6 ... Remove dependency on container, removing service locator antipattern	13 years ago
Vincent Petry	d4951c68f3	Fixed Sabre Node implementation to correctly return timestamps as int ... Negative timestamps were returned as string and were confusing other Sabre API like Sabre_DAV_Property_GetLastModified. This fix makes sure the timestamp is returned as int when defined. Backport of 4f11786 from master	13 years ago
Vincent Petry	85e90c33fc	Merge pull request #8148 from owncloud/backport-6676-stable6 ... Disabled internet checking as mentioned when in proxy mode	13 years ago
Bernhard Posselt	22632a227c	Update controller.php ... Backwards compability fix for faster merge ;)	13 years ago
Bernhard Posselt	fc8004d335	add requirements to routing ... Conflicts: tests/lib/appframework/routing/RoutingTest.php	13 years ago
Thomas Müller	2149670328	fix code formatting	13 years ago
Thomas Müller	2741eb1fe3	To isolate the variable scope used inside the $file it is required in it's own method - refs #8138	13 years ago
Joan	b09614b61b	Disabled internet checking as mentioned when in proxy mode	13 years ago