aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* only users can have a display name different from the idBjoern Schiessle2014-11-181-1/+4
|
* make sure that we only find the shares from the correct share type if users ↵Bjoern Schiessle2014-11-181-2/+8
| | | | and groups with the same ID exists
* make sure that we don't find the wrong shares if a user and a group have the ↵Bjoern Schiessle2014-11-181-6/+10
| | | | same ID
* Merge pull request #12237 from owncloud/fix-12236Morris Jobke2014-11-181-5/+5
|\ | | | | Make declaration compatible
| * Make declaration compatibleLukas Reschke2014-11-171-5/+5
| | | | | | | | Fixes #12236
* | Merge pull request #9962 from owncloud/app-group-enable-remoteLukas Reschke2014-11-181-0/+75
|\ \ | | | | | | Fix remote.php routes for apps that are enabled for specific groups
| * | Add sabredav plugin to check if a user has access to an appRobin Appelman2014-11-171-0/+75
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-184-0/+8
| | |
* | | Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElseLukas Reschke2014-11-171-0/+3
|\ \ \ | |_|/ |/| | Move CSRF check
| * | Move CSRF checkLukas Reschke2014-11-171-0/+3
| | | | | | | | | | | | Because we're closing the session now before controllers are executed there are cases where we cannot write the session.
* | | Merge pull request #11741 from owncloud/delete_all_children_preview_2Vincent Petry2014-11-171-16/+94
|\ \ \ | | | | | | | | delete all children's previews when deleting a folder
| * | | delete all children's previews when deleting a folderGeorg Ehrke2014-10-301-16/+94
| | | | | | | | | | | | | | | | add phpdoc
* | | | Merge pull request #12218 from owncloud/issue/10991-fixesMorris Jobke2014-11-172-2/+12
|\ \ \ \ | |_|_|/ |/| | | Issue/10991 Make unit tests pass on windows
| * | | Make it possible to cleanPath() absolute Windows pathsJoas Schilling2014-11-171-2/+11
| | | |
| * | | Correctly close handle of directory when listing certificatesJoas Schilling2014-11-171-0/+1
| | | |
* | | | Merge pull request #12031 from owncloud/app-managerRobin Appelman2014-11-174-0/+211
|\ \ \ \ | |_|_|/ |/| | | Add \OC\App\Manager to handle enabling/disabling apps
| * | | Add \OC\App\Manager to handle enabling/disabling appsRobin Appelman2014-11-104-0/+211
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1726-10/+62
| | | |
* | | | Merge pull request #12186 from owncloud/fix-12182Morris Jobke2014-11-153-13/+31
|\ \ \ \ | | | | | | | | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182
| * | | | do not output DB information, and do not set headerArthur Schiwon2014-11-143-7/+28
| | | | |
| * | | | errors are already loggedArthur Schiwon2014-11-142-3/+0
| | | | |
| * | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182Arthur Schiwon2014-11-143-7/+7
| | | | |
* | | | | Check if app is enabled for userLukas Reschke2014-11-151-0/+11
|/ / / / | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-144-0/+4
| | | |
* | | | Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroupMorris Jobke2014-11-131-0/+4
|\ \ \ \ | | | | | | | | | | cleanup group admin(s) on deleteGroup
| * | | | cleanup group admin(s) on deleteGroupmichag862014-10-081-0/+4
| | | | |
* | | | | Merge pull request #11956 from ↵Morris Jobke2014-11-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/remove-check-for-allow_user_to_change_display_name removal of wrong/double implemented check
| * | | | | removal of wrong/double implemented checkmichag862014-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Check already implemented in core/settings/ajax/changedisplayname.php
* | | | | | Run preupdate before an updateLukas Reschke2014-11-132-5/+17
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-132-4/+4
| | | | |
* | | | | Merge pull request #12141 from owncloud/kill-dav-clientMorris Jobke2014-11-121-59/+0
|\ \ \ \ \ | | | | | | | | | | | | OC_DAVClient is not longer used - no need to carry it around anymore
| * | | | | OC_DAVClient is not longer used - no need to carry it around anymoreThomas Müller2014-11-121-59/+0
| | | | | |
* | | | | | Merge pull request #12139 from owncloud/DoNotTouchMeThomas Müller2014-11-121-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Try to read the file only instead of trying to touch
| * | | | | | Try to read the file only instead of trying to touchLukas Reschke2014-11-121-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge pull request #12128 from owncloud/drop-formfactorJan-Christoph Borchardt2014-11-126-109/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Drop form_factor that is appended to JS, CSS and template filenames
| * | | | | | Drop form_factor that is appended to JS, CSS and template filenamesMorris Jobke2014-11-126-109/+13
| |/ / / / /
* / / / / / Remove debug statementLukas Reschke2014-11-121-4/+0
|/ / / / / | | | | | | | | | | | | | | | Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
* | | | | Merge pull request #12105 from owncloud/dav-fixcleanpathThomas Müller2014-11-121-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix root path handling for WebDAV ext storage
| * | | | | Fix root path handling for WebDAV ext storageVincent Petry2014-11-111-0/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Added missing cleanPath() call that converts "/" to "" when calling SabreDAV. This is needed because SabreDAV will discard its base URL when passing "/".
* | | | | Merge pull request #12107 from owncloud/dav-propfindmimetypeThomas Müller2014-11-121-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Return real mime type on PROPFIND
| * | | | | Return real mime type on PROPFINDVincent Petry2014-11-111-0/+4
| |/ / / / | | | | | | | | | | | | | | | Return the real (insecure) mime type on PROPFIND
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-124-2/+14
| | | | |
* | | | | Fix Pimple unsetBernhard Posselt2014-11-111-1/+1
| | | | |
* | | | | Merge pull request #11917 from owncloud/fix-11909Thomas Müller2014-11-111-4/+11
|\ \ \ \ \ | |/ / / / |/| | | | Add checkbox to enforce SSL for subdomains
| * | | | Migrate "setsecurity.php" to the AppFrameworkLukas Reschke2014-11-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add switch to enforce SSL for subdomains Add unit tests Add test for boolean values Camel-case Fix ugly JS
* | | | | Merge pull request #12072 from ↵Vincent Petry2014-11-104-114/+156
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/sabre-convertstoragenotavailableexception-secondtry Convert StorageNotAvailableException to SabreDAV exception
| * | | | | Convert StorageNotAvailableException to SabreDAV exceptionVincent Petry2014-11-104-114/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert \OCP\Files\StorageNotAvailableException to \Sabre\DAV\Exception\ServiceUnavailable for every file/directory operation happening inside of SabreDAV. This is necessary to avoid having the exception bubble up to remote.php which would return an exception page instead of an appropriate response.
* | | | | | Merge pull request #12027 from owncloud/cleanup_exceptionsVincent Petry2014-11-101-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [encryption] clean up encryption exceptions
| * | | | | clean up encryption exceptionsBjoern Schiessle2014-11-071-2/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-102-2/+2
| | | | | |