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

2320 commits

Author SHA1 Message Date
Morris Jobke
8ae8eb4734 drop dependency of some commands on old config object 2014-11-20 15:03:16 +01:00
Thomas Müller
cbb9caf030 Merge pull request #12226 from owncloud/remove-phpass 
Remove phpass and migrate to new Hasher interface
 2014-11-20 14:59:59 +01:00
Morris Jobke
46e6104795 Merge pull request #12297 from owncloud/issue/10991-all-testcase 
Issue/10991 all testcase
 2014-11-20 14:53:18 +01:00
Vincent Petry
6a08fca363 Merge pull request #12253 from owncloud/port-12154 
Port 12154
 2014-11-20 12:47:27 +01:00
Joas Schilling
bb540722cd Use base class to reset the file mapper 2014-11-19 14:52:07 +01:00
Morris Jobke
d40bdfb35e drop unneeded var_dump - fixes #9997 2014-11-18 22:36:42 +01:00
Morris Jobke
81d112fb42 Merge pull request #12261 from oparoz/patch-1 
Replace deprecated switches
 2014-11-18 18:59:34 +01:00
Björn Schießle
106d0f9c75 Merge pull request #12224 from owncloud/fix_12211 
make sure that we don't find the wrong shares if a user and a group have the same ID
 2014-11-18 17:26:02 +01:00
Olivier Paroz
cb118ce371 Replace deprecated switches 
Warning: -convert-to is deprecated.  Use --convert-to instead.
Warning: -outdir is deprecated.  Use --outdir instead.
 2014-11-18 15:04:01 +01:00
Lukas Reschke
309788003d Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager 
Fix type hinting for app manager
 2014-11-18 13:56:40 +01:00
Lukas Reschke
8d4e63dd7c Merge pull request #12242 from owncloud/fix-undefined-size 
Check if the size field is available
 2014-11-18 12:37:16 +01:00
Lukas Reschke
260a084d27 Add repair steps for legacy config files 
Remove all ports from the trusted domains

Conflicts:
	lib/private/repair.php
	lib/repair/repairconfig.php
 2014-11-18 12:36:03 +01:00
Lukas Reschke
d0a30b0e55 Ignore port for trusted domains 
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)

Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.

Conflicts:
	lib/private/request.php
 2014-11-18 12:36:03 +01:00
Robin Appelman
0b630a37ab Fix type hinting for app manager 2014-11-18 12:22:13 +01:00
Bjoern Schiessle
ea4eedd35a only users can have a display name different from the id 2014-11-18 11:46:28 +01:00
Bjoern Schiessle
367468ff1f make sure that we only find the shares from the correct share type if users and groups with the same ID exists 2014-11-18 11:11:49 +01:00
Bjoern Schiessle
5192641447 make sure that we don't find the wrong shares if a user and a group have the same ID 2014-11-18 11:03:08 +01:00
Morris Jobke
36ba935381 Merge pull request #12237 from owncloud/fix-12236 
Make declaration compatible
 2014-11-18 10:30:17 +01:00
Lukas Reschke
944cd327b1 Merge pull request #9962 from owncloud/app-group-enable-remote 
Fix remote.php routes for apps that are enabled for specific groups
 2014-11-18 10:08:20 +01:00
Lukas Reschke
6535540dcd Check if the size field is available 
In some cases the 'size' field is not available resulting in some PHP errors such as:

```json
{"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"}
```

This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
 2014-11-17 22:39:40 +01:00
Lukas Reschke
e8f90133e0 Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse 
Move CSRF check
 2014-11-17 18:34:55 +01:00
Lukas Reschke
0b9dffa828 Make declaration compatible 
Fixes #12236
 2014-11-17 18:30:17 +01:00
Vincent Petry
af7688ec17 Merge pull request #11741 from owncloud/delete_all_children_preview_2 
delete all children's previews when deleting a folder
 2014-11-17 16:45:54 +01:00
Morris Jobke
146cb920c9 Merge pull request #12218 from owncloud/issue/10991-fixes 
Issue/10991 Make unit tests pass on windows
 2014-11-17 16:44:45 +01:00
Robin Appelman
7cb12d4bff Add sabredav plugin to check if a user has access to an app 2014-11-17 15:50:24 +01:00
Robin Appelman
36528c6ef6 Merge pull request #12031 from owncloud/app-manager 
Add \OC\App\Manager to handle enabling/disabling apps
 2014-11-17 15:49:15 +01:00
Lukas Reschke
07f0d76fc6 Move CSRF check 
Because we're closing the session now before controllers are executed there are cases where we cannot write the session.
 2014-11-17 15:10:53 +01:00
Lukas Reschke
8595b76df2 Remove phpass and migrate to new Hasher interface 
This PR removes phpass and migrates to the new Hasher interface.

Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
 2014-11-17 13:39:13 +01:00
Joas Schilling
0ab973a3a6 Make it possible to cleanPath() absolute Windows paths 2014-11-17 10:48:15 +01:00
Joas Schilling
39ae569c5c Correctly close handle of directory when listing certificates 2014-11-17 10:48:14 +01:00
Morris Jobke
b9e86b0951 Merge pull request #12186 from owncloud/fix-12182 
eliminate OC_Template::printErrorPage in database classes, fixes #12182
 2014-11-15 16:50:15 +01:00
Lukas Reschke
cd5925036a Check if app is enabled for user 
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
 2014-11-15 11:13:55 +01:00
Arthur Schiwon
74ffda8261 do not output DB information, and do not set header 2014-11-14 17:43:22 +01:00
Arthur Schiwon
08205c63f9 errors are already logged 2014-11-14 16:59:54 +01:00
Arthur Schiwon
7ed678b04d eliminate OC_Template::printErrorPage in database classes, fixes #12182 2014-11-14 15:48:55 +01:00
Morris Jobke
c0d63680ed Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup 
cleanup group admin(s) on deleteGroup
 2014-11-13 22:39:40 +01:00
Morris Jobke
e5d46d0d94 Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change_display_name 
removal of wrong/double implemented check
 2014-11-13 15:39:07 +01:00
michag86
7e70c4ee95 removal of wrong/double implemented check 
Check already implemented in core/settings/ajax/changedisplayname.php
 2014-11-13 13:02:02 +01:00
Lukas Reschke
5f8fb8d1ee Run preupdate before an update 
The update routine tries to test the database migration before actually performing the update.

However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.

This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
 2014-11-13 12:07:49 +01:00
Morris Jobke
97a8fa418d Merge pull request #12141 from owncloud/kill-dav-client 
OC_DAVClient is not longer used - no need to carry it around anymore
 2014-11-12 21:20:52 +01:00
Thomas Müller
6e3a841652 Merge pull request #12139 from owncloud/DoNotTouchMe 
Try to read the file only instead of trying to touch
 2014-11-12 17:29:56 +01:00
Thomas Müller
fede6b93e5 OC_DAVClient is not longer used - no need to carry it around anymore 2014-11-12 17:07:34 +01:00
Jan-Christoph Borchardt
d5796bbaf9 Merge pull request #12128 from owncloud/drop-formfactor 
Drop form_factor that is appended to JS, CSS and template filenames
 2014-11-12 16:23:19 +01:00
Lukas Reschke
49ddaf9489 Try to read the file only instead of trying to touch 
The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.

Fixes https://github.com/owncloud/core/issues/12135
 2014-11-12 15:57:19 +01:00
Morris Jobke
952abdc51a Drop form_factor that is appended to JS, CSS and template filenames 2014-11-12 13:07:23 +01:00
Lukas Reschke
da31177a8f Remove debug statement 
Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
 2014-11-12 11:32:48 +01:00
Thomas Müller
c998f620d0 Merge pull request #12105 from owncloud/dav-fixcleanpath 
Fix root path handling for WebDAV ext storage
 2014-11-12 09:16:55 +01:00
Thomas Müller
9aef0421cf Merge pull request #12107 from owncloud/dav-propfindmimetype 
Return real mime type on PROPFIND
 2014-11-12 09:16:26 +01:00
Bernhard Posselt
6d5a239abf Fix Pimple unset 2014-11-11 22:04:46 +01:00
Vincent Petry
0b2c24081f Return real mime type on PROPFIND 
Return the real (insecure) mime type on PROPFIND
 2014-11-11 15:42:50 +01:00