summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add proper linksLukas Reschke2016-07-211-4/+4
* Revert "Remove "Help" link from personal sidebar"Lukas Reschke2016-07-211-4/+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
| * | | Add OCSMiddleware to catch OCS exceptionsRoeland Jago Douma2016-07-206-0/+253
* | | | Merge pull request #461 from nextcloud/session-stylingMorris Jobke2016-07-204-7/+18
|\ \ \ \
| * | | | 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 charsVincent Petry2016-07-202-7/+21
| | |_|/ / | |/| | |
* | | | | Merge pull request #390 from nextcloud/occ-userRoeland Douma2016-07-206-0/+424
|\ \ \ \ \
| * | | | | 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 an icon to set the email instead of a button with stringThomas Müller2016-07-204-6/+11
| * | | | | | Add clipboard button to public share linkThomas Müller2016-07-209-6/+798
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #464 from nextcloud/master-change-load-orderRoeland Douma2016-07-201-1/+4
|\ \ \ \ \ \
| * | | | | | Change load order of auth backends so that we can throw an exception in OCA\D...Thomas Müller2016-07-201-1/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #468 from nextcloud/stringid-fixRoeland Douma2016-07-201-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Cast share id to string (#25402)Vincent Petry2016-07-201-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #473 from nextcloud/ux-improvement-share-dialogMorris Jobke2016-07-201-1/+4
|\ \ \ \ \
| * | | | | only show additional edit permissions for foldersBjoern Schiessle2016-07-201-1/+4
* | | | | | Merge pull request #462 from nextcloud/master-explodeMorris Jobke2016-07-201-1/+1
|\ \ \ \ \ \
| * | | | | | [master] Use explode() instead of split()Lukas Reschke2016-07-201-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #470 from nextcloud/sftp-renameoverwritedirMorris Jobke2016-07-201-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix overwriting folders on rename with SFTPVincent Petry2016-07-201-1/+1
| | |_|/ / | |/| | |