summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* User IUser::getEMailAddress() all over the placeThomas Müller2015-12-023-36/+35
* Merge pull request #20719 from owncloud/adding-system-addressbook-of-usersThomas Müller2015-12-0217-42/+779
|\
| * Fix endless recursionThomas Müller2015-12-021-3/+15
| * Fix update of avatar imageThomas Müller2015-12-022-33/+49
| * Fix commentsThomas Müller2015-12-022-4/+4
| * Proposal: add enumeration function to IUserManager which simply calls a callb...Thomas Müller2015-12-021-20/+17
| * 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-023-19/+7
| * 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-021-4/+9
| * Adding system addressbook for users of this instance - a occ command is suppl...Thomas Müller2015-12-026-2/+181
* | Merge pull request #20875 from owncloud/remove-changepropagatorThomas Müller2015-12-024-524/+0
|\ \
| * | remove old propagation logicRobin Appelman2015-12-014-524/+0
* | | 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
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-12-028-4/+28
|/
* Merge pull request #20710 from owncloud/files_external_config_commandThomas Müller2015-12-014-0/+220
|\
| * return non 0 status code in case of missing mountRobin Appelman2015-12-011-1/+1
| * Add command to set mount options for external storagesRobin Appelman2015-12-014-10/+114
| * Add command to get and set config for external mountsRobin Appelman2015-12-012-0/+116
* | Revert "Fix column width of mtime column"Morris Jobke2015-12-011-2/+2
|/
* Merge pull request #20825 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-016-9/+9
|\
| * Adjust patchesThomas Müller2015-11-303-6/+6
| * Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-11-305-6/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-012-0/+6
|/
* Merge pull request #20842 from owncloud/fix-date-time-columnThomas Müller2015-11-301-2/+2
|\
| * Fix column width of mtime columnMorris Jobke2015-11-301-2/+2
* | Merge pull request #20487 from owncloud/activity-oracle-sql-error-for-favoritesThomas Müller2015-11-303-18/+50
|\ \
| * | Inject the database connectionJoas Schilling2015-11-303-2/+16
| * | Only require the interfaceJoas Schilling2015-11-302-10/+10
| * | Add a unit test that executes the queryJoas Schilling2015-11-301-0/+15
| * | Correctly escape the paths so we only display favorites instead of wildcardsJoas Schilling2015-11-301-1/+1
| * | Oracle can not return statements but only valuesJoas Schilling2015-11-302-7/+10
* | | Merge pull request #20843 from owncloud/fix-share-with-inputThomas Müller2015-11-301-1/+1
|\ \ \ | |/ / |/| |
| * | Fix the width of the share with inputMorris Jobke2015-11-301-1/+1
| |/
* | Merge pull request #20837 from owncloud/fix-mountoptions-dropdownThomas Müller2015-11-301-1/+0
|\ \ | |/ |/|
| * Fix ext storage mount options dropdownVincent Petry2015-11-301-1/+0
* | Merge pull request #20688 from owncloud/publiclink-getdownloadurl-webdavThomas Müller2015-11-302-7/+10
|\ \
| * | Fix public link getDownloadUrl to return Webdav public linkVincent Petry2015-11-252-7/+10
* | | More group DBThomas Müller2015-11-301-0/+7
* | | Add DB group to some files_external testsThomas Müller2015-11-3016-1/+113
* | | Adding more DB groups to test suitsThomas Müller2015-11-3011-4/+70
* | | External storage tests require DB as wellThomas Müller2015-11-3010-0/+70
* | | Adding more test suites to group DBThomas Müller2015-11-301-0/+7
* | | Prevent redefinition warning of PHPUNIT_RUNThomas Müller2015-11-301-1/+3