summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structureMorris Jobke2017-11-061-2/+11
|\ | | | | Implement plugins infrastructure in User_LDAP
| * Plugins infrastructure in User_LDAPVinicius Cubas Brand2017-11-031-2/+11
| | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-061-0/+2
|\ \ | |/ |/| Enhance calendar invitation emails
| * Make L10N->l provide weekdayNameGeorg Ehrke2017-11-031-0/+2
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorageRoeland Jago Douma2017-11-021-2/+22
|\ \ | | | | | | Fix seeking on object storage
| * | Fix seeking on object storageMorris Jobke2017-10-271-2/+22
| | | | | | | | | | | | | | | | | | Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge branch 'master' into autocomplete-guiArthur Schiwon2017-11-0129-110/+350
|\ \ \
| * \ \ Merge pull request #6958 from ↵Joas Schilling2017-11-012-1/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/improved-mimetype-detection-for-object-storage Improve mimetype detection for object storages
| | * | | Improve mimetype detection for object storagesMorris Jobke2017-10-262-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Merge pull request #6975 from nextcloud/s3-read-object-fopenJoas Schilling2017-11-011-5/+8
| |\ \ \ \ | | |_|_|/ | |/| | | use fopen directly when reading objects from s3
| | * | | use fopen directly when reading objects from s3Robin Appelman2017-10-271-5/+8
| | | |/ | | |/| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Merge pull request #6952 from nextcloud/correctly-search-for-resultsJoas Schilling2017-10-311-3/+5
| |\ \ \ | | | | | | | | | | Correctly search for existing collaboration results
| | * | | Add unit tests for SearchResultJoas Schilling2017-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | Correctly search for existing collaboration resultsJoas Schilling2017-10-251-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Merge pull request #7021 from nextcloud/fix-oracle-indexesJoas Schilling2017-10-313-69/+120
| |\ \ \ \ | | | | | | | | | | | | Fix oracle indexes
| | * | | | Die NoCheckMigratorVictor Dubiniuk2017-10-303-41/+2
| | | | | |
| | * | | | Add foreign key support to OCPiotr Mrowczynski2017-10-301-4/+36
| | | | | |
| | * | | | quote index columns on oracle, handle all index changes, minor phpdoc cleanupJörn Friedrich Dreyer2017-10-301-27/+85
| | | | | |
| * | | | | Merge pull request #7004 from Fiech/masterRoeland Jago Douma2017-10-301-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | Extended list of sensitive configuration values
| | * | | | Extended list of sensitive configuration valuesJohannes Schlichenmaier2017-10-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In accordance with the issuetemplate app issue: https://github.com/nextcloud/issuetemplate/issues/27 Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
| * | | | | Merge pull request #6867 from nextcloud/imessage-attachmentsGeorg Ehrke2017-10-303-0/+112
| |\ \ \ \ \ | | | | | | | | | | | | | | Add attachment support to emails
| | * | | | | Move attachment creators to mailer classJoas Schilling2017-10-252-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | | | Fix docsJoas Schilling2017-10-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | | | Extend the API with teh parameters from SwiftJoas Schilling2017-10-191-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | | | Add attachment support to emailsJoas Schilling2017-10-182-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Use ::class and fix missing docJoas Schilling2017-10-281-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Merge pull request #6977 from Fiech/masterJoas Schilling2017-10-271-0/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Added additional methods for removal of sensitive info
| | * | | | Added additional methods for removal of sensitive infoJohannes Schlichenmaier2017-10-271-0/+6
| | | |_|/ | | |/| | | | | | | | | | | | Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
| * / | | Use local cache for the CachingRouterRoeland Jago Douma2017-10-251-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to cache routes distributed. It even has the downside that the router might return different routes then the ones in the local routes.php files. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Merge pull request #6918 from nextcloud/rotate_job_by_defaultRoeland Jago Douma2017-10-243-1/+53
| |\ \ \ | | | | | | | | | | Add logrote as a default background job
| | * | | Add logrote as a default background jobRoeland Jago Douma2017-10-243-1/+53
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Merge pull request #6921 from nextcloud/appmanager-securitymiddlewareRoeland Jago Douma2017-10-242-3/+10
| |\ \ \ \ | | | | | | | | | | | | Use proper DI for security middleware for app enabled check
| | * | | | Use proper DI for security middleware for app enabled checkMorris Jobke2017-10-242-3/+10
| | | |_|/ | | |/| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Merge pull request #6928 from nextcloud/remove-unneeded-methodMorris Jobke2017-10-241-15/+0
| |\ \ \ \ | | | | | | | | | | | | Remove unused method of OC_App
| | * | | | Remove unused method of OC_AppMorris Jobke2017-10-241-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Deprecate OC_App:isEnabledMorris Jobke2017-10-241-0/+1
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Merge pull request #6920 from nextcloud/appmanager-usageMorris Jobke2017-10-243-3/+3
| |\ \ \ \ | | |_|/ / | |/| | | Use appmanager instead of OC_App for check for enabled app
| | * | | Use appmanager instead of OC_App for check for enabled appMorris Jobke2017-10-233-3/+3
| | |/ / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Revert copyright changesJulius Härtl2017-10-234-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Doc: Fix phpDoc issuesJulius Härtl2017-10-2311-12/+9
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | simplify registration of manager in server containerArthur Schiwon2017-10-311-5/+3
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | fix comment sorterArthur Schiwon2017-10-301-76/+0
| | | | | | | | | | | | | | | | | | | | | background: we have a flat hierarchy of comments, not a tree. therefore we can also remove again the unnecessary additions. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | fix sortingArthur Schiwon2017-10-261-1/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | split walking the tree from operating on itArthur Schiwon2017-10-221-14/+25
| | | | | | | | | | | | | | | | | | so walking it is reusable Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | AutoCompletion backendArthur Schiwon2017-10-225-1/+161
|/ / | | | | | | | | | | | | | | | | | | * introduce a Controller for requests * introduce result sorting mechanism * extend Comments to retrieve commentors (actors) in a tree * add commenters sorter * add share recipients sorter Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #6853 from nextcloud/apps_autoloaderLukas Reschke2017-10-191-4/+12
|\ \ | |/ |/| Allow apps to have their own autoloader
| * Allow apps to have their own autoloaderRoeland Jago Douma2017-10-171-4/+12
| | | | | | | | | | | | | | | | | | | | This will allow apps to also have a proper classmap and authorative autoloader. Currently if a file: <appdir>/composer/autoload.php exists we will use it. Else we keep the current behavior. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Set the data from the templateJoas Schilling2017-10-181-3/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Introduce a public interface for MessageJoas Schilling2017-10-182-4/+18
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Set the subject with the email template to allow themingJoas Schilling2017-10-181-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>