summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13323 from owncloud/move-searchLukas Reschke2015-01-157-7/+7
|\ | | | | Move search to core/search
| * 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
|\ \ | | | | | | Fix for sticky grey highlight / selection in file list
| * | 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
|/ / | | | | | | | | | | In file lists with no selection checkbox, the CSS selector is different. The thumbnail also needs position:absolute and a z-index to be displayed above the row's grey highlight.
* | Merge pull request #13388 from owncloud/type-hint-url-paramsMorris Jobke2015-01-151-1/+1
|\ \ | | | | | | Add PHPDoc for `urlParams`
| * | 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 dispatch
| * | always set url parameters when they are available in the app dispatchBernhard Posselt2015-01-154-9/+35
|/ / | | | | | | | | | | prefer url parameters passed into the main method. If they are not present, use the containers urlParameters add space
* | Merge pull request #13370 from Sugaroverdose/fix_#13322Thomas Müller2015-01-151-0/+1
|\ \ | | | | | | Force browser to redraw favorite icon on src change
| * | Force browser to redraw favorite iconSugaroverdose2015-01-151-0/+1
| | | | | | | | | | | | on src change
* | | Merge pull request #13347 from owncloud/share-scanpermissionsfromsourceMorris Jobke2015-01-153-1/+47
|\ \ \ | | | | | | | | Use source storage permissions when scanning shared storage
| * | | 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 ...
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | HHVM: Do not use key() on array as the result depends on the internal array pointer.
| * | | | | 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.
| * | | | | | 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 files
| * | | | | | 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 entries
| * | | | | | | 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'
| * | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Autoload app's js translations
| * | | | | | 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 keys
| * | | | | | | Check for existence of $_GET keysLukas Reschke2015-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `$dir` may for example very well not get passed at well.
* | | | | | | | Merge pull request #13349 from owncloud/kill-deprecated-code-sharingThomas Müller2015-01-143-50/+51
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | remove deprecated code - fixes #13119
| * | | | | | | 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 compatibility
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Increase files_externals oC required version and its own version
| * | | | | | Increase files_externals oC required version and its own versionJoas Schilling2015-01-142-2/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #13341 from owncloud/update-readversionfromtemplateMorris Jobke2015-01-142-5/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Read version and product name from update template
| * | | | | Read version and product name from update templateVincent Petry2015-01-142-5/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | During upgrade, the config settings aren't always available due to base.php changes. This fix makes the update info page read the product name and version from the update template, which already had them.
* | | | | Merge pull request #13332 from oparoz/fix-download-buttonThomas Müller2015-01-141-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Download the current public folder only
| * | | | | Download the current public folder onlyOlivier Paroz2015-01-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From within a shared/public directory, when drilling down folders, some users want to be able to download what they're currently looking at, not the whole shared folder. The whole archive is always a click away anyway since a user can click on the home button.
* | | | | | Merge pull request #13286 from owncloud/sharing_upgradeBjörn Schießle2015-01-144-1/+131
|\ \ \ \ \ \ | | | | | | | | | | | | | | update script for new server-to-server sharing
| * | | | | | set accept to 1 (=true) for all server-to-server shares on update, at this ↵Bjoern Schiessle2015-01-134-1/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table