Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20348 from owncloud/issue-20303-integer-group-names | Thomas Müller | 2015-11-06 | 1 | -1/+3 |
|\ | | | | | Make sure that group names are strings not integers | ||||
| * | Make sure that group names are strings not integers | Joas Schilling | 2015-11-06 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #20288 from owncloud/fix_20234 | Thomas Müller | 2015-11-06 | 1 | -1/+13 |
|\ \ | |/ |/| | make sure that we update the unencrypted size for the versions | ||||
| * | make sure that we update the unencrypted size for the versions | Björn Schießle | 2015-11-04 | 1 | -1/+13 |
| | | |||||
* | | Add unshare hooks | Roeland Jago Douma | 2015-11-05 | 3 | -2/+59 |
| | | |||||
* | | The new sharing code now handles deletion | Roeland Jago Douma | 2015-11-05 | 7 | -103/+532 |
| | | | | | | | | OCS -> ShareManager -> DefaultShareProvider | ||||
* | | Initial setup of shareing 2.0 sharemanager and share | Roeland Jago Douma | 2015-11-05 | 3 | -0/+623 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added sharemanager class This is the central class where all API calls talk to (OCS/Activity). This in turn talks to the share providers to get the actual sharing done. It uses all ShareObjects * Added share class Simple class to hold all the share properties that is passed around * Added IShareProvider interface Interface that providers os a share have to implement. | ||||
* | | subadmin methods should not return any null user or group | Arthur Schiwon | 2015-11-05 | 1 | -6/+16 |
| | | |||||
* | | Merge pull request #20053 from owncloud/getfileinfo-locking | Thomas Müller | 2015-11-04 | 2 | -39/+62 |
|\ \ | | | | | | | Don't lock if we're only reading cache metadata | ||||
| * | | mark path as checked | Robin Appelman | 2015-11-04 | 1 | -0/+1 |
| | | | |||||
| * | | when a file is locked use old cache data | Robin Appelman | 2015-11-04 | 1 | -29/+37 |
| | | | |||||
| * | | fix whitespace | Robin Appelman | 2015-11-04 | 1 | -2/+2 |
| | | | |||||
| * | | only lock in getDirectoryContent if we need to update the cache | Robin Appelman | 2015-11-03 | 1 | -21/+17 |
| | | | |||||
| * | | only lock in getFileInfo if we need to update the cache | Robin Appelman | 2015-11-03 | 1 | -18/+16 |
| | | | |||||
| * | | Split checkUpdate | Robin Appelman | 2015-11-03 | 1 | -19/+39 |
| |/ | |||||
* | | Merge pull request #18361 from owncloud/sharing_performance_improvements | Thomas Müller | 2015-11-04 | 2 | -5/+27 |
|\ \ | | | | | | | improve calculation of share recipients | ||||
| * | | cache result from parent folders | Bjoern Schiessle | 2015-11-04 | 2 | -5/+27 |
| |/ | |||||
* | | Merge pull request #18821 from owncloud/global-classes | Thomas Müller | 2015-11-04 | 1 | -0/+1 |
|\ \ | |/ |/| | Global classes in core CSS | ||||
| * | Global Classes for Core. | Raghu Nayyar | 2015-11-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Move up the global styles up the hierarchy. Adds Clear Left, Right and both. New CSS file for Global Styles. | ||||
* | | Add a new core capability which tells the clients which url to use | Thomas Müller | 2015-11-03 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #20196 from ↵ | Thomas Müller | 2015-11-02 | 1 | -9/+9 |
|\ \ | |/ |/| | | | | | owncloud/use-actual-mimetype-detection-instead-of-oath Use actual mimetype detection instead of extension | ||||
| * | Use actual mimetype detection instead of extension | Lukas Reschke | 2015-10-31 | 1 | -9/+9 |
| | | | | | | | | We cannot rely on the extension as the file may also be a valid TAR or ZIP file without such content. Especially when getting resources from the ownCloud appstore. | ||||
* | | Merge pull request #20189 from owncloud/use-get-http-protocol | Thomas Müller | 2015-11-02 | 3 | -6/+6 |
|\ \ | | | | | | | Use getHttpProtocol instead of $_SERVER | ||||
| * | | Use getHttpProtocol instead of $_SERVER | Lukas Reschke | 2015-10-30 | 3 | -6/+6 |
| |/ | |||||
* / | Add support for Redis password auth | Lukas Reschke | 2015-10-30 | 1 | -0/+3 |
|/ | | | | | | For enhanced security it is recommended to configure Redis to only accept connections with a password. (http://redis.io/topics/security) This is especially critical since Redis supports the LUA scripting language and thus a simple SSRF vulnerability (as proven in http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/ for example) may lead to a remote code execution. | ||||
* | Add warning for broken l10n json files | Morris Jobke | 2015-10-30 | 1 | -0/+2 |
| | | | | * makes it easier to spot broken l10n files | ||||
* | Merge pull request #20135 from owncloud/check-if-null-subadmin | Thomas Müller | 2015-10-29 | 7 | -212/+57 |
|\ | | | | | Drop OC_SubAdmin and replace usages | ||||
| * | Drop OC_SubAdmin and replace usages | Lukas Reschke | 2015-10-29 | 7 | -212/+57 |
| | | |||||
* | | Merge pull request #20060 from owncloud/cache-move-final-update-transaction | Robin Appelman | 2015-10-29 | 1 | -2/+6 |
|\ \ | | | | | | | include the final update in the transaction when moving a folder in the cache | ||||
| * | | include the final update in the transaction when moving a folder in the cache | Robin Appelman | 2015-10-29 | 1 | -2/+6 |
| | | | |||||
* | | | Merge pull request #19592 from owncloud/availability-root-always-exists | Thomas Müller | 2015-10-29 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | The root of a storage always exists | ||||
| * | | The root of a storage always exists | Robin Appelman | 2015-10-29 | 1 | -0/+3 |
| |/ | |||||
* | | Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename | Thomas Müller | 2015-10-29 | 2 | -1/+23 |
|\ \ | | | | | | | On rename, also refresh storage_mtime of the target file | ||||
| * | | Also adjust storage_mtime of target after rename | Vincent Petry | 2015-10-26 | 2 | -1/+23 |
| | | | | | | | | | | | | Some storages like Dropbox change their mtime on rename... | ||||
* | | | Merge pull request #11509 from owncloud/internal_email_template | Thomas Müller | 2015-10-29 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | Allow separate templates for internal and external share notifications | ||||
| * | | | Allow separate templates for internal and external share notifications | Stephen Colebrook | 2015-10-29 | 1 | -5/+5 |
| | |/ | |/| | |||||
* / | | Add a repair step that checks for group membership on shares | Joas Schilling | 2015-10-29 | 1 | -0/+13 |
|/ / | |||||
* | | Merge pull request #19182 from cweiske/support-bzip2 | Thomas Müller | 2015-10-28 | 2 | -2/+2 |
|\ \ | | | | | | | Fix #19181: Support .bz2 app archives | ||||
| * | | Fix #19181: Support .bz2 app archives | Christian Weiske | 2015-10-20 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | At first a bz2 handling in needs to be fixed; PEAR's Archive_Tar otherwise gives the following error: > Unsupported compression type "bz" > Supported types are "gz", "bz2" and "lzma2" After that we can whitelist the application/bz2 MIME type in the installer. | ||||
* | | | Make \OC\SubAdmin php-5.4 compatible | Roeland Jago Douma | 2015-10-28 | 1 | -4/+19 |
| | | | | | | | | | | | | * Also close some cursors while we are at it | ||||
* | | | Merge pull request #19837 from owncloud/always-enabled-apps | Thomas Müller | 2015-10-26 | 2 | -37/+51 |
|\ \ \ | | | | | | | | | Store list of apps which cannot be disabled in shipped.json | ||||
| * | | | Fail hard if shipped.json is missing | Thomas Müller | 2015-10-26 | 1 | -9/+5 |
| | | | | |||||
| * | | | Don't show apps which are always enabled in the app manager | Thomas Müller | 2015-10-26 | 2 | -9/+14 |
| | | | | |||||
| * | | | Store list of apps which cannot be disabled in shipped.json | Thomas Müller | 2015-10-26 | 2 | -33/+46 |
| | | | | |||||
* | | | | Update license headers | Lukas Reschke | 2015-10-26 | 31 | -28/+31 |
| |_|/ |/| | | |||||
* | | | Merge pull request #19982 from owncloud/fix-link-sharing-regression-master | Thomas Müller | 2015-10-26 | 1 | -8/+20 |
|\ \ \ | |/ / |/| | | Ensure the password is only hashed in case it's changed on the client… | ||||
| * | | Fix for broken ajax/share.php endpoint | Roeland Jago Douma | 2015-10-23 | 1 | -8/+16 |
| | | | | | | | | | | | | | | | Even more code mess :( All tests pass again. But I'm really not happy with this endpoint. | ||||
| * | | Ensure the password is only hashed in case it's changed on the client - ↵ | Thomas Müller | 2015-10-22 | 1 | -7/+11 |
| | | | | | | | | | | | | fixes #19950 | ||||
* | | | Throw exception on `getPath` if file does not exist | Lukas Reschke | 2015-10-25 | 3 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened. This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs. While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page. I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail. | ||||
* | | | Dont lock /$user/files | Robin Appelman | 2015-10-23 | 1 | -1/+1 |
| | | |