| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-31 | 54 | -24/+118 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-30 | 34 | -2/+62 |
| | | |||||
| * | Add information how to report security bugs | Lukas Reschke | 2015-05-29 | 1 | -0/+1 |
| | | |||||
| * | 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 | 13 | -907/+35 |
| |\ \ | | | | | | | replace logo-wide on share page as well with better icon + text | ||||
| | * | | change tests back to check for logo-wide, make them pass again | Jan-Christoph Borchardt | 2015-05-28 | 1 | -3/+3 |
| | | | | |||||
| | * | | also replace logo-mail with new look | Jan-Christoph Borchardt | 2015-05-22 | 1 | -0/+0 |
| | | | | |||||
| | * | | replace logo-wide on share page as well with better icon + text | Jan-Christoph Borchardt | 2015-05-22 | 6 | -24/+22 |
| | | | | |||||
| | * | | remove logo-wide from tests | Jan-Christoph Borchardt | 2015-05-21 | 7 | -886/+16 |
| | | | | |||||
| * | | | Merge pull request #16615 from owncloud/syntaxfix | Morris Jobke | 2015-05-29 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | fix formatting error | ||||
| | * | | | fix formatting error | Carla Schroder | 2015-05-28 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #16619 from mmattel/missing_translations_in_ldap | Morris Jobke | 2015-05-29 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | Missing translation in ldap part.wizard-server.php | ||||
| | * | | | | 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 | 12 | -6/+20 |
| |/ / / | |||||
| * | | | Merge pull request #16578 from owncloud/fix_16556 | Thomas Müller | 2015-05-28 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | show txt preview when file contains text | ||||
| | * | | | show txt preview when file contains text | Georg Ehrke | 2015-05-27 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | 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 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #16592 from owncloud/fix-16574 | Morris Jobke | 2015-05-28 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add type hint for OC_Channel | ||||
| | * | | | | | Add type hint for OC_Channel | Victor Dubiniuk | 2015-05-27 | 1 | -0/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #16380 from rullzer/fix_16281 | Morris Jobke | 2015-05-28 | 2 | -15/+117 |
| |\ \ \ \ \ | | | | | | | | | | | | | Properly format recipients | ||||
| | * | | | | | Properly format remote recipients | Roeland Jago Douma | 2015-05-27 | 2 | -15/+117 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A list of recipients can now be properly formatted with remote shares. Before the shares where simply shown in full in the "Shared with others" section. * Unit tests updated and added | ||||
| * | | | | | Merge pull request #16610 from owncloud/s2s-shareinforeturn404whendisabled | Vincent Petry | 2015-05-28 | 1 | -0/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | Return 404 in shareinfo.php when outgoing s2s disabled | ||||
| | * | | | | | Return 404 in shareinfo.php when outgoing s2s disabled | Vincent Petry | 2015-05-28 | 1 | -0/+5 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #16613 from owncloud/quota-onlyforfiles | Morris Jobke | 2015-05-28 | 2 | -14/+28 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Only use quota stream wrapper on "files" | ||||
| | * | | | | Only use quota stream wrapper on "files" | Vincent Petry | 2015-05-28 | 2 | -14/+28 |
| |/ / / / | | | | | | | | | | | | | | | | | Prevent using the quota stream wrapper on trashbin folders and other metadata folders | ||||
| * | | | | Merge pull request #16467 from owncloud/apps-fixsort | Lukas Reschke | 2015-05-28 | 2 | -9/+27 |
| |\ \ \ \ | | | | | | | | | | | Sort apps by level, then by name | ||||
| | * | | | | Sort apps by level, then by name | Vincent Petry | 2015-05-20 | 2 | -9/+27 |
| | | | | | | | | | | | | | | | | | | | | | Also properly initialize the level to 0 when no level was returned | ||||
| * | | | | | Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages | Vincent Petry | 2015-05-28 | 5 | -45/+150 |
| |\ \ \ \ \ | | | | | | | | | | | | | [encryption] fix move versions between storages | ||||
| | * | | | | | copy keys before we move a file between storages to make sure that the new ↵ | Bjoern Schiessle | 2015-05-22 | 3 | -27/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | target file reuses the old file key, otherwise versions will break | ||||
| | * | | | | | distinguish between source and target mount point to allow copy/rename ↵ | Bjoern Schiessle | 2015-05-21 | 2 | -18/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | between system wide mount points and user specific mountpoints | ||||
| * | | | | | | Merge pull request #16577 from owncloud/enc_improve_migration | Vincent Petry | 2015-05-28 | 2 | -58/+63 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | only request encryption module for files which are not excluded | ||||
| | * | | | | | only request encryption module for files which are not excluded | Bjoern Schiessle | 2015-05-27 | 2 | -58/+63 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge pull request #16591 from owncloud/enc_improved_error_message | Björn Schießle | 2015-05-28 | 12 | -35/+136 |
| |\ \ \ \ \ | | | | | | | | | | | | | 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 | 6 | -28/+21 |
| | |/ / / / | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-28 | 50 | -132/+266 |
| | | | | | | |||||
| * | | | | | Merge pull request #16595 from owncloud/scrutinizer-timeout | Lukas Reschke | 2015-05-27 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | [scrutinizer] Increase timeout of external code coverage | ||||
| | * | | | | | [scrutinizer] Increase timeout of external code coverage | Morris Jobke | 2015-05-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Hopefully fixes problems with unfinished scrutinizer reports | ||||
| * | | | | | | Merge pull request #16583 from owncloud/fix-code-indentation | Lukas Reschke | 2015-05-27 | 1 | -25/+25 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix indentation | ||||
| | * | | | | | Fix indentation | Lukas Reschke | 2015-05-27 | 1 | -25/+25 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #16417 from owncloud/master-16415 | Morris Jobke | 2015-05-27 | 1 | -5/+0 |
| |\ \ \ \ \ | |/ / / / |/| | | | | fix theme in IE8 and IE9 | ||||
| | * | | | | fix theme in IE8 and IE9 | Morris Jobke | 2015-05-18 | 1 | -5/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #16527 from owncloud/end-processing-when-404 | Morris Jobke | 2015-05-27 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | End processing when file is not found | ||||
| | * | | | | | End processing when file is not found | Lukas Reschke | 2015-05-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to end the processing when a file is not found or otherwise the method is proceeding and even sending invalid file paths to the sendfile methods. Due to nginx preventing directory traversals this is luckily not immediately exploitable. We should for hardening purposes however quit the script execution just as we do for 403 cases and others as well. | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-27 | 4 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #15985 from owncloud/hotfix/fix-encryption-references | Björn Schießle | 2015-05-26 | 4 | -31/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [enc2] fix references to legacy encryption app name | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |