summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add different storage status codes managed by StoragedNotAvailableExceptionJesús Macias2015-12-032-4/+42
* Merge pull request #20902 from owncloud/drop-OC_Config-from-testsThomas Müller2015-12-035-35/+45
|\
| * Replace OC_Config in tests with IConfig callsMorris Jobke2015-12-025-35/+45
* | Merge pull request #20871 from owncloud/bump_doctrine_depsThomas Müller2015-12-031-0/+0
|\ \
| * | [3rdparty] Bump doctrine/dbal depsRoeland Jago Douma2015-12-031-0/+0
* | | Merge pull request #20872 from owncloud/systemtags-better-not-found-exceptionThomas Müller2015-12-036-10/+60
|\ \ \
| * | | Fix the unit test by running tearDown() and cleaning tags before the testJoas Schilling2015-12-012-1/+13
| * | | Add a method to get the list of tags from the TagNotFound ExceptionJoas Schilling2015-12-015-9/+47
* | | | Merge pull request #20894 from owncloud/post-delete-meta-viewThomas Müller2015-12-032-4/+37
|\ \ \ \
| * | | | Also add metadata for postDelete hooks triggered from the viewRobin Appelman2015-12-022-4/+37
* | | | | Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the...Thomas Müller2015-12-0314-249/+370
|\ \ \ \ \
| * | | | | Adding unit test for MailNotifications::sendInternalShareMail()Thomas Müller2015-12-023-37/+76
| * | | | | User IUser::getEMailAddress() all over the placeThomas Müller2015-12-0213-212/+294
* | | | | | Merge pull request #20900 from owncloud/share-group-only-with-exact-matchThomas Müller2015-12-032-12/+41
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Only return the exact match, when it's allowedJoas Schilling2015-12-022-12/+41
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0320-8/+70
* | | | | Merge pull request #20905 from owncloud/allow-framing-itselfThomas Müller2015-12-022-1/+10
|\ \ \ \ \
| * | | | | Allow framing 'self'Lukas Reschke2015-12-022-1/+10
| |/ / / /
* | | | | Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuffThomas Müller2015-12-023-10/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Replace old config code with usage of proper APIsMorris Jobke2015-12-023-10/+16
| | |_|/ | |/| |
* | | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-usersThomas Müller2015-12-0224-75/+939
|\ \ \ \ | |/ / / |/| | |
| * | | Fix endless recursionThomas Müller2015-12-023-11/+25
| * | | Fix update of avatar imageThomas Müller2015-12-022-33/+49
| * | | Fix commentsThomas Müller2015-12-023-5/+5
| * | | Fix getCloudIdThomas Müller2015-12-022-1/+8
| * | | Proposal: add enumeration function to IUserManager which simply calls a callb...Thomas Müller2015-12-023-24/+54
| * | | Adding unit test for User::getCloudId()Thomas Müller2015-12-021-0/+18
| * | | Specify the email type and set name properlyThomas Müller2015-12-022-14/+66
| * | | Add converter to generate/update a vcard from a given userThomas Müller2015-12-023-23/+218
| * | | Add system principal to cal of each cardThomas Müller2015-12-022-0/+49
| * | | Add the user's cloud id to the vCardThomas Müller2015-12-026-44/+60
| * | | Add user's email address to vCardThomas Müller2015-12-021-2/+7
| * | | Update addressbook home configuration for CalDAVTesterThomas Müller2015-12-022-6/+6
| * | | user and system addressbooks are now living in sub foldersThomas Müller2015-12-027-15/+78
| * | | Adding a second principal backend which holds system principals - as of now o...Thomas Müller2015-12-023-15/+191
| * | | Add IUser::getAvatarImage() for easy accessThomas Müller2015-12-025-7/+51
| * | | Adding system addressbook for users of this instance - a occ command is suppl...Thomas Müller2015-12-026-2/+181
* | | | Merge pull request #20896 from owncloud/reduce-oc_config-usageThomas Müller2015-12-024-8/+10
|\ \ \ \
| * | | | Reduce OC_Config usage in lib/Morris Jobke2015-12-024-8/+10
| | |/ / | |/| |
* | | | Merge pull request #20895 from owncloud/reduce-legacy-footprint-apps-managementThomas Müller2015-12-023-5/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Remove OC_Config from app management templateMorris Jobke2015-12-023-5/+40
|/ / /
* | | Merge pull request #20875 from owncloud/remove-changepropagatorThomas Müller2015-12-028-865/+0
|\ \ \
| * | | remove old propagation logicRobin Appelman2015-12-018-865/+0
* | | | Merge pull request #20891 from owncloud/check-for-cliMorris Jobke2015-12-021-7/+7
|\ \ \ \
| * | | | Execute only for web and not for CLILukas Reschke2015-12-021-7/+7
|/ / / /
* | | | Merge pull request #20889 from owncloud/fix-logout-for-bjoernLukas Reschke2015-12-022-1/+9
|\ \ \ \
| * | | | Add a trailing slash to generated URLsLukas Reschke2015-12-021-1/+1
| * | | | Ensure that ownCloud is always accessed with a trailing slashLukas Reschke2015-12-021-0/+8
|/ / / /
* | | | Merge pull request #20884 from owncloud/fix_20713Thomas Müller2015-12-021-1/+3
|\ \ \ \
| * | | | [Sharing] Respect disabled incoming federated sharesRoeland Jago Douma2015-12-021-1/+3