summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #11946 from owncloud/load-vendor-from-core-jsonLukas Reschke2014-12-151-6/+15
|\ \ \ \ \
| * | | | | Implement method that reads vendor libs from core.jsonMorris Jobke2014-12-151-6/+15
* | | | | | Merge pull request #12555 from owncloud/app_specific_searchJörn Friedrich Dreyer2014-12-156-18/+69
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | introduce inApps[] filter for search via ajax query, make file results show u...Jörn Friedrich Dreyer2014-12-106-18/+69
* | | | | | Merge pull request #12839 from oparoz/ControllerMethodReflectorMorris Jobke2014-12-152-1/+66
|\ \ \ \ \ \
| * | | | | | Olivier Paroz \OCP\AppFramework\Utility\IControllerMethodReflectorOlivier Paroz2014-12-142-1/+66
* | | | | | | Merge pull request #12846 from owncloud/fix-searchbytags-testMorris Jobke2014-12-151-2/+6
|\ \ \ \ \ \ \
| * | | | | | | Sort results to make sure assert work on consistent orderVincent Petry2014-12-151-2/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #12625 from owncloud/app-dependencies-libs-and-commandsBernhard Posselt2014-12-1511-68/+705
|\ \ \ \ \ \ \
| * | | | | | | fixing owncloud versionThomas Müller2014-12-151-1/+2
| * | | | | | | adding unit tests for PlatformRepository::normalizeVersion()Thomas Müller2014-12-121-0/+65
| * | | | | | | rework api of DependencyAnalyzerThomas Müller2014-12-124-99/+94
| * | | | | | | check app dependencies on installation as wellThomas Müller2014-12-111-6/+21
| * | | | | | | fix unit testsThomas Müller2014-12-111-1/+1
| * | | | | | | single dependencies will not be represented as an array + fix unit testsThomas Müller2014-12-112-9/+24
| * | | | | | | adjust styling of missing dependencies in apps managementThomas Müller2014-12-112-4/+9
| * | | | | | | adding dependency to owncloud version - with fallback to requiremin and requi...Thomas Müller2014-12-115-1/+75
| * | | | | | | adding dependencies for supported platformsThomas Müller2014-12-114-1/+52
| * | | | | | | adding supported libraries - including min and max versionThomas Müller2014-12-116-8/+320
| * | | | | | | adding dependencies for command line toolsThomas Müller2014-12-113-20/+124
* | | | | | | | Merge pull request #11991 from owncloud/bower-jquery-uiMorris Jobke2014-12-1513-138/+353
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | bower jquery-ui - exported changes to a separate css fileMorris Jobke2014-12-1313-138/+353
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1532-4/+74
| |_|/ / / / / |/| | | | | |
* | | | | | | make regex in controllermethodreflector.php compatible with PCRE 6.xPhilipp Knechtges2014-12-141-1/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-14166-132/+244
* | | | | | | Merge pull request #12639 from owncloud/bad_mtime_formatMorris Jobke2014-12-133-4/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Return ? if mtime is 0 or -1Robin McCorkell2014-12-123-4/+30
* | | | | | | Merge pull request #12795 from owncloud/files-layoutchangesMorris Jobke2014-12-137-50/+71
|\ \ \ \ \ \ \
| * | | | | | | Replace input checkbox CSS selector with .electCheckBoxVincent Petry2014-12-112-22/+18
| * | | | | | | Move file thumbnail into the label elementVincent Petry2014-12-117-29/+54
* | | | | | | | Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-indexMorris Jobke2014-12-136-24/+157
|\ \ \ \ \ \ \ \
| * | | | | | | | Make comment clearLukas Reschke2014-12-121-1/+1
| * | | | | | | | Comment code pathLukas Reschke2014-12-121-0/+1
| * | | | | | | | Use limit and offsetLukas Reschke2014-12-121-1/+1
| * | | | | | | | Use array key instead of valueLukas Reschke2014-12-122-4/+15
| * | | | | | | | Add test for user without backendLukas Reschke2014-12-121-0/+16
| * | | | | | | | Use public interfaceLukas Reschke2014-12-112-6/+6
| * | | | | | | | Break loopLukas Reschke2014-12-111-0/+1
| * | | | | | | | Add filter for 'backend' to user REST routeLukas Reschke2014-12-106-17/+121
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1352-124/+120
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge pull request #12806 from owncloud/display-backend-in-usermgntVincent Petry2014-12-126-24/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | Show user backend in user managementMorris Jobke2014-12-126-24/+59
* | | | | | | | | Merge pull request #12778 from owncloud/searchbytags2Vincent Petry2014-12-1217-53/+375
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Added searchByTag in cache jail wrapperVincent Petry2014-12-121-0/+12
| * | | | | | | | Make $userId mandatory for searchByTagsVincent Petry2014-12-1210-32/+73
| * | | | | | | | Added searchByTags to view, storage and cacheVincent Petry2014-12-1110-0/+230
| * | | | | | | | Add user parameter to tag managerVincent Petry2014-12-114-38/+56
| * | | | | | | | Add login/logout to TestCase base classVincent Petry2014-12-101-0/+21
* | | | | | | | | Merge pull request #12812 from owncloud/remove-53-workaroundThomas Müller2014-12-121-6/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove conditional check for 5.3 compatibilityLukas Reschke2014-12-121-6/+1