Roeland Jago Douma
a08e201d19
Fix e-mail in mailmap
2016-07-22 11:20:57 +02:00
Joas Schilling
2d5a854f45
Fix more mailmap entries
2016-07-22 11:20:57 +02:00
Bjoern Schiessle
d3a11e9cf1
only search the license header for @copyright statements
2016-07-22 11:20:57 +02:00
Joas Schilling
3f4db2d02b
Fix the license script
2016-07-22 11:20:54 +02:00
Roeland Douma
49a4654150
Merge pull request #512 from nextcloud/backport-496-doc-fix-10
...
[stable10] Make the changes from doc fix persistant
2016-07-22 11:12:19 +02:00
Joas Schilling
413968d4ba
FIx typo
2016-07-22 09:54:03 +02:00
Joas Schilling
f4fbdbabee
Change the app name
2016-07-22 09:24:59 +02:00
Joas Schilling
c8c78fd981
Make the changes from 6ccd2c5678
persistant
2016-07-22 09:23:50 +02:00
Roeland Jago Douma
2abd83212e
AppFramework do not get default response
...
The OCSResponse differs from other responses in that it defaults to
XML. However we fell back to json by default.
This makes sure that if nothing is set we don't pass anything.
Which defaults then to the controllers default (which is often 'json')
but in the case of the OCSResponse 'xml'.
2016-07-21 20:32:48 +02:00
Morris Jobke
b4c7eb5326
Merge pull request #495 from nextcloud/fix-layout-public-upload-stable10
...
[stable10] move closing div to the right place
2016-07-21 19:50:42 +02:00
Bjoern Schiessle
f98bc936d7
move closing div to the right place
2016-07-21 11:30:37 +02:00
Morris Jobke
d8b9672ad8
Merge pull request #485 from nextcloud/stable10-reenable-help-section
...
[Stable10] reenable help section
2016-07-21 09:18:50 +02:00
Morris Jobke
db5a709885
Merge pull request #487 from nextcloud/stable10-link-proper
...
[stable10] Properly link to nextcloud
2016-07-21 09:18:10 +02:00
Morris Jobke
cb08ab7c00
Merge pull request #489 from nextcloud/stable10-brand-to-nextcloud
...
[stable10] Use proper branding
2016-07-21 09:17:22 +02:00
Lukas Reschke
0caeb31d83
Use proper branding
...
Stable9 has this already
2016-07-21 02:21:28 +02:00
Lukas Reschke
10f3178215
[master] Properly link to nextcloud
2016-07-21 02:15:37 +02:00
Lukas Reschke
ed21916999
Add proper links
2016-07-21 02:11:34 +02:00
Lukas Reschke
305534225e
Revert "Remove "Help" link from personal sidebar"
...
This reverts commit deef15a3c7
.
2016-07-21 02:11:30 +02:00
Lukas Reschke
decfd1ab59
Link to proper clients
2016-07-21 01:57:03 +02:00
Lukas Reschke
d4f9a69a72
Port 2d37341
to stable10
2016-07-21 01:46:11 +02:00
Lukas Reschke
fb006181ad
Add ownCloud cert
2016-07-21 01:35:23 +02:00
Lukas Reschke
96c2b0de66
Use proper certificates
...
Ports bcf693539b
2016-07-21 01:35:19 +02:00
Lukas Reschke
acb820ffb8
Merge pull request #483 from nextcloud/use-proper-documentation-links
...
Use proper documentation links
2016-07-21 00:47:27 +02:00
Lukas Reschke
9a1ff29351
Use proper documentation links
...
Since it is just faking the 10 we need to hardcode this here...
2016-07-21 00:36:52 +02:00
Lukas Reschke
2d52cc9fe0
10.0 beta it is
2016-07-21 00:32:43 +02:00
Lukas Reschke
c385423d10
Merge pull request #479 from nextcloud/add-bruteforce-throttler
...
Implement brute force protection
2016-07-21 00:31:02 +02:00
Lukas Reschke
c1589f163c
Mitigate race condition
2016-07-20 23:09:27 +02:00
Lukas Reschke
adf67fac96
JSON encode the values
2016-07-20 22:47:33 +02:00
Lukas Reschke
ba4f12baa0
Implement brute force protection
...
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)
2016-07-20 22:08:56 +02:00
Lukas Reschke
020a2a6958
Merge pull request #476 from nextcloud/port-same-site-cookies
...
[master] Port Same-Site Cookies to master
2016-07-20 21:35:02 +02:00
Lukas Reschke
a17ba2f488
Merge pull request #466 from nextcloud/escape-special-characters
...
Escape special characters (#25429 )
2016-07-20 21:24:19 +02:00
Roeland Douma
78cad699fe
Merge pull request #475 from nextcloud/ocs-middleware
...
Add OCS Middleware
2016-07-20 21:04:25 +02:00
Morris Jobke
9a7b27b238
Merge pull request #461 from nextcloud/session-styling
...
Minor sessions/app password improvements
2016-07-20 20:57:06 +02:00
Morris Jobke
e08278494d
Merge pull request #471 from nextcloud/storage-fopenspecialchars
...
Added storage tests for fopen with special chars
2016-07-20 20:56:59 +02:00
Roeland Douma
1088916eda
Merge pull request #390 from nextcloud/occ-user
...
More occ user management commands
2016-07-20 20:36:33 +02:00
Roeland Douma
9f219f55f2
Merge pull request #467 from nextcloud/use-clipboard-api
...
Use clipboard api
2016-07-20 20:11:08 +02:00
Roeland Douma
26cf51403e
Merge pull request #464 from nextcloud/master-change-load-order
...
[master] Change load order of auth backends so that we can throw an exception …
2016-07-20 20:08:22 +02:00
Roeland Douma
ffc345b141
Merge pull request #468 from nextcloud/stringid-fix
...
Cast share id to string (#25402 )
2016-07-20 20:06:46 +02:00
Roeland Jago Douma
cff5be3d63
Deprecate \OCP\API
2016-07-20 20:03:53 +02:00
Roeland Jago Douma
5f32b57332
Add unit tests
2016-07-20 20:03:49 +02:00
Roeland Jago Douma
ea47974a08
Add OCSMiddleware to catch OCS exceptions
...
* OCSException
* OCSBadRequestException
* OCSForbiddenException
* OCSNotFoundException
2016-07-20 20:03:49 +02:00
Lukas Reschke
a299fa38a9
[master] Port Same-Site Cookies to master
...
Fixes https://github.com/nextcloud/server/issues/50
2016-07-20 18:37:57 +02:00
Morris Jobke
032e6b1701
Merge pull request #473 from nextcloud/ux-improvement-share-dialog
...
only show additional edit permissions for folders
2016-07-20 18:34:55 +02:00
Morris Jobke
e9c85e02ac
Merge pull request #462 from nextcloud/master-explode
...
[master] Use explode() instead of split()
2016-07-20 18:31:11 +02:00
Morris Jobke
e2abe70514
Merge pull request #470 from nextcloud/sftp-renameoverwritedir
...
Fix overwriting folders on rename with SFTP
2016-07-20 18:31:06 +02:00
Björn Schießle
7cdf6402ff
Merge pull request #472 from nextcloud/show-app-name-in-errormsg
...
Show app name in error message if app could not be loaded. (#25441 )
2016-07-20 18:20:49 +02:00
Morris Jobke
1264e9644f
Merge pull request #402 from nextcloud/smb-notifications
...
smb update notifications
2016-07-20 16:19:21 +02:00
Robin Appelman
2ba5785d68
sort tokens
2016-07-20 15:59:00 +02:00
Bjoern Schiessle
77d2338bd2
only show additional edit permissions for folders
2016-07-20 15:24:51 +02:00
Klaas Freitag
99316ec02c
Show app name in error message if app could not be loaded. ( #25441 )
2016-07-20 15:16:16 +02:00