upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
34115 commits 951 branches 1208 tags 8.3 GiB
Commit graph

3343 commits

Author SHA1 Message Date
Morris Jobke
3f457943b0
Remove unneeded Windows logic 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-08 12:29:25 +01:00
Roeland Jago Douma
4db595181d Merge pull request #1847 from nextcloud/backport-1164-avatar-files-accesscontrol-fixes 
[stable10] Avatar fixes for access-control app
 2016-10-21 21:32:10 +02:00
Joas Schilling
fd445cc2db
Check the mimetype before reading the content and catch exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-21 11:13:59 +02:00
Joas Schilling
d17424f173
Restore all services when a tests failed/finished for better testcase isolation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-21 10:58:59 +02:00
Joas Schilling
a2a998c567
Make sure all tests use the TestCase method to overwrite services 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-21 10:58:51 +02:00
Joas Schilling
6b703e97ce
Only trigger postDelete hooks when the user was deleted... 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-11 10:45:39 +02:00
Joas Schilling
9107573020
Make sure that comments, notifications and preferences are deleted 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-11 10:45:09 +02:00
Lukas Reschke
3102afacd2 Merge pull request #1479 from nextcloud/stable10-backport-1188 
[stable10] redirect to default app after solving the 2FA challenge
 2016-09-28 23:15:42 +02:00
Morris Jobke
3e93dbd404 Merge pull request #1522 from nextcloud/stable9.1-3f53730159d94bbc2b53129a4c750f5bab40a26e 
[stable10] Fix mimetype detection inside hidden folders (#26138) (#2…
 2016-09-28 22:03:02 +02:00
Joas Schilling
4077f7141f
Use the same URL everywhere 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-27 15:00:16 +02:00
Joas Schilling
0fac5146bd
Return the autoupdater value from the server 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-27 14:58:57 +02:00
Thomas Müller
fca4098fac
[stable9.1] Fix mimetype detection inside hidden folders (#26138) (#26151) 
Downstreaming of https://github.com/owncloud/core/pull/26151

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-26 11:33:13 +02:00
Christoph Wurst
b824706ec5
check same URL in unit tests 2016-09-21 12:57:43 +02:00
Christoph Wurst
8c82628622
redirect to default app after solving the 2FA challenge 2016-09-21 12:57:37 +02:00
Joas Schilling
107b418815
Fix MissingMandatoryParametersException for share notifications 
The routing system is non-forgiving
 2016-09-13 14:09:34 +02:00
Bjoern Schiessle
7d183a28d2
skip shared files, if files get decrypted only for a specific user we shouldn't touch files owned by a different user. 2016-09-09 14:55:46 +02:00
Lukas Reschke
2ae08d6fc2
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-09-08 21:07:05 +02:00
Morris Jobke
520bfa872b Merge pull request #1324 from nextcloud/backport-1323-show-download-button-for-updates-atm 
[stable10] Show an download button instead of the updater
 2016-09-08 15:41:45 +02:00
Joas Schilling
280a452055
Change updater URL 2016-09-08 12:29:37 +02:00
Joas Schilling
810f99c1c9
Correctly remove the charset from finfo mimetype 2016-09-08 09:20:34 +02:00
Morris Jobke
17dc2c344f
fix tests 2016-09-07 19:58:20 +02:00
Joas Schilling
7d54d03e40
Allow downgrades of maintenance accross vendors 2016-08-30 10:19:40 +02:00
Lukas Reschke
4fb2810add
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-27 22:16:30 +02:00
Lukas Reschke
805fc22276 Merge pull request #1008 from nextcloud/shared-storage-non-recursive-10 
[10] Fix shared storage recursive setup
 2016-08-23 22:15:21 +02:00
Robin Appelman
fa980af53c prevent infinite recursion while getting storage from mount 2016-08-23 13:59:01 +02:00
Arthur Schiwon
ff2f5ecbf7
Backport Workflow section + hidden empty sections #995 to stabble10 
add section to worklfowengine

enlist only registered sections that also have settings registered to

adjust test

Move admin settings to workflow section

fix wrong var name

Save the container with the app's namespace so we can resolve it
 2016-08-22 16:37:48 +02:00
blizzz
379260732c Merge pull request #918 from nextcloud/stable10_891 
[Stable10] [OC] Fix unmerged shares repair targetdecision
 2016-08-22 12:09:27 +02:00
Julius Haertl
fe15940233
Fix loading of ThemingDefaults 2016-08-19 11:29:58 +02:00
Joas Schilling
e1ec3964c8
Make sure the primary action is always the first one 2016-08-18 09:27:14 +02:00
Vincent Petry
11e9ce669a
Improve regexp to detect duplicate folders when repairing unmerged shares 2016-08-17 19:39:08 +02:00
Vincent Petry
c1ad88a777
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 19:38:33 +02:00
Vincent Petry
837dc0b336
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 19:38:19 +02:00
Lukas Reschke
1f177aa105
Use getMockBuilder instead of createMock 2016-08-16 21:36:59 +02:00
Lukas Reschke
6ed721dde3
Rename class reference 
File has been renamed only on master
 2016-08-16 21:28:26 +02:00
Arthur Schiwon
f4aa676cb0
adjust tests to latest changes 2016-08-16 21:11:29 +02:00
Lukas Reschke
436e6c1078
Use MockBuilder instead of createMock 
CI uses an older PHPUnit
 2016-08-16 21:10:47 +02:00
Lukas Reschke
687f5bee94
Add unit tests 2016-08-16 21:10:41 +02:00
Lukas Reschke
737591f239 Merge pull request #858 from nextcloud/stable10-when-logged-in-then-just-redirect-to-redirected-page 
[stable10] when logged in then just redirect to redirected page
 2016-08-16 18:13:24 +02:00
Roeland Jago Douma
a8ba573ba9
We have to mock the is_uploaded_file in the OC\Core\Controller namespace 2016-08-15 20:09:48 +02:00
Roeland Jago Douma
b860fa7125
Fix mock call in AvatarControllerTest 2016-08-15 20:09:37 +02:00
Lukas Reschke
5e9c7d3ff3
Use generated URL 2016-08-15 19:26:24 +02:00
Lukas Reschke
81467f7c4e
Fix CheckSetupController tests 2016-08-15 17:55:36 +02:00
Lukas Reschke
ab9a8ce952
Fix tests for LoginController 2016-08-15 17:52:54 +02:00
Lukas Reschke
349f5e4a60
Fix template test 2016-08-15 17:48:58 +02:00
Lukas Reschke
18388a01f5
Add reference to current user 2016-08-15 17:48:55 +02:00
Lukas Reschke
db34a8c861
Use proper casing 2016-08-15 17:48:45 +02:00
Lukas Reschke
9ac6b83687 Use createMock instead of deprecated getMock 2016-08-13 21:04:16 +02:00
Lukas Reschke
be1e64486f Redirect users when already logged-in on login form 2016-08-13 21:04:10 +02:00
Lukas Reschke
93677b2ca3 Merge pull request #817 from nextcloud/jail-root-stable10 
[stable10] getJailedPath expects $path to have a trailing /
 2016-08-10 16:04:13 +02:00
Roeland Jago Douma
a54f9c6aef
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 13:09:01 +02:00