summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #13389 from owncloud/issue/13372-failing-oracle-tests-jenkinsThomas Müller2015-01-152-51/+110
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Mask table and column names with backticks and add lastInsertID() workaroundJoas Schilling2015-01-152-51/+110
* | | | | | | Merge pull request #13394 from owncloud/cache-remove-folderThomas Müller2015-01-152-24/+55
|\ \ \ \ \ \ \
| * | | | | | | Additional unit test for recursive removeRobin Appelman2015-01-151-0/+19
| * | | | | | | Remove children from the cache in one queryRobin Appelman2015-01-151-24/+36
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #13395 from owncloud/show-readonly-mailLukas Reschke2015-01-151-0/+14
|\ \ \ \ \ \ \
| * | | | | | | Show mail address & display name if it is read onlyMorris Jobke2015-01-151-0/+14
* | | | | | | | Merge pull request #13323 from owncloud/move-searchLukas Reschke2015-01-157-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | adjust paths for searchMorris Jobke2015-01-144-7/+7
| * | | | | | | | move search folder into core/Morris Jobke2015-01-134-0/+0
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #13397 from owncloud/files-greyhighlightondownloadLukas Reschke2015-01-153-1/+35
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Disallow ctrl click to select when selection not allowedVincent Petry2015-01-152-1/+31
| * | | | | | | Auto-blur when clicking on file to downloadVincent Petry2015-01-151-0/+2
| * | | | | | | Fixed thumbnal z-index for when no checkbox is thereVincent Petry2015-01-151-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #13388 from owncloud/type-hint-url-paramsMorris Jobke2015-01-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add PHPDoc for `urlParams`Lukas Reschke2015-01-151-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #13387 from owncloud/fix-urlparametersMorris Jobke2015-01-154-9/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | always set url parameters when they are available in the app dispatchBernhard Posselt2015-01-154-9/+35
|/ / / / / /
* | | | | | Merge pull request #13370 from Sugaroverdose/fix_#13322Thomas Müller2015-01-151-0/+1
|\ \ \ \ \ \
| * | | | | | Force browser to redraw favorite iconSugaroverdose2015-01-151-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #13347 from owncloud/share-scanpermissionsfromsourceMorris Jobke2015-01-153-1/+47
|\ \ \ \ \ \
| * | | | | | Use source storage permissions when scanning shared storageVincent Petry2015-01-143-1/+47
* | | | | | | Merge pull request #13375 from owncloud/previewsMorris Jobke2015-01-151-1/+10
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Note in config.sample.php that certain previews are not available in ms windowsCarla Schroder2015-01-151-1/+10
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1516-8/+160
* | | | | | | Merge pull request #13352 from owncloud/hhvm-array-keyRobin McCorkell2015-01-151-5/+6
|\ \ \ \ \ \ \
| * | | | | | | Do not use key() on array as the result depends on the internal array pointer.Andreas Fischer2015-01-151-5/+6
* | | | | | | | Merge pull request #13354 from owncloud/hhvm-redisMorris Jobke2015-01-151-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | HHVM: Prevent E_WARNING messages by Redis test in console output.Andreas Fischer2015-01-141-0/+10
| |/ / / / / / /
* | | | | | | | Merge pull request #13317 from owncloud/partfile-fileinfoThomas Müller2015-01-142-0/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Return valid fileinfo objects for part filesRobin Appelman2015-01-132-0/+45
* | | | | | | | | Merge pull request #13344 from owncloud/issue/13334-cleanup-tags-repairstepMorris Jobke2015-01-143-1/+260
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a repair step to clean up orphan tags and tag entriesJoas Schilling2015-01-143-1/+260
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13367 from owncloud/type-hint-server-method-from-requestMorris Jobke2015-01-141-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add PHPDoc for magic property 'server'Lukas Reschke2015-01-141-1/+3
* | | | | | | | | Merge pull request #13350 from owncloud/autoload-translationsMorris Jobke2015-01-149-11/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | ignore coreBernhard Posselt2015-01-141-1/+4
| * | | | | | | | move check into addTranslation methodBernhard Posselt2015-01-141-11/+1
| * | | | | | | | dont load core scritpsBernhard Posselt2015-01-141-1/+3
| * | | | | | | | Remove unneeded addTranslations() callsVincent Petry2015-01-148-11/+0
| * | | | | | | | only load translsations for appsBernhard Posselt2015-01-141-1/+3
| * | | | | | | | make translation lookup faster (O(n) -> O(1))Bernhard Posselt2015-01-141-2/+2
| * | | | | | | | autoload app's js translationsBernhard Posselt2015-01-141-0/+7
* | | | | | | | | Merge pull request #13351 from owncloud/check-for-existenceLukas Reschke2015-01-141-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check for existence of $_GET keysLukas Reschke2015-01-141-2/+2
* | | | | | | | | | Merge pull request #13349 from owncloud/kill-deprecated-code-sharingThomas Müller2015-01-143-50/+51
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | remove deprecated code - fixes #13119Thomas Müller2015-01-143-50/+51
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13348 from owncloud/fix-app-required-oc-version-checkMorris Jobke2015-01-143-4/+59
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Check new and old ways of required oC version for app compatibilityJoas Schilling2015-01-143-4/+59
* | | | | | | | | Merge pull request #13345 from owncloud/increase-files-external-versionsMorris Jobke2015-01-142-2/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |