Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-21 | 38 | -0/+640 |
| | |||||
* | Fix file upload to ext storage when recovery key is enabled | Vincent Petry | 2014-11-20 | 2 | -9/+58 |
| | | | | | | | | Fixes an issue when uploading files to external storage when recovery keys are enabled The Util class only works with real users, so instantiating it with the virtual recovery key user or public key user can cause issues. | ||||
* | Merge pull request #12325 from owncloud/removeunneccessarylang | Lukas Reschke | 2014-11-20 | 46 | -690/+0 |
|\ | | | | | cleanup languages. closes #11274 | ||||
| * | cleanup languages. closes #11274 | Volkan Gezer | 2014-11-20 | 46 | -690/+0 |
| | | |||||
* | | Merge pull request #12226 from owncloud/remove-phpass | Thomas Müller | 2014-11-20 | 3 | -12/+40 |
|\ \ | | | | | | | Remove phpass and migrate to new Hasher interface | ||||
| * | | Remove phpass and migrate to new Hasher interface | Lukas Reschke | 2014-11-17 | 3 | -12/+40 |
| | | | | | | | | | | | | | | | | | | | | | This PR removes phpass and migrates to the new Hasher interface. Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt. Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block. | ||||
* | | | Merge pull request #12297 from owncloud/issue/10991-all-testcase | Morris Jobke | 2014-11-20 | 40 | -99/+176 |
|\ \ \ | |_|/ |/| | | Issue/10991 all testcase | ||||
| * | | Make apps/ extend the \Test\TestCase and fix overwritten methods | Joas Schilling | 2014-11-19 | 39 | -90/+160 |
| | | | |||||
| * | | Use base class to reset the file mapper | Joas Schilling | 2014-11-19 | 2 | -9/+16 |
| | | | |||||
* | | | Merge pull request #12305 from owncloud/sharelist-nodelete | Morris Jobke | 2014-11-20 | 2 | -12/+30 |
|\ \ \ | |/ / |/| | | Remove delete button in shared with others list | ||||
| * | | JSHint fixes in sharedfilelistSpec unit test file | Vincent Petry | 2014-11-19 | 1 | -1/+3 |
| | | | |||||
| * | | Remove delete button in shared with others list | Vincent Petry | 2014-11-19 | 2 | -11/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file is shared with others or with link, a delete button used to be visible that triggered a direct deletion. This button has been removed to avoid accidental deletion from people who might believe it was an unshare button. Unsharing is still possible inside the share dropdown. | ||||
* | | | Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2 | Lukas Reschke | 2014-11-19 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | Show warning when invalid user was passed | ||||
| * | | | Show warning when invalid user was passed | Vincent Petry | 2014-11-14 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Sometimes there are bugs that cause setupFS() to be called for non-existing users. Instead of failing hard and breaking the instance, this fix simply logs a warning. | ||||
* | | | | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword | Lukas Reschke | 2014-11-19 | 3 | -0/+26 |
|\ \ \ \ | |_|/ / |/| | | | Warn for password reset when files_encryption is enabled | ||||
| * | | | listen to the post_passwordReset hook, backup the old keys and create a new ↵ | Bjoern Schiessle | 2014-11-17 | 3 | -0/+26 |
| | | | | | | | | | | | | | | | | key pair for the user | ||||
* | | | | Merge pull request #12276 from ↵ | Morris Jobke | 2014-11-19 | 3 | -1/+36 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/undelete-only-if-files-trashin-is-enabled Only show undelete capability if files_trashbin is enabled | ||||
| * | | | | Only show undelete capability if files_trashbin is enabled | Lukas Reschke | 2014-11-18 | 3 | -1/+36 |
| | | | | | | | | | | | | | | | | | | | | Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-19 | 4 | -8/+8 |
|/ / / / | |||||
* | | | | $file only contains the filename and not the absolute path, that means that ↵ | Lukas Reschke | 2014-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | files in a subdirectory will not get properly resolved and an empty filesize is returned. This feature only exists on master. | ||||
* | | | | Merge pull request #12220 from owncloud/remove-unused-code | Morris Jobke | 2014-11-18 | 3 | -373/+0 |
|\ \ \ \ | | | | | | | | | | | Remove unused code | ||||
| * | | | | Remove unused code | Lukas Reschke | 2014-11-17 | 3 | -373/+0 |
| | |_|/ | |/| | | | | | | | | | | We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-18 | 2 | -0/+16 |
| |/ / |/| | | |||||
* | | | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 14 | -264/+410 |
|\ \ \ | |/ / |/| | | Issue/10991 Make unit tests pass on windows | ||||
| * | | Correctly restore previous root mount point after testing | Joas Schilling | 2014-11-17 | 1 | -2/+12 |
| | | | |||||
| * | | Fix single run of encryption tests and usages of uniqid() and fopen() | Joas Schilling | 2014-11-17 | 12 | -259/+376 |
| | | | |||||
| * | | Skip some more tests on Windows which just can not work at all | Joas Schilling | 2014-11-17 | 2 | -3/+22 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-17 | 4 | -16/+22 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-16 | 2 | -2/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-15 | 2 | -8/+8 |
| | | | |||||
* | | | Added download size on public sharing | Vincent Cloutier | 2014-11-14 | 3 | -2/+4 |
| | | | |||||
* | | | Refactor file sharing public link handling | Lukas Reschke | 2014-11-14 | 12 | -219/+732 |
| | | | | | | | | | | | | | | | | | | | | | fixes download issue introduced by #10755 Conflicts: apps/files_sharing/public.php | ||||
* | | | Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename | Jörn Friedrich Dreyer | 2014-11-14 | 1 | -4/+1 |
|\ \ \ | | | | | | | | | Do not remove dir entry if it has the same name as the parent | ||||
| * | | | Do not remove dir entry if it has the same name as the parent | Vincent Petry | 2014-11-13 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | This fixes an issue when a subdir has the same name as its parent, it would get exluded from the list. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-14 | 2 | -2/+8 |
|/ / / | |||||
* | | | Merge pull request #12005 from owncloud/bower-multiselect | blizzz | 2014-11-13 | 4 | -2/+750 |
|\ \ \ | | | | | | | | | Move multiselect to user_ldap | ||||
| * | | | Migrate multiselect to user_ldap | Morris Jobke | 2014-11-13 | 4 | -2/+750 |
| | | | | |||||
* | | | | Merge pull request #9177 from owncloud/jsdocexperiment | Vincent Petry | 2014-11-13 | 19 | -64/+343 |
|\ \ \ \ | | | | | | | | | | | Improved JS Docs + added build script for JS Docs | ||||
| * | | | | Improved Javascript docs for JSDoc | Vincent Petry | 2014-10-31 | 19 | -64/+343 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added namespaces so that JSDoc can find them. Fixed a few warnings. Improved some comments. | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-13 | 6 | -12/+12 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #12087 from AdamWill/google-touch | Vincent Petry | 2014-11-12 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | google: fix touch() when $mtime is set (Google wants RFC3339) #11267 | ||||
| * | | | | fix touch() when $mtime is set (Google wants RFC3339) #11267 | Adam Williamson | 2014-11-10 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ownCloud passes us a Unix time integer, but the GDrive API wants an RFC3339-formatted date. Actually it wants a single particular RFC3339 format, not just anything that complies will do - it requires the fractions to be specified, though RFC3339 doesn't. This resolves issue #11267 (and was also noted by PVince81 in reviewing PR #6989). | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-12 | 12 | -4/+30 |
| | | | | | |||||
* | | | | | Fix infinite loop if count and limit is 0 | Morris Jobke | 2014-11-11 | 1 | -1/+1 |
| |_|_|/ |/| | | | | | | | | | | | * otherwise it will always think it hits the limit and need another round to fetch additional results | ||||
* | | | | Merge pull request #11789 from owncloud/fix-11762 | Morris Jobke | 2014-11-11 | 2 | -3/+29 |
|\ \ \ \ | | | | | | | | | | | [LDAP] Login: dont fail with 500 if configured display name attribute is not set | ||||
| * | | | | dont fail with 500 if configured display name attribute is not set | Arthur Schiwon | 2014-10-27 | 2 | -3/+29 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-11 | 10 | -18/+18 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #10966 from owncloud/storage-root-share-permissions | Morris Jobke | 2014-11-10 | 2 | -0/+90 |
|\ \ \ \ | | | | | | | | | | | Dont' use mountpoint permissions as share permissions for external storages | ||||
| * | | | | Add unit tests | Robin Appelman | 2014-10-31 | 1 | -0/+85 |
| | | | | | |||||
| * | | | | Keep the share permissions from mountpoints | Robin Appelman | 2014-10-31 | 1 | -1/+2 |
| | | | | |