aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-whe...Thomas Müller2015-12-071-0/+8
|\
| * Allow specifying a custom reset-password-urlJoas Schilling2015-12-071-3/+5
| * Remove password reset when the user can not change the passwordJoas Schilling2015-12-071-0/+6
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-073-4/+0
* | Merge pull request #20993 from owncloud/issue-20666-language-always-overwrittenThomas Müller2015-12-071-3/+7
|\ \
| * | Do not overwrite the language when it's just missing for one appJoas Schilling2015-12-071-3/+7
| |/
* | Merge pull request #20981 from owncloud/issue-19848-multiple-emails-for-share...Thomas Müller2015-12-071-1/+3
|\ \ | |/ |/|
| * Allow sending a share email to multiple usersJoas Schilling2015-12-071-1/+3
* | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContentThomas Müller2015-12-072-19/+12
|\ \
| * | Remove OC_Util::getUrlContent and replace by proper usage of public interfacesMorris Jobke2015-12-042-19/+12
* | | Merge pull request #11131 from owncloud/use-phpini-wrapperThomas Müller2015-12-077-14/+16
|\ \ \
| * | | Replace new occurences of ini_get with IniWrapper methodsMorris Jobke2015-11-234-7/+9
| * | | Replacing ini_get instances with inigetwrapper usagesClark Tomlinson2015-11-235-7/+7
* | | | Merge pull request #20904 from owncloud/view-mime-filterThomas Müller2015-12-071-6/+2
|\ \ \ \
| * | | | Fix mimetype filter in getDirectoryContentRobin Appelman2015-12-031-6/+2
* | | | | Merge pull request #20949 from owncloud/fix_20892Thomas Müller2015-12-071-4/+2
|\ \ \ \ \
| * | | | | [Sharing] Properly check if a group already has accessRoeland Jago Douma2015-12-041-4/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #20957 from owncloud/use-correct-method-signatureThomas Müller2015-12-071-1/+1
|\ \ \ \ \
| * | | | | Use correct method signatureLukas Reschke2015-12-041-1/+1
| |/ / / /
* | | | | Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntryThomas Müller2015-12-072-32/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | remove OC_App::getActiveNavigationEntry - not unsed anymoreMorris Jobke2015-12-041-14/+0
| * | | | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\AppMorris Jobke2015-12-042-18/+2
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-072-0/+6
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-064-2/+14
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-058-8/+40
|/ / /
* | | Merge pull request #20933 from owncloud/more-OC_Config-cleanupsThomas Müller2015-12-048-10/+11
|\ \ \
| * | | More cleanups of OC_Config usageMorris Jobke2015-12-038-10/+11
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-042-0/+2
* | | | Merge pull request #20807 from owncloud/dont-append-redirect-url-if-user-is-a...Thomas Müller2015-12-037-37/+178
|\ \ \ \
| * | | | Show error templateLukas Reschke2015-11-307-37/+178
* | | | | Merge pull request #20545 from owncloud/scan-storage-in-background-jobThomas Müller2015-12-031-1/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move files/ajax/scan.php to background jobLukas Reschke2015-11-281-1/+0
* | | | | Merge pull request #20924 from owncloud/use-url-generator-to-generate-linkThomas Müller2015-12-031-2/+2
|\ \ \ \ \
| * | | | | Use URLGenerator instead of hard-coded WEBROOTLukas Reschke2015-12-031-2/+2
* | | | | | Replace OC_Config in setupMorris Jobke2015-12-032-4/+5
* | | | | | Merge pull request #19461 from owncloud/reuse_codeThomas Müller2015-12-031-43/+38
|\ \ \ \ \ \
| * | | | | | reuse codeIndividual IT Services2015-11-231-43/+38
| | |_|_|_|/ | |/| | | |
* | | | | | Fix code from commentsJesús Macias2015-12-034-27/+15
* | | | | | Migrate storate status code to storagenotavailablexceptionJesús Macias2015-12-031-0/+3
* | | | | | Fix code from PR commentsJesús Macias2015-12-035-8/+13
* | | | | | Add new external storage exceptions for different errorsJesús Macias2015-12-034-0/+177
| |/ / / / |/| | | |
* | | | | Merge pull request #20872 from owncloud/systemtags-better-not-found-exceptionThomas Müller2015-12-034-8/+46
|\ \ \ \ \
| * | | | | Add a method to get the list of tags from the TagNotFound ExceptionJoas Schilling2015-12-014-8/+46
* | | | | | Merge pull request #20894 from owncloud/post-delete-meta-viewThomas Müller2015-12-031-3/+16
|\ \ \ \ \ \
| * | | | | | Also add metadata for postDelete hooks triggered from the viewRobin Appelman2015-12-021-3/+16
* | | | | | | Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the...Thomas Müller2015-12-034-27/+33
|\ \ \ \ \ \ \
| * | | | | | | Adding unit test for MailNotifications::sendInternalShareMail()Thomas Müller2015-12-022-6/+6
| * | | | | | | User IUser::getEMailAddress() all over the placeThomas Müller2015-12-023-21/+27
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuffThomas Müller2015-12-022-7/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Replace old config code with usage of proper APIsMorris Jobke2015-12-022-7/+12