aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-182-8/+2
|
* Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemoryThomas Müller2016-03-172-7/+29
|\ | | | | Fix dropbox storage to not store the whole file in memory
| * Fix dropbox storage to not store the whole file in memoryVincent Petry2016-03-152-7/+29
| | | | | | | | | | | | Since the library can only store the full response in memory on download, we use an alternate client lib and set the correct headers to be able to stream the content to a temp file.
* | Merge pull request #23282 from owncloud/fix-caching-unavailable-ldapThomas Müller2016-03-172-3/+89
|\ \ | | | | | | fix writing to cache when fallback server should be used immediately
| * | fix writing to cache when fallback server should be used immediatelyArthur Schiwon2016-03-162-3/+89
| | |
* | | Merge pull request #23346 from owncloud/fix_23325Thomas Müller2016-03-171-0/+5
|\ \ \ | | | | | | | | Set proper public webdav permissions when public upload disabled
| * | | Set proper public webdav permissions when public upload disabledRoeland Jago Douma2016-03-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23325 It can happen that a user shares a folder with public upload. And some time later the admin disables public upload on the server. To make sure this is handled correctly we need to check the config value and reduce the permissions. Fix is kept small to be easy backportable.
* | | | Merge pull request #23287 from owncloud/issue-22786-absolute-pathsThomas Müller2016-03-171-2/+2
|\ \ \ \ | |/ / / |/| | | Fix absolute path creation for remote shares with /oc webroot
| * | | Make sure to append the web root as per docJoas Schilling2016-03-161-2/+2
| | | |
* | | | Merge pull request #23334 from owncloud/ext-user-mounting-guiThomas Müller2016-03-176-5/+14
|\ \ \ \ | | | | | | | | | | Display external storage GUI even if user mounting disabled
| * | | | Display external storage GUI even if user mounting disabledRobin McCorkell2016-03-166-5/+14
| | | | |
* | | | | Merge pull request #23336 from owncloud/occ-typosThomas Müller2016-03-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Some typo corrections in occ command output
| * | | | | Some typo corrections in occ command outputCarla Schroder2016-03-161-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-172-0/+6
|/ / / / /
* | | | | Merge pull request #23192 from ↵Thomas Müller2016-03-161-0/+7
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | owncloud/make-ancient-users-happy-with-totally-untested-stuff Fallback for crappy ancient distributions
| * | | | Fallback for crappy ancient distributionsLukas Reschke2016-03-121-0/+7
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23181
* | | | | Merge pull request #23253 from owncloud/give-swift-more-timeThomas Müller2016-03-161-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Give swift 15 seconds after startup
| * | | | | Give swift 15 seconds after startupMorris Jobke2016-03-161-2/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #23082 from owncloud/contacts_calendar_name_colorThomas Müller2016-03-161-0/+5
|\ \ \ \ \ | | | | | | | | | | | | add title and color to birthday calendar
| * | | | | add title and color to birthday calendarGeorg Ehrke2016-03-101-0/+5
| | | | | |
* | | | | | handle connection errors as storage not available in smbRobin Appelman2016-03-161-14/+40
| |/ / / / |/| | | |
* | | | | Merge pull request #23155 from owncloud/fed-unshare-withThomas Müller2016-03-162-1/+33
|\ \ \ \ \ | |_|_|/ / |/| | | | Specify the target user when unsharing a federated share
| * | | | Specify the target user when unsharing a federated shareRobin Appelman2016-03-142-1/+33
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-164-2/+6
| | | | |
* | | | | Merge pull request #23251 from owncloud/fix_22907Thomas Müller2016-03-152-2/+42
|\ \ \ \ \ | |_|_|_|/ |/| | | | allow group shares, even if not all public keys are available
| * | | | allow group shares, even if not all public keys are availableBjoern Schiessle2016-03-152-2/+42
| | | | |
* | | | | Merge pull request #22998 from owncloud/delay-loading-the-scannerThomas Müller2016-03-152-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Delay check till scanner is used
| * | | | | Delay check till scanner is usedLukas Reschke2016-03-092-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
* | | | | | Merge pull request #23039 from owncloud/invalid-share-storageThomas Müller2016-03-154-352/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | dont break when there is an invalid share
| * | | | | | move failedstorage to coreRobin Appelman2016-03-114-359/+2
| | | | | | |
| * | | | | | dont break when there is an invalid shareRobin Appelman2016-03-112-6/+31
| | | | | | |
* | | | | | | Merge pull request #23074 from ↵Thomas Müller2016-03-152-4/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | owncloud/issue-22835-correctly-use-querybuilder-api Correctly escape join statements and use selectAlias
| * | | | | | Correctly escape join statements and use selectAliasJoas Schilling2016-03-102-4/+4
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1516-12/+70
| |_|_|/ / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1420-14/+22
| | | | | |
* | | | | | Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1Thomas Müller2016-03-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Mark testing app as compatible with 9.1
| * | | | | | Mark testing app as compatible with 9.1Lukas Reschke2016-03-131-1/+1
| | | | | | |
* | | | | | | Merge pull request #23091 from ↵Thomas Müller2016-03-131-7/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | owncloud/issue-23085-csae-insensitive-group-search Return the correct group casing in sharee api
| * | | | | | Correctly lower the search input as wellJoas Schilling2016-03-111-5/+5
| | | | | | |
| * | | | | | Return the correct group casing in sharee apiJoas Schilling2016-03-111-2/+2
| | |/ / / / | |/| | | |
* | | | | | Fix intergration testsRoeland Jago Douma2016-03-131-893/+631
| | | | | |
* | | | | | Remove the old OCS Share API codeRoeland Jago Douma2016-03-131-645/+0
| |_|_|_|/ |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1210-6/+38
|/ / / /
* | | | Merge pull request #23080 from owncloud/use-non-localized-birthday-titleThomas Müller2016-03-112-3/+3
|\ \ \ \ | | | | | | | | | | Use a birthday title which does not require translation because we ha…
| * | | | Use a birthday title which does not require translation because we have no ↵Thomas Müller2016-03-102-3/+3
| | |_|/ | |/| | | | | | | | | | idea about the target device language and forcing English upon all users is kind of bad
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1126-80/+218
| | | |
* | | | Merge pull request #23086 from owncloud/ldap-sort-deprecatedThomas Müller2016-03-113-30/+1
|\ \ \ \ | | | | | | | | | | remove deprecated ldap_sort
| * | | | remove deprecated ldap_sortArthur Schiwon2016-03-103-30/+1
| |/ / /
* | | | Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-masterThomas Müller2016-03-103-12/+65
|\ \ \ \ | | | | | | | | | | getOwner is not available on FileHome
| * | | | getOwner is not available on FileHome - fixes #23116Thomas Müller2016-03-103-12/+65
| |/ / /