summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1816-22/+62
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1766-116/+946
|
* Merge pull request #13319 from owncloud/replace-line-breaks-in-app-descriptionLukas Reschke2015-01-172-1/+67
|\ | | | | replace line breaks in the app description by spaces - fixes #13315
| * OC_App::parseAppInfoMorris Jobke2015-01-142-1/+67
| | | | | | | | | | | | * replace line breaks (on non empty lines) in the app description by spaces * fixes #13315 * includes unit tests
* | Merge pull request #13421 from owncloud/fix-renameRobin McCorkell2015-01-161-1/+1
|\ \ | | | | | | Fixes shifted rename field
| * | Fixes shifted rename fieldMorris Jobke2015-01-161-1/+1
|/ /
* | Merge pull request #13418 from owncloud/app-iconsMorris Jobke2015-01-163-118/+10
|\ \ | | | | | | add icon for Provisioning API
| * | compress icons of LDAP and WebDAV-AuthJan-Christoph Borchardt2015-01-162-118/+6
| | |
| * | add icon for Provisioning APIJan-Christoph Borchardt2015-01-161-0/+4
|/ /
* | Merge pull request #13399 from owncloud/trashbin-fixpreviewrouteMorris Jobke2015-01-161-5/+2
|\ \ | | | | | | Fix preview route for trashbin
| * | Fix preview route for trashbinVincent Petry2015-01-151-5/+2
| | |
* | | Merge pull request #13413 from owncloud/apps-cancelloadonswitchMorris Jobke2015-01-161-2/+9
|\ \ \ | | | | | | | | Cancel app list load when switching categories
| * | | Cancel app list load when switching categoriesVincent Petry2015-01-161-2/+9
| | | |
* | | | Merge pull request #13160 from owncloud/extstorage-ocbackendnopartfileMorris Jobke2015-01-161-27/+59
|\ \ \ \ | | | | | | | | | | Disable part files for OC ext storage backend + s2s backend
| * | | | remove unused variable and fix undefined variableThomas Müller2015-01-081-5/+4
| | | | |
| * | | | Disable part files for OC ext storage backend + s2s backendVincent Petry2015-01-071-28/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files to an OC ext storage backend or when using server to server sharing storage, part files aren't needed because the backend already has its own part files and takes care of the final atomic rename operation. This also fixes issues when using two encrypted ownCloud instances where one mounts the other either as external storage (ownCloud backend) or through server to server sharing.
* | | | | Merge pull request #13412 from owncloud/app-management-sortMorris Jobke2015-01-161-0/+16
|\ \ \ \ \ | |_|/ / / |/| | | | sorting enabled and disabled apps alphabetically - fixes #13404
| * | | | sorting enabled and disabled apps alphabetically - fixes #13404Thomas Müller2015-01-161-0/+16
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-16242-84/+416
| | | |
* | | | Merge pull request #13406 from owncloud/fix-php-docFrank Karlitschek2015-01-151-0/+1
|\ \ \ \ | | | | | | | | | | Fix PHPDoc
| * | | | Fix PHPDocLukas Reschke2015-01-151-0/+1
| | | | |
* | | | | 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() workar...
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Remove children from the cache in one query
| * | | | | 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 only
| * | | | | Show mail address & display name if it is read onlyMorris Jobke2015-01-151-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gives the user the chance to verify it's mail address and display name * ref #12823 * fixes #13393
* | | | | | 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
| |/ / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 21:52:27 +0000