f9cea0b582
Merge pull request #797 from nextcloud/only-match-for-auth-cookie
...
Match only for actual session cookie
2016-08-31 15:59:16 +02:00
e4311a2ebd
Merge pull request #608 from nextcloud/small-encryption-improvement
...
skip shared files, if files get decrypted only for a specific user we…
2016-08-31 12:30:37 +02:00
57f9117843
Merge pull request #1087 from nextcloud/get-delay-twice
...
dont get bruteforce delay twice
2016-08-30 18:43:01 +02:00
4afe4bda26
Merge pull request #891 from nextcloud/us_25810
...
[OC] Fix unmerged shares repair targetdecision
2016-08-30 08:22:34 +02:00
d5518735c9
always return numeric storage id as int, also check type equality in test asserts
2016-08-29 14:20:51 +02:00
6c93fe08f5
dont get bruteforce delay twice
2016-08-29 13:36:49 +02:00
4d85ffc27c
Merge pull request #1054 from nextcloud/less-cache-hits
...
Reduce the number of cache operations for dav operations
2016-08-27 22:44:29 +02:00
89c78bbce4
Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop
...
prevent infinite redirect loops if the there is no 2fa provider to pass
2016-08-26 16:03:05 +02:00
ad4cab130e
Merge pull request #1069 from nextcloud/l10ntest_nodb
...
L10N tests do not require DB
2016-08-25 23:38:27 +02:00
c5bdb4d4e8
L10N tests do not require DB
...
* Makes CI a bit more efficient
* Cleanup getMock warning
2016-08-25 22:41:23 +02:00
04cffe6d81
CappedMemoryCacheTest does not require DB
...
Makes CI a bit more efficient
2016-08-25 22:32:39 +02:00
2693ae870e
cache user folders
2016-08-25 17:22:25 +02:00
6af2efb679
prevent infinite redirect loops if the there is no 2fa provider to pass
...
This fixes infinite loops that are caused whenever a user is about to solve a 2FA
challenge, but the provider app is disabled at the same time. Since the session
value usually indicates that the challenge needs to be solved before we grant access
we have to remove that value instead in this special case.
2016-08-24 10:49:23 +02:00
2f1b17d44a
Merge pull request #1007 from nextcloud/shared-storage-non-recursive
...
Fix shared storage recursive setup
2016-08-23 22:15:38 +02:00
a0c2342c20
prevent infinite recursion while getting storage from mount
2016-08-23 14:52:18 +02:00
3ed102497e
Merge pull request #995 from nextcloud/workflow-section
...
Workflow section + hidden empty sections
2016-08-23 11:20:43 +02:00
5cd3f4e4dc
add test
2016-08-22 16:56:00 +02:00
baa91809bd
adjust test
2016-08-22 08:29:49 +02:00
7972fa5527
enlist only registered sections that also have settings registered to
2016-08-22 08:29:49 +02:00
d50e7ee36c
Remove reading PATH_INFO from server variable
...
Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used.
Fixes https://github.com/nextcloud/server/issues/983
2016-08-19 14:48:13 +02:00
162b153f22
Fix loading of ThemingDefaults
2016-08-19 11:26:22 +02:00
fe80bb1aff
Merge pull request #867 from nextcloud/notification-primary-action-always-first
...
Make sure the primary action is always the first one
2016-08-17 19:31:14 +02:00
df9b509ed3
Improve regexp to detect duplicate folders when repairing unmerged shares
2016-08-17 15:31:47 +02:00
7a2d25fab4
Fix unmerged shares repair with mixed group and direct shares
...
Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
2016-08-17 15:31:36 +02:00
56b94b220d
Improve file_target finding logic when repairing unmerged shares
...
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
2016-08-17 15:31:35 +02:00
027069cbae
Merge pull request #846 from nextcloud/provisioning_api_ocs
...
Move Provisioning API to the AppFramework
2016-08-17 10:23:13 +02:00
4943441bde
adjust tests to latest changes
2016-08-16 18:59:45 +02:00
717e22267a
Merge branch 'master' into implement_712
2016-08-16 18:31:59 +02:00
c044aa34fa
Make the capabilities manager more error proof
...
If an app registers an invalid capabilty we should not crash hard.
Instead we should catch the exception. Log it (error) and carry on.
* Added tests
2016-08-15 20:37:19 +02:00
7ffb7b0d84
Use MockBuilder instead of createMock
...
CI uses an older PHPUnit
2016-08-15 16:43:22 +02:00
8a7a0f3287
Add unit tests
2016-08-15 16:25:34 +02:00
3ed05f8769
Make sure the primary action is always the first one
2016-08-15 11:13:54 +02:00
a0b22227fc
Add tests
2016-08-14 18:34:01 +02:00
1f370c97ed
OCSController requires DataResponse
...
The OCS Controller requires a DataResponse object to be returned.
This means that all error handling will have to be done via exceptions
thrown and handling in the middleware.
2016-08-10 12:40:26 +02:00
9fbdb0efe8
Merge pull request #529 from nextcloud/vendor-maintenance-downgrade
...
Allow downgrades of maintenance accross vendors
2016-08-10 00:25:53 +02:00
5214b62d55
Merge pull request #691 from nextcloud/ocs_allow_all_old_routes
...
Allow ocs/v2.php/cloud/... routes
2016-08-09 20:52:49 +02:00
b53ea18ea5
Match only for actual session cookie
...
OVH has implemented load balancing in a very questionable way where the reverse proxy actually internally adds some cookies which would trigger a security exception. To work around this, this change only checks for the session cookie.
2016-08-09 19:23:08 +02:00
b4ed4e152e
Merge pull request #746 from nextcloud/jail-root
...
getJailedPath expects $path to have a trailing /
2016-08-09 11:04:11 +02:00
0032a5c2d1
Hanlde Core and Settings app in AppFramework
...
'core' and 'settings' are just apps but we treat them slightly
different. Make sure that we construct the correct namespace so we can
actually do automatic AppFramework stuff.
2016-08-08 20:48:16 +02:00
63f6d2d558
Allow ocs/v2.php/cloud/... routes
...
One of the possibilities of the old OCS API is that you can define the
url yourself.
This PR makes this possible again by adding an optional root elemenet to
the route. Routes are thus:
.../ocs/v2.php/<root>/<url>
By default <root> = apps/<app>
This will allow for example the provisioning API etc to be in
../ovs/v2/php/cloud/users
2016-08-08 15:01:26 +02:00
f37fa6e45c
Move Share backends to PSR-4 instead of using class path ( #24941 )
2016-08-05 14:13:41 +02:00
f1cd68d713
Adding test case for getPathById including a jailed cache where root is just empty
2016-08-05 14:06:05 +02:00
0c6352e095
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-03 10:16:28 +02:00
67fa6bf9bc
Add repair step for unmerged shares (WIP)
2016-08-03 10:16:28 +02:00
5c718b13b8
We should properly check for 'true' instaed of the bool
2016-08-01 08:52:50 +02:00
f7f5216aa3
Dark hackery to not always disable CSRF for OCS controllers
2016-07-29 15:49:27 +02:00
54ae8eede3
Merge pull request #556 from nextcloud/nextcloud-version-check
...
Allow apps to check for a given nextcloud version
2016-07-29 09:26:25 +02:00
351cab6bce
skip shared files, if files get decrypted only for a specific user we shouldn't touch files owned by a different user.
2016-07-27 15:39:24 +02:00
8bdd0adcee
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-27 15:28:35 +02:00
9c21067c19
fix enabled apps tests
2016-07-27 08:36:03 +02:00
Joas Schilling
Lukas Reschke
Morris Jobke
Jörn Friedrich Dreyer
Robin Appelman
Roeland Jago Douma
Christoph Wurst
Arthur Schiwon
Julius Haertl
Roeland Jago Douma
Vincent Petry
Thomas Müller
Bjoern Schiessle