Commit Graph

6020 Commits

Author SHA1 Message Date
Björn Schießle 7321baa108 Merge pull request #713 from nextcloud/stable10_474
[Stable 10] Group shares with same source and target
2016-08-08 10:55:26 +02:00
Morris Jobke 65dd174655 Merge pull request #756 from nextcloud/twofactor-isset-10
[10] Check if an app provide two-factor-auth providers before we try to use them
2016-08-08 09:15:13 +02:00
Marius Blüm eb9d0b4664 Merge pull request #757 from nextcloud/nextcloud-version-check-10
[10] Translate the server version for nextcloud
2016-08-07 09:08:49 +02:00
Joas Schilling 9bc13eb7eb Translate the server version for nextcloud 2016-08-06 10:42:26 +02:00
Robin Appelman e9310f750c Check if an app provide two-factor-auth providers before we try to use them 2016-08-06 10:30:36 +02:00
blizzz 6bbcbb22e9
Correct name in Console Application.php
see changes :)
2016-08-05 14:37:32 +02:00
Vincent Petry 21907c4f3e
Fix RepairUnmergedShares to not skip valid repair cases
The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.
2016-08-04 19:50:16 +02:00
Vincent Petry 3a86dd1d1a
Adjust repair version check for unmerged shares 2016-08-04 19:50:16 +02:00
Vincent Petry 6638e1857a
Add repair step for unmerged shares (WIP) 2016-08-04 19:50:16 +02:00
Joas Schilling 713e201074 Merge pull request #602 from nextcloud/backport-workflow-engine
🚧 [WIP] Backport workflow engine 🚧
2016-08-04 14:20:14 +02:00
Robin Appelman de8bb68325
revert to old setup connection logic 2016-07-29 00:41:12 +02:00
Morris Jobke 51be4bf2f0 Merge pull request #618 from nextcloud/backport-519-stable10
Backport LDAPProvider to Nextcloud 10
2016-07-28 23:13:21 +02:00
Morris Jobke 0a14cd4d60 Merge pull request #628 from nextcloud/stable10-backport-612
[stable10] libxml - compare against loaded version
2016-07-28 16:56:55 +02:00
Morris Jobke 1913419520
libxml - compare against loaded version
* if the compiled in version is older than the loaded version Nextcloud doesn't work
* uses the loaded libxml version to check against

fixes #205
2016-07-28 14:11:32 +02:00
Roeland Jago Douma 6990a4e550
Support subdir in the OCS v2 endpoint
We should check against the ending substring since people could
run their nextcloud in a subfolder.

* Added test
2016-07-28 13:12:01 +02:00
root aa02f518ad
Backport LDAPProvider to Nextcloud 10
New LDAPProvider for user_ldap

final changes

comments amended

Nextcloud license header for new files
2016-07-28 10:20:38 +02:00
Joas Schilling 2a4a1278fa
Allow DI of the workflow manager by the OCP interface 2016-07-27 14:13:08 +02:00
Arthur Schiwon 1013fac447
fix autoloading in LPAP integration tests, resolves #544 2016-07-26 21:06:29 +02:00
Morris Jobke d181301699 Merge pull request #508 from nextcloud/stable10_ocs_appframework_xml
[Stable10] AppFramework do not get default response
2016-07-25 12:52:13 +02:00
Joas Schilling 28dffaa32f
Make sure we try to autoload the class 2016-07-25 09:42:28 +02:00
Joas Schilling 23b205ed48
Run the license script 2016-07-22 11:40:41 +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
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 96c2b0de66
Use proper certificates
Ports bcf693539b
2016-07-21 01:35:19 +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
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 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
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
Björn Schießle ea470f8777 Merge pull request #405 from nextcloud/theming-fixes
Theming fixes
2016-07-18 15:59:47 +02:00
Joas Schilling b1d652e8b0
Copy the regexes to the public interface 2016-07-18 15:11:44 +02:00
Joas Schilling 9781312648
Prevent syntax error when creating user or changing password 2016-07-18 11:44:10 +02:00
Roeland Jago Douma 0bda09236e
Add route tests 2016-07-18 11:09:49 +02:00
Roeland Jago Douma 94cd83ca00
Make the router handle OCS AppFramework Routes 2016-07-18 11:09:04 +02:00