Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-30 | 22 | -2/+50 |
| | |||||
* | Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles | Björn Schießle | 2015-05-29 | 2 | -1/+15 |
|\ | | | | | Abort expiration when file is gone | ||||
| * | Abort expiration when file is gone | Vincent Petry | 2015-05-29 | 2 | -1/+15 |
| | | | | | | | | | | | | | | Sometimes a background job for versions expiration was scheduled for a file that has been moved or deleted since. This prevents showing useless warnings in the log and simply bail out. | ||||
* | | Merge pull request #16517 from owncloud/remove-logo-wide | Thomas Müller | 2015-05-29 | 1 | -4/+14 |
|\ \ | | | | | | | replace logo-wide on share page as well with better icon + text | ||||
| * | | replace logo-wide on share page as well with better icon + text | Jan-Christoph Borchardt | 2015-05-22 | 1 | -4/+14 |
| | | | |||||
* | | | Missing translation in ldap part.wizard-server.php | Martin | 2015-05-29 | 1 | -3/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-29 | 8 | -2/+12 |
| | | | |||||
* | | | Merge pull request #16607 from owncloud/ie9-textpreviewfallback | Thomas Müller | 2015-05-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fallback to picture preview for IE <= 9 | ||||
| * | | | Fallback to picture preview for IE <= 9 | Vincent Petry | 2015-05-28 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | IE 9 and below do not provide window.btoa and there is currently no way to generate base64 strings without introducting further dependencies. So for now the solution is to fall back to the ugly picture mode for text files whenever IE <= 9 is used. | ||||
* | | | Merge pull request #16585 from ↵ | Thomas Müller | 2015-05-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | mmattel/Missing_translation_in_External_storage_back_end Make string 'SFTP with secret key login' translateable | ||||
| * | | | Make string 'SFTP with secret key login' translatable | Martin | 2015-05-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Return 404 in shareinfo.php when outgoing s2s disabled | Vincent Petry | 2015-05-28 | 1 | -0/+5 |
| |/ / |/| | | |||||
* | | | Merge pull request #16591 from owncloud/enc_improved_error_message | Björn Schießle | 2015-05-28 | 7 | -8/+116 |
|\ \ \ | | | | | | | | | improved error message for various states | ||||
| * | | | detect migration status | Bjoern Schiessle | 2015-05-27 | 6 | -7/+115 |
| | | | | |||||
| * | | | improve error messages displayed to the user | Bjoern Schiessle | 2015-05-27 | 1 | -1/+1 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-28 | 10 | -58/+90 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-27 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #15985 from owncloud/hotfix/fix-encryption-references | Björn Schießle | 2015-05-26 | 3 | -30/+1 |
|\ \ | | | | | | | [enc2] fix references to legacy encryption app name | ||||
| * | | removing encryption preview check | Clark Tomlinson | 2015-05-18 | 1 | -3/+0 |
| | | | |||||
| * | | removing deletion of encryption keys | Clark Tomlinson | 2015-05-18 | 1 | -26/+0 |
| | | | | | | | | | | | | this will be handled in the wrapper now | ||||
| * | | fix references to legacy encryption app name | Clark Tomlinson | 2015-05-18 | 3 | -3/+3 |
| | | | |||||
* | | | Merge pull request #16532 from owncloud/cors-no-cookie-auth | Vincent Petry | 2015-05-26 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | Disallow cookie auth for cors requests | ||||
| * | | | disallow cookie auth for cors requests | Bernhard Posselt | 2015-05-22 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing ... fixes fix test add php doc fix small mistake add another phpdoc remove not working cors annotations from files app | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-26 | 4 | -4/+12 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-25 | 2 | -0/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-24 | 12 | -12/+144 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-23 | 12 | -2/+32 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-22 | 16 | -0/+52 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-21 | 24 | -0/+72 |
| | | | |||||
* | | | Merge pull request #16469 from ↵ | Vincent Petry | 2015-05-20 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | oparoz/restore-minheight-for-single-public-previews Restore min-height for single previews | ||||
| * | | Restore min-height for single previews | Olivier Paroz | 2015-05-20 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #16322 from owncloud/trash-view | Morris Jobke | 2015-05-20 | 2 | -16/+80 |
|\ \ \ | | | | | | | | | dont go trough the view when moving to trash | ||||
| * | | | cleanup move/copy logic in trash | Robin Appelman | 2015-05-19 | 1 | -20/+57 |
| | | | | |||||
| * | | | adjust test | Robin Appelman | 2015-05-18 | 1 | -1/+7 |
| | | | | |||||
| * | | | fix target path for move | Robin Appelman | 2015-05-18 | 1 | -2/+6 |
| | | | | |||||
| * | | | update cache after move to trash | Robin Appelman | 2015-05-18 | 1 | -0/+2 |
| | | | | |||||
| * | | | dont go trough the view when moving to trash | Robin Appelman | 2015-05-18 | 1 | -12/+27 |
| | | | | |||||
* | | | | Merge pull request #16465 from ↵ | Morris Jobke | 2015-05-20 | 1 | -4/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled Return 401 when accessing public webdav and s2s is disabled | ||||
| * | | | | Return 401 when accessing public webdav and s2s is disabled | Vincent Petry | 2015-05-20 | 1 | -4/+5 |
| | | | | | |||||
* | | | | | Merge pull request #16075 from owncloud/skeleton-copy-delay | Vincent Petry | 2015-05-20 | 8 | -63/+81 |
|\ \ \ \ \ | | | | | | | | | | | | | wait with copying the skeleton untill login and setupfs are done | ||||
| * | | | | | Catch NotFoundException and return no quota information which simply ↵ | Thomas Müller | 2015-05-19 | 1 | -10/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | reflects the current state - no file storage has been initialized for the user. | ||||
| * | | | | | Fix provisioning API unit tests for login | Vincent Petry | 2015-05-18 | 3 | -49/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly login the user every time to make sure their FS is properly setup. | ||||
| * | | | | | fix tests | Robin Appelman | 2015-05-18 | 2 | -0/+2 |
| | | | | | | |||||
| * | | | | | fix tests | Robin Appelman | 2015-05-18 | 2 | -4/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #16326 from owncloud/fix-16192 | Morris Jobke | 2015-05-20 | 2 | -3/+29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | include base dn test in functionality test | ||||
| * | | | | | | include base dn test in functionality test | Arthur Schiwon | 2015-05-13 | 2 | -3/+29 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #16444 from owncloud/close-new-dropdown | Jan-Christoph Borchardt | 2015-05-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Closes "New" dropdown when switching category | ||||
| * | | | | | | | Closes "New" dropdown when switching category | Morris Jobke | 2015-05-19 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #16394 * return false - stops all following event callbacks | ||||
* | | | | | | | Merge pull request #16446 from owncloud/fix-url-generation | Lukas Reschke | 2015-05-20 | 2 | -1/+113 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix URL generation | ||||
| * | | | | | | | Added unit tests for download URL in public sharing page | Vincent Petry | 2015-05-19 | 2 | -0/+112 |
| | | | | | | | |