summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-0410-0/+50
* Merge pull request #20545 from owncloud/scan-storage-in-background-jobThomas Müller2015-12-038-145/+280
|\
| * Move files/ajax/scan.php to background jobLukas Reschke2015-11-288-145/+280
* | Fix duplicate use in storage controllerJesús Macias2015-12-031-1/+0
* | Migrate storate status code to storagenotavailablexceptionJesús Macias2015-12-033-11/+9
* | Fix code from PR commentsJesús Macias2015-12-031-21/+1
* | Change exception catch orderJesús Macias2015-12-031-5/+5
* | Delete unnecessary storage status constansJesús Macias2015-12-031-4/+0
* | Add new external storage exceptions for different errorsJesús Macias2015-12-031-38/+24
* | Add different storage status codes managed by StoragedNotAvailableExceptionJesús Macias2015-12-032-4/+42
* | Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the...Thomas Müller2015-12-033-36/+35
|\ \
| * | User IUser::getEMailAddress() all over the placeThomas Müller2015-12-023-36/+35
* | | 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-032-0/+2
* | | | 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-021-3/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Replace old config code with usage of proper APIsMorris Jobke2015-12-021-3/+4
| |/ /
* | | 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