Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-18 | 10 | -8/+52 |
| | |||||
* | Merge pull request #12901 from owncloud/move-ldap-check-to-manager | Robin McCorkell | 2014-12-18 | 2 | -3/+3 |
|\ | | | | | Move the Null-Byte LDAP check to the user manager | ||||
| * | Move the Null-Byte LDAP check to the user manager | Lukas Reschke | 2014-12-17 | 2 | -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-clear | Robin McCorkell | 2014-12-18 | 1 | -1/+7 |
|\ \ | | | | | | | HHVM: Add workaround for missing Memcached::deleteMulti() | ||||
| * | | HHVM: Add workaround for missing Memcached::deleteMulti() | Andreas Fischer | 2014-12-17 | 1 | -1/+7 |
| |/ | |||||
* | | Merge pull request #12917 from owncloud/fix-ocs-12915-api | Morris Jobke | 2014-12-18 | 3 | -6/+17 |
|\ \ | | | | | | | Move basic auth login out of `isLoggedIn` | ||||
| * | | Check basic auth header only for not-logged-in users | Lukas Reschke | 2014-12-17 | 1 | -1/+1 |
| | | | |||||
| * | | Store result of authentication | Lukas Reschke | 2014-12-17 | 1 | -1/+7 |
| | | | |||||
| * | | Move basic auth login out of `isLoggedIn` | Lukas Reschke | 2014-12-17 | 2 | -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-addmin | Morris Jobke | 2014-12-17 | 6 | -5/+66 |
|\ \ | | | | | | | Add isAdmin and isInGroup methods for the group manager | ||||
| * | | add isAdmin and isInGroup methods for the group manager | Bernhard Posselt | 2014-12-17 | 4 | -4/+45 |
| | | | |||||
| * | | add a isLoggedIn method to the usersession and deprecate the isLoggedIn ↵ | Bernhard Posselt | 2014-12-17 | 4 | -1/+21 |
| |/ | | | | | | | method on the api | ||||
* / | HHVM: Call libxml_use_internal_errors() instead of surpressing errors. | Andreas Fischer | 2014-12-17 | 1 | -1/+2 |
|/ | | | | In contrast to the previous solution, this also works on HHVM. | ||||
* | Merge pull request #12889 from owncloud/deprecation-time | Thomas Müller | 2014-12-17 | 4 | -0/+28 |
|\ | | | | | Deprecate old and replaced appframework apis | ||||
| * | first round of deprecation | Bernhard Posselt | 2014-12-16 | 4 | -0/+28 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-17 | 16 | -6/+118 |
| | | |||||
* | | Move timezone logic out of server.php | Joas Schilling | 2014-12-16 | 3 | -23/+103 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-16 | 28 | -32/+8 |
| | |||||
* | Merge pull request #12360 from owncloud/files-tags | Lukas Reschke | 2014-12-15 | 1 | -1/+6 |
|\ | | | | | Add favorites to files app | ||||
| * | Return file info from Node API | Vincent Petry | 2014-12-15 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #11946 from owncloud/load-vendor-from-core-json | Lukas Reschke | 2014-12-15 | 1 | -6/+15 |
|\ \ | | | | | | | Implement method that reads vendor libs from core.json | ||||
| * | | Implement method that reads vendor libs from core.json | Morris Jobke | 2014-12-15 | 1 | -6/+15 |
| | | | | | | | | | | | | * includes them at the beginning of initTemplate() | ||||
* | | | Merge pull request #12555 from owncloud/app_specific_search | Jörn Friedrich Dreyer | 2014-12-15 | 3 | -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 Dreyer | 2014-12-10 | 3 | -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/ControllerMethodReflector | Morris Jobke | 2014-12-15 | 2 | -1/+66 |
|\ \ \ | | | | | | | | | \OCP\AppFramework\Utility\IControllerMethodReflector | ||||
| * | | | Olivier Paroz \OCP\AppFramework\Utility\IControllerMethodReflector | Olivier Paroz | 2014-12-14 | 2 | -1/+66 |
| | | | | |||||
* | | | | Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands | Bernhard Posselt | 2014-12-15 | 4 | -47/+447 |
|\ \ \ \ | | | | | | | | | | | adding dependencies for command line tools and php libraries | ||||
| * | | | | fixing owncloud version | Thomas Müller | 2014-12-15 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | rework api of DependencyAnalyzer | Thomas Müller | 2014-12-12 | 2 | -78/+78 |
| | | | | | |||||
| * | | | | check app dependencies on installation as well | Thomas Müller | 2014-12-11 | 1 | -6/+21 |
| | | | | | |||||
| * | | | | single dependencies will not be represented as an array + fix unit tests | Thomas Müller | 2014-12-11 | 1 | -6/+19 |
| | | | | | |||||
| * | | | | adding dependency to owncloud version - with fallback to requiremin and ↵ | Thomas Müller | 2014-12-11 | 2 | -0/+35 |
| | | | | | | | | | | | | | | | | | | | | requiremax | ||||
| * | | | | adding dependencies for supported platforms | Thomas Müller | 2014-12-11 | 1 | -0/+21 |
| | | | | | |||||
| * | | | | adding supported libraries - including min and max version | Thomas Müller | 2014-12-11 | 3 | -7/+257 |
| | | | | | |||||
| * | | | | adding dependencies for command line tools | Thomas Müller | 2014-12-11 | 2 | -18/+83 |
| | | | | | |||||
* | | | | | Merge pull request #11991 from owncloud/bower-jquery-ui | Morris Jobke | 2014-12-15 | 1 | -2/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | bower jquery-ui - exported changes to a separate css file | ||||
| * | | | | bower jquery-ui - exported changes to a separate css file | Morris Jobke | 2014-12-13 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-15 | 2 | -0/+4 |
| |_|/ / |/| | | | |||||
* | | | | make regex in controllermethodreflector.php compatible with PCRE 6.x | Philipp Knechtges | 2014-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | The syntax ?<...> seems to be only supported from PCRE 7.0 on. For backwards-compability ?P<...> is used. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-14 | 2 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #12639 from owncloud/bad_mtime_format | Morris Jobke | 2014-12-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix formatting of bad dates from external storages | ||||
| * | | | Return ? if mtime is 0 or -1 | Robin McCorkell | 2014-12-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Tooltip contains 'Unable to determine date'. Fixes #6395 | ||||
* | | | | Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index | Morris Jobke | 2014-12-13 | 3 | -4/+19 |
|\ \ \ \ | | | | | | | | | | | Add filter for backend to rest index | ||||
| * | | | | Use public interface | Lukas Reschke | 2014-12-11 | 2 | -6/+6 |
| | | | | | |||||
| * | | | | Add filter for 'backend' to user REST route | Lukas Reschke | 2014-12-10 | 3 | -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 transifex | Jenkins for ownCloud | 2014-12-13 | 10 | -12/+12 |
| | | | | | |||||
* | | | | | Merge pull request #12778 from owncloud/searchbytags2 | Vincent Petry | 2014-12-12 | 11 | -29/+146 |
|\ \ \ \ \ | | | | | | | | | | | | | Added searchByTags to view, storage and cache | ||||
| * | | | | | Added searchByTag in cache jail wrapper | Vincent Petry | 2014-12-12 | 1 | -0/+12 |
| | | | | | | |||||
| * | | | | | Make $userId mandatory for searchByTags | Vincent Petry | 2014-12-12 | 7 | -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 cache | Vincent Petry | 2014-12-11 | 7 | -0/+100 |
| | | | | | |