summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | 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-041-17/+0
|/ / /
* | | 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
* | | | 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
* | | | 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
| | |_|/ | |/| |
* | | | Merge pull request #20872 from owncloud/systemtags-better-not-found-exceptionThomas Müller2015-12-032-6/+18
|\ \ \ \
| * | | | Add a method to get the list of tags from the TagNotFound ExceptionJoas Schilling2015-12-012-6/+18
* | | | | 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-033-26/+32
|\ \ \ \ \ \
| * | | | | | Adding unit test for MailNotifications::sendInternalShareMail()Thomas Müller2015-12-021-5/+5
| * | | | | | 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
* | | | | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-usersThomas Müller2015-12-023-32/+106
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix endless recursionThomas Müller2015-12-021-7/+9
| * | | | | Fix commentsThomas Müller2015-12-021-1/+1
| * | | | | Fix getCloudIdThomas Müller2015-12-021-0/+1
| * | | | | Proposal: add enumeration function to IUserManager which simply calls a callb...Thomas Müller2015-12-021-4/+30
| * | | | | Add the user's cloud id to the vCardThomas Müller2015-12-021-25/+42
| * | | | | Add IUser::getAvatarImage() for easy accessThomas Müller2015-12-022-2/+30
* | | | | | Reduce OC_Config usage in lib/Morris Jobke2015-12-023-6/+7
| |/ / / / |/| | | |
* | | | | Merge pull request #20875 from owncloud/remove-changepropagatorThomas Müller2015-12-022-143/+0
|\ \ \ \ \
| * | | | | remove old propagation logicRobin Appelman2015-12-012-143/+0
* | | | | | Add a trailing slash to generated URLsLukas Reschke2015-12-021-1/+1
* | | | | | Merge pull request #20879 from owncloud/check-if-rewrite-base-is-set-if-rewri...Thomas Müller2015-12-021-1/+5
|\ \ \ \ \ \
| * | | | | | Set RewriteBase to / if OC::WEBROOT is not setLukas Reschke2015-12-011-1/+2
| * | | | | | Set "SetEnv" within base `.htaccess` fileLukas Reschke2015-12-011-0/+3
* | | | | | | Merge pull request #20865 from owncloud/post-delete-metaThomas Müller2015-12-024-22/+104
|\ \ \ \ \ \ \
| * | | | | | | Add metadata to post delete hooksRobin Appelman2015-12-014-22/+104
* | | | | | | | Merge pull request #20874 from owncloud/allow-di-mimetypedetectorThomas Müller2015-12-021-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow DI for OCP\Files\IMimeTypeDetectorJoas Schilling2015-12-011-0/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #20877 from owncloud/fix-empty-expirationDateThomas Müller2015-12-021-1/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |