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

3348 commits

Author SHA1 Message Date
Lukas Reschke
a27a8d733b Merge pull request #1024 from nextcloud/remove-password-reset-link-after-successful-login 
Remove "password reset token" after successful login
 2016-08-24 13:44:41 +02:00
Lukas Reschke
2f1b17d44a Merge pull request #1007 from nextcloud/shared-storage-non-recursive 
Fix shared storage recursive setup
 2016-08-23 22:15:38 +02:00
Joas Schilling
736e884e9a
Move the reset token to core app 2016-08-23 15:01:38 +02:00
Robin Appelman
a0c2342c20 prevent infinite recursion while getting storage from mount 2016-08-23 14:52:18 +02:00
Joas Schilling
139fb8de94
Remove "password reset token" after successful login 2016-08-23 12:54:45 +02:00
Lukas Reschke
3ed102497e Merge pull request #995 from nextcloud/workflow-section 
Workflow section + hidden empty sections
 2016-08-23 11:20:43 +02:00
Arthur Schiwon
5cd3f4e4dc
add test 2016-08-22 16:56:00 +02:00
Arthur Schiwon
baa91809bd
adjust test 2016-08-22 08:29:49 +02:00
Arthur Schiwon
7972fa5527
enlist only registered sections that also have settings registered to 2016-08-22 08:29:49 +02:00
Lukas Reschke
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
Julius Haertl
162b153f22
Fix loading of ThemingDefaults 2016-08-19 11:26:22 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
c5d0a056de Merge pull request #868 from nextcloud/changepasswordcontroller 
Make ChangePassword a real Controller
 2016-08-17 11:50:41 +02:00
Joas Schilling
027069cbae Merge pull request #846 from nextcloud/provisioning_api_ocs 
Move Provisioning API to the AppFramework
 2016-08-17 10:23:13 +02:00
Roeland Jago Douma
789082e014
Add tests for ChangePasswordController 2016-08-17 10:21:18 +02:00
Marius Blüm
c1632c3abd Merge pull request #893 from nextcloud/ie8_be_gone 
IE8 be gone!
 2016-08-17 09:02:58 +02:00
Roeland Jago Douma
fd95985a21
Remove IE8 support in CertificateController 
* Also fix getMock warnings in tests
 2016-08-16 20:51:43 +02:00
Arthur Schiwon
4943441bde
adjust tests to latest changes 2016-08-16 18:59:45 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712 2016-08-16 18:31:59 +02:00
Björn Schießle
6dc956b192 Merge pull request #886 from nextcloud/capabilities_error_proof 
Make the capabilities manager more error proof
 2016-08-16 11:40:42 +02:00
Lukas Reschke
6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
87ac72d004
We have to mock the is_uploaded_file in the OC\Core\Controller namespace 2016-08-15 20:08:20 +02:00
Roeland Jago Douma
09f4ce4389
Fix mock call in AvatarControllerTest 2016-08-15 20:07:07 +02:00
Lukas Reschke
cf3cfca356
Use generated URL 2016-08-15 17:37:55 +02:00
Lukas Reschke
910176c540
Fix CheckSetupController tests 2016-08-15 17:36:45 +02:00
Lukas Reschke
d6992e3f9f
Fix template test 2016-08-15 17:19:50 +02:00
Lukas Reschke
75d135d8d4
Fix tests for LoginController 2016-08-15 17:19:32 +02:00
Lukas Reschke
1c7fa3333e
Add reference to current user 2016-08-15 17:15:14 +02:00
Lukas Reschke
c16c411275
Add new dependency 2016-08-15 17:13:58 +02:00
Lukas Reschke
65d1472005
Don't use create mock 
Not compatible with this PHPunit version
 2016-08-15 17:08:27 +02:00
Lukas Reschke
166a7667d3
Use proper casing 2016-08-15 17:00:35 +02:00
Lukas Reschke
7ffb7b0d84
Use MockBuilder instead of createMock 
CI uses an older PHPUnit
 2016-08-15 16:43:22 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Joas Schilling
3ed05f8769
Make sure the primary action is always the first one 2016-08-15 11:13:54 +02:00
Roeland Jago Douma
a0b22227fc
Add tests 2016-08-14 18:34:01 +02:00
Lukas Reschke
72b5f9bfac
Use createMock instead of deprecated getMock 2016-08-11 15:22:29 +02:00
Lukas Reschke
9ca25e857c
Redirect users when already logged-in on login form 2016-08-11 15:22:29 +02:00
Roeland Jago Douma
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
Lukas Reschke
9fbdb0efe8 Merge pull request #529 from nextcloud/vendor-maintenance-downgrade 
Allow downgrades of maintenance accross vendors
 2016-08-10 00:25:53 +02:00
Lukas Reschke
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
Lukas Reschke
b4ed4e152e Merge pull request #746 from nextcloud/jail-root 
getJailedPath expects $path to have a trailing /
 2016-08-09 11:04:11 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Joas Schilling
f37fa6e45c
Move Share backends to PSR-4 instead of using class path (#24941) 2016-08-05 14:13:41 +02:00
Thomas Müller
f1cd68d713 Adding test case for getPathById including a jailed cache where root is just empty 2016-08-05 14:06:05 +02:00
Vincent Petry
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
Vincent Petry
67fa6bf9bc
Add repair step for unmerged shares (WIP) 2016-08-03 10:16:28 +02:00
Roeland Jago Douma
5c718b13b8
We should properly check for 'true' instaed of the bool 2016-08-01 08:52:50 +02:00
Roeland Jago Douma
f7f5216aa3
Dark hackery to not always disable CSRF for OCS controllers 2016-07-29 15:49:27 +02:00