summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-1810-8/+52
|
* Merge pull request #12901 from owncloud/move-ldap-check-to-managerRobin McCorkell2014-12-182-3/+3
|\ | | | | Move the Null-Byte LDAP check to the user manager
| * Move the Null-Byte LDAP check to the user managerLukas Reschke2014-12-172-3/+3
| | | | | | | | | | | | The existing method is deprecated and just a wrapper around the manager method. Since in the future other code paths might call this function instead we need to perform that check here. Related to http://owncloud.org/security/advisory/?id=oc-sa-2014-020
* | Merge pull request #12913 from owncloud/hhvm-memcached-clearRobin McCorkell2014-12-181-1/+7
|\ \ | | | | | | HHVM: Add workaround for missing Memcached::deleteMulti()
| * | HHVM: Add workaround for missing Memcached::deleteMulti()Andreas Fischer2014-12-171-1/+7
| |/
* | Merge pull request #12917 from owncloud/fix-ocs-12915-apiMorris Jobke2014-12-183-6/+17
|\ \ | | | | | | Move basic auth login out of `isLoggedIn`
| * | Check basic auth header only for not-logged-in usersLukas Reschke2014-12-171-1/+1
| | |
| * | Store result of authenticationLukas Reschke2014-12-171-1/+7
| | |
| * | Move basic auth login out of `isLoggedIn`Lukas Reschke2014-12-172-5/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/12915 and opens the door for potential other bugs... Please test very carefully, this includes: - Testing from OCS via cURL (as in #12915) - Testing from OCS via browser (Open the "Von Dir geteilt" shares overview) - WebDAV - CalDAV - CardDAV
* | Merge pull request #12892 from owncloud/is-addminMorris Jobke2014-12-176-5/+66
|\ \ | | | | | | Add isAdmin and isInGroup methods for the group manager
| * | add isAdmin and isInGroup methods for the group managerBernhard Posselt2014-12-174-4/+45
| | |
| * | add a isLoggedIn method to the usersession and deprecate the isLoggedIn ↵Bernhard Posselt2014-12-174-1/+21
| |/ | | | | | | method on the api
* / HHVM: Call libxml_use_internal_errors() instead of surpressing errors.Andreas Fischer2014-12-171-1/+2
|/ | | | In contrast to the previous solution, this also works on HHVM.
* Merge pull request #12889 from owncloud/deprecation-timeThomas Müller2014-12-174-0/+28
|\ | | | | Deprecate old and replaced appframework apis
| * first round of deprecationBernhard Posselt2014-12-164-0/+28
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1716-6/+118
| |
* | Move timezone logic out of server.phpJoas Schilling2014-12-163-23/+103
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-1628-32/+8
|
* Merge pull request #12360 from owncloud/files-tagsLukas Reschke2014-12-151-1/+6
|\ | | | | Add favorites to files app
| * Return file info from Node APIVincent Petry2014-12-151-1/+6
| |
* | Merge pull request #11946 from owncloud/load-vendor-from-core-jsonLukas Reschke2014-12-151-6/+15
|\ \ | | | | | | Implement method that reads vendor libs from core.json
| * | Implement method that reads vendor libs from core.jsonMorris Jobke2014-12-151-6/+15
| | | | | | | | | | | | * includes them at the beginning of initTemplate()
* | | Merge pull request #12555 from owncloud/app_specific_searchJörn Friedrich Dreyer2014-12-153-13/+45
|\ \ \ | |/ / |/| | introduce inApps[] filter for search via ajax query
| * | introduce inApps[] filter for search via ajax query, make file results show ↵Jörn Friedrich Dreyer2014-12-103-13/+45
| | | | | | | | | | | | | | | | | | | | | | | | up in files app only use more flexible return type check array with !empty instead of count
* | | Merge pull request #12839 from oparoz/ControllerMethodReflectorMorris Jobke2014-12-152-1/+66
|\ \ \ | | | | | | | | \OCP\AppFramework\Utility\IControllerMethodReflector
| * | | Olivier Paroz \OCP\AppFramework\Utility\IControllerMethodReflectorOlivier Paroz2014-12-142-1/+66
| | | |
* | | | Merge pull request #12625 from owncloud/app-dependencies-libs-and-commandsBernhard Posselt2014-12-154-47/+447
|\ \ \ \ | | | | | | | | | | adding dependencies for command line tools and php libraries
| * | | | fixing owncloud versionThomas Müller2014-12-151-1/+2
| | | | |
| * | | | rework api of DependencyAnalyzerThomas Müller2014-12-122-78/+78
| | | | |
| * | | | check app dependencies on installation as wellThomas Müller2014-12-111-6/+21
| | | | |
| * | | | single dependencies will not be represented as an array + fix unit testsThomas Müller2014-12-111-6/+19
| | | | |
| * | | | adding dependency to owncloud version - with fallback to requiremin and ↵Thomas Müller2014-12-112-0/+35
| | | | | | | | | | | | | | | | | | | | requiremax
| * | | | adding dependencies for supported platformsThomas Müller2014-12-111-0/+21
| | | | |
| * | | | adding supported libraries - including min and max versionThomas Müller2014-12-113-7/+257
| | | | |
| * | | | adding dependencies for command line toolsThomas Müller2014-12-112-18/+83
| | | | |
* | | | | Merge pull request #11991 from owncloud/bower-jquery-uiMorris Jobke2014-12-151-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | bower jquery-ui - exported changes to a separate css file
| * | | | bower jquery-ui - exported changes to a separate css fileMorris Jobke2014-12-131-2/+3
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-152-0/+4
| |_|/ / |/| | |
* | | | make regex in controllermethodreflector.php compatible with PCRE 6.xPhilipp Knechtges2014-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | The syntax ?<...> seems to be only supported from PCRE 7.0 on. For backwards-compability ?P<...> is used.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-142-4/+4
| | | |
* | | | Merge pull request #12639 from owncloud/bad_mtime_formatMorris Jobke2014-12-131-1/+1
|\ \ \ \ | |/ / / |/| | | Fix formatting of bad dates from external storages
| * | | Return ? if mtime is 0 or -1Robin McCorkell2014-12-121-1/+1
| | | | | | | | | | | | | | | | Tooltip contains 'Unable to determine date'. Fixes #6395
* | | | Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-indexMorris Jobke2014-12-133-4/+19
|\ \ \ \ | | | | | | | | | | Add filter for backend to rest index
| * | | | Use public interfaceLukas Reschke2014-12-112-6/+6
| | | | |
| * | | | Add filter for 'backend' to user REST routeLukas Reschke2014-12-103-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a "backend" type filter to the index REST route which is a pre-requisite for https://github.com/owncloud/core/issues/12620 For example when calling `index.php/settings/users/users?offset=0&limit=10&gid=&pattern=&backend=OC_User_Database` only users within the backend `OC_User_Database` would be shown. (requires sending a CSRF token as well) Depends upon https://github.com/owncloud/core/pull/12711
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1310-12/+12
| | | | |
* | | | | Merge pull request #12778 from owncloud/searchbytags2Vincent Petry2014-12-1211-29/+146
|\ \ \ \ \ | | | | | | | | | | | | Added searchByTags to view, storage and cache
| * | | | | Added searchByTag in cache jail wrapperVincent Petry2014-12-121-0/+12
| | | | | |
| * | | | | Make $userId mandatory for searchByTagsVincent Petry2014-12-127-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $userId is now a mandatory parameter for searchByTags. Also fixed some places in the code where the argument was missing (Node API and View)
| * | | | | Added searchByTags to view, storage and cacheVincent Petry2014-12-117-0/+100
| | | | | |