Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | File shares can't have create permissions | Roeland Jago Douma | 2015-12-14 | 2 | -1/+4 |
| | | | | fixes #21187 | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-12 | 88 | -0/+156 |
| | |||||
* | Merge pull request #21153 from owncloud/files-deleteactiontext | Thomas Müller | 2015-12-11 | 3 | -5/+49 |
|\ | | | | | Bring back file delete action text to be based on context | ||||
| * | Bring back file delete action text to be based on context | Vincent Petry | 2015-12-11 | 3 | -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-loggedout | Morris Jobke | 2015-12-11 | 2 | -2/+16 |
|\ \ | |/ |/| | Fix trashbin wrapper when no user is loggedin | ||||
| * | skip test if we cant use the filesystem when not logged in | Robin Appelman | 2015-12-11 | 1 | -2/+5 |
| | | |||||
| * | Fix thrashbin wrapper when no user is loggedin | Robin Appelman | 2015-12-11 | 2 | -2/+13 |
|/ | |||||
* | Merge pull request #20978 from owncloud/fix-dont-show-unsaved-values-in-usermgmt | Thomas Müller | 2015-12-11 | 1 | -3/+5 |
|\ | | | | | reset mailadress/displayname on blur | ||||
| * | reset mailadress/displayname on blur | michag86 | 2015-12-07 | 1 | -3/+5 |
| | | |||||
* | | Merge pull request #20878 from ↵ | Thomas Müller | 2015-12-11 | 3 | -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 CLI | Lukas Reschke | 2015-12-08 | 1 | -0/+5 |
| | | | |||||
| * | | Run .htaccess updates in any case | Lukas Reschke | 2015-12-08 | 2 | -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 .htaccess | Lukas Reschke | 2015-12-08 | 2 | -21/+0 |
| | | | | | | | | | | | | This can now be achieved using the new code signing. | ||||
* | | | Merge pull request #21144 from owncloud/dav-auth-checkduplicateheader | Thomas Müller | 2015-12-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Properly check X-Requested-With header in case of multiple values | ||||
| * | | | Properly check X-Requested-With header in case of multiple values | Vincent Petry | 2015-12-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Saw this happening in IE8... | ||||
* | | | | Merge pull request #21135 from owncloud/add-polyfill | Thomas Müller | 2015-12-11 | 14 | -255/+37 |
|\ \ \ \ | | | | | | | | | | | Add polyfills for PHP55, PHP56 and PHP70 functionalities | ||||
| * | | | | Adjust third-party reference | Lukas Reschke | 2015-12-11 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Use PHP polyfills | Lukas Reschke | 2015-12-11 | 14 | -255/+37 |
| | | | | | |||||
* | | | | | Merge pull request #21020 from owncloud/add-directory-slash-to-setup-code | Thomas Müller | 2015-12-11 | 2 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Add DirectorySlash to dynamic .htaccess write | ||||
| * | | | | | Add DirectorySlash to dynamic .htaccess write | Lukas Reschke | 2015-12-08 | 2 | -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-1 | Thomas Müller | 2015-12-11 | 14 | -16/+44 |
|\ \ \ \ \ | | | | | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | | | adjust PHPDoc | Thomas Müller | 2015-12-10 | 2 | -0/+4 |
| | | | | | | |||||
| * | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-10 | 14 | -16/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | | | | Merge pull request #21087 from owncloud/catchexceptionindirectdownloadurl | Thomas Müller | 2015-12-11 | 2 | -3/+33 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Catch exception when querying direct download link | ||||
| * | | | | | | Catch exception when querying direct download link | Vincent Petry | 2015-12-10 | 2 | -3/+33 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #21128 from owncloud/dav-fopen-non-existing | Thomas Müller | 2015-12-11 | 1 | -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->fopen | Robin Appelman | 2015-12-10 | 1 | -8/+14 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #21131 from owncloud/update-public-api | Thomas Müller | 2015-12-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | IMemcacheTTL was backported to 8.2.2 | ||||
| * | | | | | | | IMemcacheTTL was backported to 8.2.2 | Morris Jobke | 2015-12-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see #21113 | ||||
* | | | | | | | | Merge pull request #21137 from owncloud/update-issue-template.md | Thomas Müller | 2015-12-11 | 1 | -7/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Update issue template.md | ||||
| * | | | | | | | Remove steps for ownCloud 6 | Joas Schilling | 2015-12-11 | 1 | -6/+4 |
| | | | | | | | | |||||
| * | | | | | | | Fix the sample occ config call | Joas Schilling | 2015-12-11 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-11 | 122 | -316/+280 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #21123 from ↵ | Thomas Müller | 2015-12-10 | 1 | -7/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | owncloud/remove-db-locking-performance-warning-master Remove info about database locking performance | ||||
| * | | | | | | Remove info about database locking performance | Thomas Müller | 2015-12-10 | 1 | -7/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #21119 from owncloud/make-appconfig-more-robust | Thomas Müller | 2015-12-10 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Make AppManager->checkAppForUser more robust | ||||
| * | | | | | | Make AppManager->checkAppForUser more robust | Morris Jobke | 2015-12-10 | 1 | -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-tests | Thomas Müller | 2015-12-10 | 4 | -78/+215 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add test case for group share propagation | ||||
| * | | | | | | Add test case for group share propagation | Robin Appelman | 2015-12-10 | 4 | -78/+215 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #21086 from owncloud/storage-nocheckavailforgetowner | Thomas Müller | 2015-12-10 | 1 | -1/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Do not check storage availability for getOwner | ||||
| * | | | | | Do not check storage availability for getOwner | Vincent Petry | 2015-12-09 | 1 | -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-ttl | Thomas Müller | 2015-12-10 | 2 | -10/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove all locks after ttl from the db | ||||
| * | | | | | Remove all locks after ttl from the db | Robin Appelman | 2015-12-09 | 2 | -10/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #21073 from owncloud/memcache-lock-ttl | Thomas Müller | 2015-12-10 | 5 | -4/+55 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add ttl for redis based locking | ||||
| * | | | | | | add since | Robin Appelman | 2015-12-09 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | ttl for memcache locking backends that support it | Robin Appelman | 2015-12-09 | 3 | -2/+11 |
| | | | | | | | |||||
| * | | | | | | Add interface for memcache backends that support setting ttl on exisiting keys | Robin Appelman | 2015-12-09 | 2 | -2/+43 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #21109 from owncloud/proper-version-expire-dedup | Morris Jobke | 2015-12-10 | 2 | -37/+10 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Deduplicate version expire jobs | ||||
| * | | | | | Deduplicate version expire jobs | Morris Jobke | 2015-12-10 | 2 | -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-comments | Thomas Müller | 2015-12-10 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Add assertion to test |