summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structureMorris Jobke2017-11-063-3/+74
|\
| * User_LDAP plugins: smaller fixesVinicius Cubas Brand2017-11-031-0/+7
| * Plugins infrastructure in User_LDAPVinicius Cubas Brand2017-11-033-3/+67
* | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-061-0/+2
|\ \
| * | Make L10N->l provide weekdayNameGeorg Ehrke2017-11-031-0/+2
* | | [tx-robot] updated from transifexNextcloud bot2017-11-064-64/+84
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2017-11-034-0/+1032
* | Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorageRoeland Jago Douma2017-11-021-2/+22
|\ \
| * | Fix seeking on object storageMorris Jobke2017-10-271-2/+22
* | | Update autoloaderRoeland Jago Douma2017-11-022-0/+2
* | | Merge branch 'master' into autocomplete-guiArthur Schiwon2017-11-0160-132/+1114
|\ \ \
| * \ \ Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-objec...Joas Schilling2017-11-012-1/+13
| |\ \ \
| | * | | Improve mimetype detection for object storagesMorris Jobke2017-10-262-1/+13
| * | | | Merge pull request #6975 from nextcloud/s3-read-object-fopenJoas Schilling2017-11-011-5/+8
| |\ \ \ \
| | * | | | use fopen directly when reading objects from s3Robin Appelman2017-10-271-5/+8
| | | |/ / | | |/| |
| * | | | [tx-robot] updated from transifexNextcloud bot2017-11-012-0/+18
| | |_|/ | |/| |
| * | | Merge pull request #6952 from nextcloud/correctly-search-for-resultsJoas Schilling2017-10-311-3/+5
| |\ \ \
| | * | | Add unit tests for SearchResultJoas Schilling2017-10-251-1/+1
| | * | | Correctly search for existing collaboration resultsJoas Schilling2017-10-251-2/+4
| * | | | Merge pull request #7021 from nextcloud/fix-oracle-indexesJoas Schilling2017-10-315-71/+120
| |\ \ \ \
| | * | | | Rebuild autoloaderJoas Schilling2017-10-302-2/+0
| | * | | | 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
| * | | | | [tx-robot] updated from transifexNextcloud bot2017-10-312-0/+18
| * | | | | Merge pull request #7004 from Fiech/masterRoeland Jago Douma2017-10-301-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Extended list of sensitive configuration valuesJohannes Schlichenmaier2017-10-291-0/+8
| * | | | | Merge pull request #6867 from nextcloud/imessage-attachmentsGeorg Ehrke2017-10-308-1/+195
| |\ \ \ \ \
| | * | | | | Move attachment creators to mailer classJoas Schilling2017-10-254-38/+39
| | * | | | | Fix docsJoas Schilling2017-10-192-8/+8
| | * | | | | Extend the API with teh parameters from SwiftJoas Schilling2017-10-192-3/+27
| | * | | | | Add attachment support to emailsJoas Schilling2017-10-186-1/+170
| * | | | | | Merge pull request #6932 from nextcloud/constants-for-talk-useragentsRoeland Jago Douma2017-10-301-0/+10
| |\ \ \ \ \ \
| | * | | | | | Define constants for the talk user agentsJoas Schilling2017-10-241-0/+10
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #6992 from nextcloud/2-lines-for-better-codeMorris Jobke2017-10-301-1/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Use ::class and fix missing docJoas Schilling2017-10-281-1/+2
| * | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-294-2/+16
| |/ / / / /
| * | | | | Merge pull request #6977 from Fiech/masterJoas Schilling2017-10-271-0/+6
| |\ \ \ \ \
| | * | | | | Added additional methods for removal of sensitive infoJohannes Schlichenmaier2017-10-271-0/+6
| | | |_|_|/ | | |/| | |
| * | | | | [tx-robot] updated from transifexNextcloud bot2017-10-272-0/+20
| | |_|_|/ | |/| | |
| * | | | Merge pull request #6949 from nextcloud/cachingrouter_localRoeland Jago Douma2017-10-261-2/+2
| |\ \ \ \
| | * | | | Use local cache for the CachingRouterRoeland Jago Douma2017-10-251-2/+2
| | |/ / /
| * / / / [tx-robot] updated from transifexNextcloud bot2017-10-262-0/+18
| |/ / /
| * | | [tx-robot] updated from transifexNextcloud bot2017-10-254-0/+16
| * | | Merge pull request #6918 from nextcloud/rotate_job_by_defaultRoeland Jago Douma2017-10-246-14/+55
| |\ \ \
| | * | | Update autoloaderRoeland Jago Douma2017-10-242-0/+2
| | * | | Add logrote as a default background jobRoeland Jago Douma2017-10-244-14/+53
| * | | | Merge pull request #6921 from nextcloud/appmanager-securitymiddlewareRoeland Jago Douma2017-10-242-3/+10
| |\ \ \ \
| | * | | | Use proper DI for security middleware for app enabled checkMorris Jobke2017-10-242-3/+10
| | | |/ / | | |/| |
| * | | | Merge pull request #6928 from nextcloud/remove-unneeded-methodMorris Jobke2017-10-241-15/+0
| |\ \ \ \