summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* New LDAPProvider for user_ldaproot2016-07-2226-98/+1074
* [tx-robot] updated from transifexNextcloud bot2016-07-22114-174/+200
* Merge pull request #505 from nextcloud/fix-license-scriptMorris Jobke2016-07-211-4/+8
|\
| * only search the license header for @copyright statementsBjoern Schiessle2016-07-211-2/+3
| * Fix the license scriptJoas Schilling2016-07-211-2/+5
* | Merge pull request #496 from nextcloud/fix-config-generationMorris Jobke2016-07-212-7/+7
|\ \
| * | Change the app nameJoas Schilling2016-07-211-1/+1
| * | Make the changes from https://github.com/nextcloud/documentation/commit/6ccd2...Joas Schilling2016-07-211-6/+6
* | | Merge pull request #507 from nextcloud/run-le-scriptMorris Jobke2016-07-211487-2939/+5010
|\ \ \
| * | | Update with robinJoas Schilling2016-07-21543-539/+809
| * | | Fix othersJoas Schilling2016-07-21793-1261/+2207
| * | | Fix apps/Joas Schilling2016-07-21679-1162/+2017
| | |/ | |/|
* | | Merge pull request #374 from lpszBuffer/masterWilliam Bargent2016-07-213-7/+27
|\ \ \
| * | | Alters 'No Internet Connection' error message. #181Derek2016-07-203-7/+27
* | | | Merge pull request #480 from nextcloud/fix_ocs_response_formatLukas Reschke2016-07-214-6/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | AppFramework do not get default responseRoeland Jago Douma2016-07-204-6/+25
* | | | Merge pull request #506 from nextcloud/update-mailmapJoas Schilling2016-07-211-7/+8
|\ \ \ \
| * | | | Fix more mailmap entriesJoas Schilling2016-07-211-7/+8
|/ / / /
* | | | Merge pull request #501 from nextcloud/mailmapBjörn Schießle2016-07-211-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix e-mail in mailmapRoeland Jago Douma2016-07-211-2/+2
|/ / /
* | | Merge pull request #477 from nextcloud/fix-layout-public-uploadMorris Jobke2016-07-211-1/+1
|\ \ \
| * | | move closing div to the right placeBjoern Schiessle2016-07-201-1/+1
* | | | Merge pull request #484 from nextcloud/reenable-help-sectionMorris Jobke2016-07-212-8/+6
|\ \ \ \
| * | | | Add proper linksLukas Reschke2016-07-211-4/+4
| * | | | Revert "Remove "Help" link from personal sidebar"Lukas Reschke2016-07-211-4/+2
* | | | | Merge pull request #486 from nextcloud/master-link-properMorris Jobke2016-07-211-1/+1
|\ \ \ \ \
| * | | | | [master] Properly link to nextcloudLukas Reschke2016-07-211-1/+1
| |/ / / /
* | | | | Merge pull request #488 from nextcloud/brand-to-nextcloudMorris Jobke2016-07-211-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use proper brandingLukas Reschke2016-07-211-2/+2
|/ / / /
* | | | Merge branch 'master' of https://github.com/nextcloud/serverLukas Reschke2016-07-2124-30/+182
|\ \ \ \
| * | | | [tx-robot] updated from transifexNextcloud bot2016-07-2124-30/+182
* | | | | Fix typoLukas Reschke2016-07-211-1/+1
|/ / / /
* | | | Link to proper clientsLukas Reschke2016-07-211-4/+3
* | | | Port https://github.com/nextcloud/server/commit/2d373416d8e54a7de84879a365c37...Lukas Reschke2016-07-212-1/+19
* | | | Add ownCloud certLukas Reschke2016-07-211-0/+66
* | | | Use proper certificatesLukas Reschke2016-07-213-87/+77
* | | | Merge pull request #483 from nextcloud/use-proper-documentation-linksLukas Reschke2016-07-211-2/+2
|\ \ \ \
| * | | | Use proper documentation linksLukas Reschke2016-07-211-2/+2
|/ / / /
* | | | 10.0 beta it isLukas Reschke2016-07-211-1/+1
* | | | Merge pull request #479 from nextcloud/add-bruteforce-throttlerLukas Reschke2016-07-2125-68/+701
|\ \ \ \ | |_|/ / |/| | |
| * | | Mitigate race conditionLukas Reschke2016-07-204-11/+57
| * | | JSON encode the valuesLukas Reschke2016-07-201-1/+1
| * | | Implement brute force protectionLukas Reschke2016-07-2025-68/+655
* | | | Merge pull request #476 from nextcloud/port-same-site-cookiesLukas Reschke2016-07-2012-95/+634
|\ \ \ \
| * | | | [master] Port Same-Site Cookies to masterLukas Reschke2016-07-2012-95/+634
| |/ / /
* | | | Merge pull request #466 from nextcloud/escape-special-charactersLukas Reschke2016-07-206-8/+10
|\ \ \ \
| * | | | Escape special characters (#25429)Aaron Wood2016-07-206-8/+10
* | | | | Merge pull request #475 from nextcloud/ocs-middlewareRoeland Douma2016-07-208-0/+363
|\ \ \ \ \
| * | | | | Deprecate \OCP\APIRoeland Jago Douma2016-07-201-0/+2
| * | | | | Add unit testsRoeland Jago Douma2016-07-201-0/+108