summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* File shares can't have create permissionsRoeland Jago Douma2015-12-142-1/+4
| | | | fixes #21187
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-1288-0/+156
|
* Merge pull request #21153 from owncloud/files-deleteactiontextThomas Müller2015-12-113-5/+49
|\ | | | | Bring back file delete action text to be based on context
| * Bring back file delete action text to be based on contextVincent Petry2015-12-113-5/+49
| | | | | | | | | | | | | | | | For received shares, the delete action becomes "Unshare" and for personal mounts it becomes "Disconnect storage". This also makes it possible from now on to pass a function to a file action's "displayName" attribute.
* | Merge pull request #20081 from owncloud/trashbin-loggedoutMorris Jobke2015-12-112-2/+16
|\ \ | |/ |/| Fix trashbin wrapper when no user is loggedin
| * skip test if we cant use the filesystem when not logged inRobin Appelman2015-12-111-2/+5
| |
| * Fix thrashbin wrapper when no user is loggedinRobin Appelman2015-12-112-2/+13
|/
* Merge pull request #20978 from owncloud/fix-dont-show-unsaved-values-in-usermgmtThomas Müller2015-12-111-3/+5
|\ | | | | reset mailadress/displayname on blur
| * reset mailadress/displayname on blurmichag862015-12-071-3/+5
| |
* | Merge pull request #20878 from ↵Thomas Müller2015-12-113-39/+8
|\ \ | | | | | | | | | | | | owncloud/proper-htaccess-support-in-code-signing-checker Also run .htaccess routine when installing on another system than Apache
| * | Don't write directives from CLILukas Reschke2015-12-081-0/+5
| | |
| * | Run .htaccess updates in any caseLukas Reschke2015-12-082-18/+3
| | | | | | | | | | | | This is the same what we also do in updater.php and thus this aligns the code. Makes the code paths more consistent.
| * | Remove version check out of .htaccessLukas Reschke2015-12-082-21/+0
| | | | | | | | | | | | This can now be achieved using the new code signing.
* | | Merge pull request #21144 from owncloud/dav-auth-checkduplicateheaderThomas Müller2015-12-111-1/+1
|\ \ \ | | | | | | | | Properly check X-Requested-With header in case of multiple values
| * | | Properly check X-Requested-With header in case of multiple valuesVincent Petry2015-12-111-1/+1
| | | | | | | | | | | | | | | | Saw this happening in IE8...
* | | | Merge pull request #21135 from owncloud/add-polyfillThomas Müller2015-12-1114-255/+37
|\ \ \ \ | | | | | | | | | | Add polyfills for PHP55, PHP56 and PHP70 functionalities
| * | | | Adjust third-party referenceLukas Reschke2015-12-111-0/+0
| | | | |
| * | | | Use PHP polyfillsLukas Reschke2015-12-1114-255/+37
| | | | |
* | | | | Merge pull request #21020 from owncloud/add-directory-slash-to-setup-codeThomas Müller2015-12-112-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Add DirectorySlash to dynamic .htaccess write
| * | | | | Add DirectorySlash to dynamic .htaccess writeLukas Reschke2015-12-082-3/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `DirectorySlash off` is set then Apache will not lookup folders anymore. This is required for example when we use the rewrite directives on an existing path such as `/core/search`. By default Apache would load `/core/search/` instead `/core/search` so the redirect would fail here. This leads however to the problem that URLs such as `localhost/owncloud` would not load anymore while `localhost/owncloud/` would. This has caused problems such as https://github.com/owncloud/core/pull/21015 With this change we add the `DirectorySlash off` directive only when the `.htaccess` is writable to the dynamic part of it. This would also make `localhost/owncloud` work again as it would trigger the 404 directive which triggers the redirect in base.php.
* | | | | Merge pull request #21045 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-1114-16/+44
|\ \ \ \ \ | | | | | | | | | | | | Scrutinizer Auto-Fixes
| * | | | | adjust PHPDocThomas Müller2015-12-102-0/+4
| | | | | |
| * | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-1014-16/+40
| | | | | | | | | | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | | | Merge pull request #21087 from owncloud/catchexceptionindirectdownloadurlThomas Müller2015-12-112-3/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Catch exception when querying direct download link
| * | | | | | Catch exception when querying direct download linkVincent Petry2015-12-102-3/+33
| |/ / / / /
* | | | | | Merge pull request #21128 from owncloud/dav-fopen-non-existingThomas Müller2015-12-111-8/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dont do a seperate request to check if a file exists when downloading a file from dav external storage
| * | | | | | Dont do a seperate request to check if a file exists for dav->fopenRobin Appelman2015-12-101-8/+14
| | | | | | |
* | | | | | | Merge pull request #21131 from owncloud/update-public-apiThomas Müller2015-12-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | IMemcacheTTL was backported to 8.2.2
| * | | | | | | IMemcacheTTL was backported to 8.2.2Morris Jobke2015-12-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see #21113
* | | | | | | | Merge pull request #21137 from owncloud/update-issue-template.mdThomas Müller2015-12-111-7/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Update issue template.md
| * | | | | | | Remove steps for ownCloud 6Joas Schilling2015-12-111-6/+4
| | | | | | | |
| * | | | | | | Fix the sample occ config callJoas Schilling2015-12-111-1/+1
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-11122-316/+280
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #21123 from ↵Thomas Müller2015-12-101-7/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | owncloud/remove-db-locking-performance-warning-master Remove info about database locking performance
| * | | | | | Remove info about database locking performanceThomas Müller2015-12-101-7/+1
| | | | | | |
* | | | | | | Merge pull request #21119 from owncloud/make-appconfig-more-robustThomas Müller2015-12-101-0/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Make AppManager->checkAppForUser more robust
| * | | | | | Make AppManager->checkAppForUser more robustMorris Jobke2015-12-101-0/+7
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | * if the JSON that is stored in the DB is corrupt an error was thrown * with this change it is properly handled and the app is disabled
* | | | | | Merge pull request #21114 from owncloud/group-propagation-testsThomas Müller2015-12-104-78/+215
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add test case for group share propagation
| * | | | | | Add test case for group share propagationRobin Appelman2015-12-104-78/+215
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #21086 from owncloud/storage-nocheckavailforgetownerThomas Müller2015-12-101-1/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Do not check storage availability for getOwner
| * | | | | Do not check storage availability for getOwnerVincent Petry2015-12-091-1/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Because the owner is always known thanks to the file cache and other places, we don't need the remote storage to be actually available.
* | | | | Merge pull request #21072 from owncloud/db-lock-ttlThomas Müller2015-12-102-10/+4
|\ \ \ \ \ | | | | | | | | | | | | Remove all locks after ttl from the db
| * | | | | Remove all locks after ttl from the dbRobin Appelman2015-12-092-10/+4
| | | | | |
* | | | | | Merge pull request #21073 from owncloud/memcache-lock-ttlThomas Müller2015-12-105-4/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add ttl for redis based locking
| * | | | | | add sinceRobin Appelman2015-12-091-0/+1
| | | | | | |
| * | | | | | ttl for memcache locking backends that support itRobin Appelman2015-12-093-2/+11
| | | | | | |
| * | | | | | Add interface for memcache backends that support setting ttl on exisiting keysRobin Appelman2015-12-092-2/+43
| |/ / / / /
* | | | | | Merge pull request #21109 from owncloud/proper-version-expire-dedupMorris Jobke2015-12-102-37/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Deduplicate version expire jobs
| * | | | | Deduplicate version expire jobsMorris Jobke2015-12-102-37/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * versionSize is calculated anyway in the expire job - > dropped * offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation * fixes #21108
* | | | | Merge pull request #21105 from owncloud/fix-risky-test-commentsThomas Müller2015-12-101-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Add assertion to test