summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 6.0.3v6.0.3Frank Karlitschek2014-04-291-2/+2
* Merge pull request #8389 from owncloud/reset-3rdparty-stable6Lukas Reschke2014-04-281-0/+0
|\
| * Update 3rdpartyThomas Müller2014-04-281-0/+0
|/
* Merge pull request #8384 from owncloud/kill_office_fallback_stable6Thomas Müller2014-04-282-149/+0
|\
| * backport b68098ebbaaa3bd816d24c1ed304425e838ee6b8 to stable6Georg Ehrke2014-04-282-149/+0
* | Update outdated commentVolkan Gezer2014-04-281-1/+1
|/
* Clarify the trusted_domain error pageLukas Reschke2014-04-271-1/+1
* Revert "Clarify the trusted_domain error page"Lukas Reschke2014-04-272-1/+1
* Clarify the trusted_domain error pageLukas Reschke2014-04-272-1/+1
* Add another example to the trusted_domains configLukas Reschke2014-04-261-1/+1
* Merge pull request #8365 from owncloud/stable6-external-storage-css-fixMorris Jobke2014-04-261-1/+6
|\
| * fix layout of external storage config tableMorris Jobke2014-04-261-1/+6
|/
* 6.0.3 RC1v6.0.3RC1Frank Karlitschek2014-04-231-2/+2
* Merge pull request #7745 from owncloud/fix_6946_stable6blizzz2014-04-2311-125/+95
|\
| * fix after rebaseArthur Schiwon2014-04-231-1/+0
| * keep the constant to not provoke PHP warningsArthur Schiwon2014-04-231-2/+1
| * trim must not be used in empty in PHP < 5.5Arthur Schiwon2014-04-231-1/+2
| * test for group manager's displayNamesInGroupArthur Schiwon2014-04-231-0/+50
| * adjust user manager testsArthur Schiwon2014-04-231-5/+5
| * implement getDisplayNames in group managerArthur Schiwon2014-04-233-13/+36
| * remove now unnecessary testArthur Schiwon2014-04-231-19/+0
| * clean up group backendsArthur Schiwon2014-04-232-45/+0
| * LDAP: getDisplayNamesInGroup is not an option for group backends anymoreArthur Schiwon2014-04-232-36/+1
| * remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backendsArthur Schiwon2014-04-232-6/+3
* | Merge pull request #8261 from owncloud/stable6-backport-8182Lukas Reschke2014-04-231-1/+6
|\ \ | |/ |/|
| * Check whether the user has permissions to add personal storage backendsLukas Reschke2014-04-221-1/+6
* | Merge pull request #8260 from owncloud/stable6-backport-8183-and-coThomas Müller2014-04-238-114/+197
|\ \
| * | Backport of #8197 to stable6Lukas Reschke2014-04-185-89/+168
| * | Backport of #8183 to stable6Lukas Reschke2014-04-183-25/+29
* | | Backport of #8164ben-denham2014-04-233-79/+122
* | | Update 3rdparty submoduleThomas Müller2014-04-221-0/+0
| |/ |/|
* | Merge pull request #8232 from owncloud/fix_8135blizzz2014-04-221-0/+15
|\ \
| * | add additional comments, PHPdoc and check whether it's really applicableArthur Schiwon2014-04-161-3/+12
| * | LDAP: cache display names immediately on retrieval, saves tens of unecessary ...Arthur Schiwon2014-04-161-0/+6
* | | Merge pull request #8265 from owncloud/appframework-fix-backportsBernhard Posselt2014-04-187-72/+72
|\ \ \
| * | | merge middleware string registrationBernhard Posselt2014-04-182-5/+5
| * | | use references for middleware to fix problems on 5.3Bernhard Posselt2014-04-181-2/+3
| * | | merge dicontainerBernhard Posselt2014-04-181-4/+3
| * | | default to GET request when no method is set to fix unittests, also set parse...Bernhard Posselt2014-04-184-14/+25
| * | | Correctly process request parameters other than GET or POST, dont use globals...Bernhard Posselt2014-04-182-50/+39
|/ / /
* | | Merge pull request #8259 from owncloud/backport-7682-6Lukas Reschke2014-04-181-1/+2
|\ \ \ | |_|/ |/| |
| * | Backport of #7682 to stable6Lukas Reschke2014-04-181-1/+2
|/ /
* | Use JS as content-type due to mimesniffingLukas Reschke2014-04-171-2/+2
* | Verify that a file exists before we share itRobin Appelman2014-04-171-0/+10
|/
* Backport of PR #7815, correct LDAP user count on setup with many usersArthur Schiwon2014-04-161-15/+40
* adjust tests accordinglyArthur Schiwon2014-04-153-3/+3
* Remove limit and offset manipulation when getting users or groups, because it...Arthur Schiwon2014-04-153-32/+0
* Merge pull request #8166 from owncloud/ldap_update_emailblizzz2014-04-141-0/+1
|\
| * LDAP: fetch email from LDAP on userExists check as well (along to Quota and A...Arthur Schiwon2014-04-111-0/+1
|/
* Merge pull request #8150 from owncloud/backport-8138-stable6Thomas Müller2014-04-111-1/+9
|\
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-03 06:25:07 +0000