wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33467 commits 157 branches 562 tags 714 MiB
Commit graph

12234 commits

Author SHA1 Message Date
Morris Jobke
88cbde6a66 Merge pull request #550 from nextcloud/ldap-integration-test-autoloader 
fix autoloading in LPAP integration tests, resolves #544
 2016-07-25 12:54:50 +02:00
Joas Schilling
4ad0c383ad Merge pull request #523 from Faldon/master 
Renamed file logging
 2016-07-25 11:41:24 +02:00
Arthur Schiwon
686cb599b6
fix autoloading in LPAP integration tests, resolves #544 2016-07-25 11:05:59 +02:00
Morris Jobke
de4236bc4a Merge pull request #530 from nextcloud/fix-theme-loading 
Make sure we try to autoload the class
 2016-07-25 08:37:13 +02:00
Nextcloud bot
7d969962db
[tx-robot] updated from transifex 2016-07-25 00:09:09 +00:00
Nextcloud bot
a20f4c432b
[tx-robot] updated from transifex 2016-07-24 00:09:10 +00:00
Robin Appelman
681ac9f19f Check if an app provide two-factor-auth providers before we try to use them 2016-07-23 13:26:57 +02:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +00:00
Joas Schilling
8cea95390d
Make sure we try to autoload the class 2016-07-22 16:49:33 +02:00
Thomas Pulzer
b058639a8a Changed code style and made use of '===' comparison. 2016-07-22 14:45:33 +02:00
Thomas Pulzer
32f5073f9f Reverted the default syslog tag to avoid breaking existing systems. 2016-07-22 14:38:44 +02:00
Roeland Jago Douma
b543fd8d30
Set proper status code in OCS AppFramework Middleware 2016-07-22 12:53:47 +02:00
Thomas Pulzer
ba3f4f118e Changed logtype to file instead of owncloud. 
- Updated the config sample to point to log_type='file'
- Renamed the Class for logfile logging to File in namespace 'OC\Log\'.
  Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'.
- Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'.
  Changed registration of the command to use 'OC\Core\Command\Log\File'.
- Changed default Syslog tag to Nextcloud
- Retained backwards compatibility for configs with 'logtype' => 'owncloud'

- Adjusted tests for the new file log.

Closes #490.
 2016-07-22 11:44:19 +02:00
Nextcloud bot
4b4990c48f
[tx-robot] updated from transifex 2016-07-22 00:10:05 +00:00
Morris Jobke
8c7d7d7746 Merge pull request #507 from nextcloud/run-le-script 
Update emails and license headers with latest changes
 2016-07-21 23:27:15 +02:00
Lukas Reschke
562e63cf69 Merge pull request #480 from nextcloud/fix_ocs_response_format 
AppFramework default response for OCS is xml
 2016-07-21 19:52:17 +02:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
ba87db3fcc
Fix others 2016-07-21 18:13:57 +02:00
Lukas Reschke
4f42c3d725
Revert "Remove "Help" link from personal sidebar" 
This reverts commit deef15a3c7.
 2016-07-21 02:25:00 +02:00
Lukas Reschke
01ab40f557
Merge branch 'master' of https://github.com/nextcloud/server 2016-07-21 02:24:06 +02:00
Lukas Reschke
a9f2789df5
Fix typo 2016-07-21 02:23:42 +02:00
Nextcloud bot
b7c5a59adf
[tx-robot] updated from transifex 2016-07-21 00:09:07 +00:00
Lukas Reschke
7c6896f091
Link to proper clients 2016-07-21 01:56:47 +02:00
Lukas Reschke
19f770d0db
Port 2d373416d8 to master 2016-07-21 01:43:32 +02:00
Lukas Reschke
977db0a162
Use proper certificates 
Ports bcf693539b
 2016-07-21 01:34:11 +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
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
Roeland Jago Douma
e42f2f2650
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-20 22:05:43 +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 Jago Douma
cff5be3d63
Deprecate \OCP\API 2016-07-20 20:03:53 +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
e9c85e02ac Merge pull request #462 from nextcloud/master-explode 
[master] Use explode() instead of split()
 2016-07-20 18:31:11 +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
Klaas Freitag
99316ec02c
Show app name in error message if app could not be loaded. (#25441) 2016-07-20 15:16:16 +02:00
Aaron Wood
7c0de08cc4
Escape special characters (#25429) 
* 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
 2016-07-20 14:46:47 +02:00
Lukas Reschke
4f90447150
[master] Use explode() instead of split() 
Sync from https://github.com/owncloud/core/pull/25488
 2016-07-20 14:36:39 +02:00
Björn Schießle
8735a05d93 Merge pull request #441 from nextcloud/fix-maintenance-mode 
Fix maintenance mode
 2016-07-19 16:59:24 +02:00
Roeland Douma
13a25535d2 Merge pull request #400 from nextcloud/ocs_appframework 
OCS routes use AppFramework
 2016-07-19 12:21:14 +02:00
Morris Jobke
544c3c1565 Merge pull request #436 from nextcloud/public-regex-to-match-our-clients 
Copy the regexes to the public interface
 2016-07-19 11:35:10 +02:00
Morris Jobke
0a6d95b126 Merge pull request #394 from nextcloud/tags-for-everything 
SystemTags for everything not just files
 2016-07-19 10:47:12 +02:00
Joas Schilling
80168613be
Fix maintenance mode 
When the server is in maintenance mode, apps are not loaded.
That means apps/theming/ is not in the allowed paths. So we
need to check without autoloading, whether the class exists.
 2016-07-19 09:54:42 +02:00
Roeland Douma
35f48d6f35 Merge pull request #435 from nextcloud/classmap 
Use classmap to load core files
 2016-07-18 22:12:03 +02:00
Nextcloud bot
b23d3c6418
[tx-robot] updated from transifex 2016-07-18 14:08:51 +00:00
Björn Schießle
ea470f8777 Merge pull request #405 from nextcloud/theming-fixes 
Theming fixes
 2016-07-18 15:59:47 +02:00