summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8206 from nextcloud/bugfix/noid/fix-collaboration-result-...blizzz2018-02-204-3/+7
|\
| * Better result handling of email searchJoas Schilling2018-02-204-3/+7
* | Merge pull request #8336 from nextcloud/cleanup-unused-parameterRoeland Jago Douma2018-02-206-49/+3
|\ \
| * | Remove fromMailAddress from MailSettingsControllerMorris Jobke2018-02-132-10/+1
| * | Remove config from AutoCompleteControllerMorris Jobke2018-02-132-13/+2
| * | Remove crypto and timefactory from UsersControllerMorris Jobke2018-02-132-26/+0
* | | [tx-robot] updated from transifexNextcloud bot2018-02-2018-14/+158
* | | Merge pull request #8314 from nextcloud/openstackRoeland Jago Douma2018-02-1910-386/+362
|\ \ \
| * | | Use a proper wait for create of the containerRoeland Jago Douma2018-02-192-4/+28
| * | | use more precise method for waiting for swiftRobin Appelman2018-02-191-3/+29
| * | | fix controller testRobin Appelman2018-02-193-3/+5
| * | | adjust swift external storage to new openstack sdkRobin Appelman2018-02-194-198/+150
| * | | adjust swift object storage to new openstack sdkRobin Appelman2018-02-192-212/+184
| * | | switch from rackspace/php-opencloud to php-opencloud/openstackRobin Appelman2018-02-191-0/+0
* | | | Merge pull request #8428 from nextcloud/fix_8189Roeland Jago Douma2018-02-193-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Avatar generation use ttf (for ancient compatibility)Roeland Jago Douma2018-02-191-1/+1
| * | | Add TTF of OpenSand-{Ligh,Semibold}Roeland Jago Douma2018-02-192-0/+0
* | | | Merge pull request #8158 from nextcloud/s3-minioRoeland Jago Douma2018-02-191-7/+4
|\ \ \ \
| * | | | Use a more widely available method to test s3 settingsRobin Appelman2018-02-081-7/+4
* | | | | Merge pull request #8424 from nextcloud/fix/update-appRoeland Jago Douma2018-02-192-2/+2
|\ \ \ \ \
| * | | | | Fix updating an upChristoph Wurst2018-02-192-2/+2
* | | | | | Merge pull request #8426 from nextcloud/refactor/notification-showTempoary-un...Roeland Jago Douma2018-02-191-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove unused var in OC.Notification.showTemporaryChristoph Wurst2018-02-191-1/+0
|/ / / / /
* | | | | Merge pull request #8334 from nextcloud/lib-strict-typingRoeland Jago Douma2018-02-191-6/+9
|\ \ \ \ \
| * | | | | Make lib/autoloader.php strictly typed and properly type hintedMorris Jobke2018-02-131-6/+9
| | |_|/ / | |/| | |
* | | | | Merge pull request #8366 from nextcloud/remove-disable-caching-headersRoeland Jago Douma2018-02-196-13/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use normal header() calls instead of private method callsMorris Jobke2018-02-196-13/+16
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2018-02-1926-48/+102
* | | | [tx-robot] updated from transifexNextcloud bot2018-02-1816-0/+16
* | | | Merge pull request #8411 from nextcloud/add-strict-types-to-oc_appMorris Jobke2018-02-178-98/+81
|\ \ \ \
| * | | | Add remaining type hints, that were already okayMorris Jobke2018-02-171-33/+34
| * | | | Always return a string in OC_App::getCurrentApp and no booleanMorris Jobke2018-02-171-2/+2
| * | | | Use empty array as group list in OC_App::enableMorris Jobke2018-02-172-4/+4
| * | | | Refactor dependencies in setAppTypesMorris Jobke2018-02-171-6/+8
| * | | | Fix app version to be always string and neither array nor nullMorris Jobke2018-02-175-23/+6
| * | | | OC_App::loadApps now only accepts an array as type listMorris Jobke2018-02-173-12/+9
| * | | | Migrate to short array syntaxMorris Jobke2018-02-171-18/+18
* | | | | [tx-robot] updated from transifexNextcloud bot2018-02-1728-10/+324
* | | | | Merge pull request #8232 from nextcloud/bugfix/8007/validate-appinfo-against-...Morris Jobke2018-02-1638-428/+1790
|\ \ \ \ \
| * | | | | App manager is not needed anymoreJoas Schilling2018-02-162-3/+2
| * | | | | Fix info.xml files of shipped appsJoas Schilling2018-02-1622-233/+330
| * | | | | Validate the info.xml against the appstore schema fileJoas Schilling2018-02-1616-195/+1461
* | | | | | Merge pull request #8391 from coder-hugo/feature/mysql_ansi_quotesMorris Jobke2018-02-161-2/+3
|\ \ \ \ \ \
| * | | | | | Don't use double quotes in MySQL queriesRobin Müller2018-02-161-2/+3
* | | | | | | Merge pull request #8396 from nextcloud/fix-typo-in-build-matrix-of-drone-ymlMorris Jobke2018-02-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in build matrix of .drone.ymlDaniel Calviño Sánchez2018-02-161-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #8382 from nextcloud/make-acceptance-tests-for-comments-mo...Morris Jobke2018-02-163-34/+41
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Take into account the comment message when looking for itDaniel Calviño Sánchez2018-02-152-24/+17
| * | | | | | Adjust timeouts in the step to create a new commentDaniel Calviño Sánchez2018-02-151-2/+2
| * | | | | | Move locators above step definitionsDaniel Calviño Sánchez2018-02-151-21/+26