summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix apps/Joas Schilling2016-07-21679-1162/+2017
|
* Merge pull request #506 from nextcloud/update-mailmapJoas Schilling2016-07-211-7/+8
|\ | | | | Fix more mailmap entries
| * 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 mailmap
| * 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 place
| * 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
|\ \ | | | | | | [master] Reenable help section
| * | Add proper linksLukas Reschke2016-07-211-4/+4
| | |
| * | Revert "Remove "Help" link from personal sidebar"Lukas Reschke2016-07-211-4/+2
| | | | | | | | | | | | This reverts commit deef15a3c7119b2965e7212ce53ba70e6baed779.
* | | Merge pull request #486 from nextcloud/master-link-properMorris Jobke2016-07-211-1/+1
|\ \ \ | | | | | | | | [master] Properly link to nextcloud
| * | | [master] Properly link to nextcloudLukas Reschke2016-07-211-1/+1
| |/ /
* | | Merge pull request #488 from nextcloud/brand-to-nextcloudMorris Jobke2016-07-211-2/+2
|\ \ \ | |/ / |/| | [master] Use proper branding
| * | Use proper brandingLukas Reschke2016-07-211-2/+2
|/ / | | | | | | Stable9 has this already
* | 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 ↵Lukas Reschke2016-07-212-1/+19
| | | | | | | | https://github.com/nextcloud/server/commit/2d373416d8e54a7de84879a365c372a85104c6df to master
* | Add ownCloud certLukas Reschke2016-07-211-0/+66
| |
* | Use proper certificatesLukas Reschke2016-07-213-87/+77
| | | | | | | | Ports https://github.com/nextcloud/server/commit/bcf693539be82e872ba4d6cceb1f430a4bb841d9
* | Merge pull request #483 from nextcloud/use-proper-documentation-linksLukas Reschke2016-07-211-2/+2
|\ \ | | | | | | Use proper documentation links
| * | Use proper documentation linksLukas Reschke2016-07-211-2/+2
|/ / | | | | | | Since it is just faking the 10 we need to hardcode this here...
* | 10.0 beta it isLukas Reschke2016-07-211-1/+1
| |
* | Merge pull request #479 from nextcloud/add-bruteforce-throttlerLukas Reschke2016-07-2125-68/+701
|\ \ | | | | | | Implement brute force protection
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | Class Throttler implements the bruteforce protection for security actions in Nextcloud. It is working by logging invalid login attempts to the database and slowing down all login attempts from the same subnet. The max delay is 30 seconds and the starting delay are 200 milliseconds. (after the first failed login)
* | | Merge pull request #476 from nextcloud/port-same-site-cookiesLukas Reschke2016-07-2012-95/+634
|\ \ \ | | | | | | | | [master] Port Same-Site Cookies to master
| * | | [master] Port Same-Site Cookies to masterLukas Reschke2016-07-2012-95/+634
| |/ / | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/50
* | | Merge pull request #466 from nextcloud/escape-special-charactersLukas Reschke2016-07-206-8/+10
|\ \ \ | | | | | | | | Escape special characters (#25429)
| * | | Escape special characters (#25429)Aaron Wood2016-07-206-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Use correct method in the AbstractMapping class * Change the getNamesBySearch method so that input can be properly escaped while still supporting matches * Don't escape hardcoded wildcard
* | | | Merge pull request #475 from nextcloud/ocs-middlewareRoeland Douma2016-07-208-0/+363
|\ \ \ \ | | | | | | | | | | Add OCS Middleware
| * | | | Deprecate \OCP\APIRoeland Jago Douma2016-07-201-0/+2
| | | | |
| * | | | Add unit testsRoeland Jago Douma2016-07-201-0/+108
| | | | |
| * | | | Add OCSMiddleware to catch OCS exceptionsRoeland Jago Douma2016-07-206-0/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * OCSException * OCSBadRequestException * OCSForbiddenException * OCSNotFoundException
* | | | | Merge pull request #461 from nextcloud/session-stylingMorris Jobke2016-07-204-7/+18
|\ \ \ \ \ | | | | | | | | | | | | Minor sessions/app password improvements
| * | | | | sort tokensRobin Appelman2016-07-202-3/+9
| | | | | |
| * | | | | right allign last activityRobin Appelman2016-07-201-0/+5
| | | | | |
| * | | | | fix apppassword table with only a few entries being strechedRobin Appelman2016-07-201-1/+1
| | | | | |
| * | | | | Change "recent activity" to "last activity"Robin Appelman2016-07-201-2/+2
| | | | | |
| * | | | | improve matching safari user agentRobin Appelman2016-07-201-1/+1
| | | | | |
* | | | | | Merge pull request #471 from nextcloud/storage-fopenspecialcharsMorris Jobke2016-07-202-7/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added storage tests for fopen with special chars
| * | | | | | Added storage tests for fopen with special charsVincent Petry2016-07-202-7/+21
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to test special chars with unit tests. There is already a test for directories but there was none for file names.
* | | | | | Merge pull request #390 from nextcloud/occ-userRoeland Douma2016-07-206-0/+424
|\ \ \ \ \ \ | | | | | | | | | | | | | | More occ user management commands
| * | | | | | add occ command to show user informationRobin Appelman2016-07-192-0/+89
| | | | | | |
| * | | | | | Add commands to add/remove users to/from groupsRobin Appelman2016-07-193-0/+156
| | | | | | |
| * | | | | | add command to list groupsRobin Appelman2016-07-192-0/+91
| | | | | | |
| * | | | | | add occ command to list usersRobin Appelman2016-07-192-0/+88
| | | | | | |
* | | | | | | Merge pull request #467 from nextcloud/use-clipboard-apiRoeland Douma2016-07-2011-12/+809
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use clipboard api