Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10522 from owncloud/removeLoadAppScript | blizzz | 2014-08-21 | 9 | -42/+86 |
|\ | | | | | Remove loadAppScriptFile | ||||
| * | Add update route to core | Lukas Reschke | 2014-08-19 | 2 | -2/+2 |
| | | |||||
| * | Remove loadAppScriptFile from the default routes | Lukas Reschke | 2014-08-19 | 1 | -10/+0 |
| | | |||||
| * | Add routing to user_ldap | Lukas Reschke | 2014-08-19 | 1 | -0/+22 |
| | | |||||
| * | Add routing to files_versions | Lukas Reschke | 2014-08-19 | 1 | -0/+5 |
| | | |||||
| * | Add routing to files_trashbin | Lukas Reschke | 2014-08-19 | 1 | -0/+9 |
| | | |||||
| * | Add routing to files_encryption | Lukas Reschke | 2014-08-19 | 1 | -0/+13 |
| | | |||||
| * | Add routing to files_sharing | Lukas Reschke | 2014-08-19 | 1 | -4/+8 |
| | | |||||
| * | Use proper routes for files | Lukas Reschke | 2014-08-19 | 1 | -0/+27 |
| | | |||||
| * | Remove loadAppScriptFile | Lukas Reschke | 2014-08-19 | 1 | -26/+0 |
| | | |||||
* | | Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowed | Vincent Petry | 2014-08-21 | 2 | -11/+17 |
|\ \ | | | | | | | Fix share dropdown when links are not allowed | ||||
| * | | Fix share dropdown when links are not allowed | Vincent Petry | 2014-08-21 | 2 | -11/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | When links are not allowed, the email field does not exist and autocomplete returns null. This causes Javascript errors. The fix prevents entering the bogus block when links aren't allowed, as it doesn't make sense to enter it in such cases anyway. | ||||
* | | | Merge pull request #10548 from owncloud/encryption-app-description | Morris Jobke | 2014-08-21 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Better description to prevent people from misunderstanding the use case of encryption app | ||||
| * | | | Better description to prevent people from misunderstanding the use case | Bernhard Posselt | 2014-08-21 | 1 | -2/+2 |
| | | | | |||||
* | | | | no external files on windows for now | Thomas Müller | 2014-08-21 | 1 | -2/+2 |
| | | | | |||||
* | | | | no external files on windows for now | Thomas Müller | 2014-08-21 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #10458 from owncloud/fix-tar-tests | Lukas Reschke | 2014-08-21 | 2 | -115/+140 |
|\ \ \ \ | | | | | | | | | | | temporarily disable TAR tests on travis | ||||
| * | | | | Fix windows tests skipping | Morris Jobke | 2014-08-21 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | * add call to setUp from inherited test class | ||||
| * | | | | Add files as string to tar archives | Robin Appelman | 2014-08-21 | 1 | -6/+2 |
| | | | | | |||||
| * | | | | reformat | Robin Appelman | 2014-08-21 | 1 | -112/+136 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-21 | 492 | -1103/+1236 |
| | | | | |||||
* | | | | Merge pull request #10562 from Volker-E/master | Clark Tomlinson | 2014-08-20 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | fixing #10561 & HTML structure | ||||
| * | | | | Removing `x-webkit-speech` attribute #10561 | Volker E. | 2014-08-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Remove obsolete (from Google Chrome 36 on) attribute due to security vulnerability | ||||
| * | | | | fix HTML structure by rmv. obsolete input end tag | Volker E. | 2014-08-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #10518 from owncloud/fix_storage_const_autoload | Lukas Reschke | 2014-08-20 | 12 | -18/+29 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix storage const autoload | ||||
| * | | | | Add doc for \OCP\Files\FileInfo space constants | Morris Jobke | 2014-08-19 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | fix typo | Morris Jobke | 2014-08-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | move to public namespace | Morris Jobke | 2014-08-19 | 12 | -17/+18 |
| | | | | | |||||
| * | | | | Use tabs for indentation. | Stephan Peijnik | 2014-08-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> | ||||
| * | | | | Fix STORAGE_* constants usage by moving those constants into ↵ | Stephan Peijnik | 2014-08-19 | 10 | -16/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \OC\Files\Filesystem. As constants not defined within a class cannot be automatically found by the autoloader moving those constants into a class makes them accessible to code which uses them. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> | ||||
* | | | | | Merge pull request #10557 from owncloud/better-hover-apps | Morris Jobke | 2014-08-20 | 1 | -7/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | full opacity for the hovered/focused app as well for better contrast | ||||
| * | | | | full opacity for the hovered/focused app as well for better contrast | Jan-Christoph Borchardt | 2014-08-20 | 1 | -7/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #10422 from owncloud/dav-disablerangerequestwhennotsupported | Vincent Petry | 2014-08-20 | 1 | -0/+22 |
|\ \ \ \ | | | | | | | | | | | Return whole file if range request cannot be granted due to encryption | ||||
| * | | | | Return whole file if range request cannot be granted due to encryption | Vincent Petry | 2014-08-14 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenenver range headers are set and encryption is enabled, it is not possible to automatically fseek() to the proper position. To avoid returning corrupt/invalid data or causing a decryption error, the range headers are stripped so that the SabreDAV code in httpGet() returns the whole file. | ||||
* | | | | | Merge pull request #10546 from owncloud/add-note-about-cheers | Thomas Müller | 2014-08-20 | 2 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Add note about the term "Cheers" at end of mail | ||||
| * | | | | | Add note about the term "Cheers" at end of mail | Morris Jobke | 2014-08-20 | 2 | -0/+2 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | * for translators * fixes #8689 | ||||
* | | | | | Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysource | Jörn Friedrich Dreyer | 2014-08-20 | 2 | -19/+83 |
|\ \ \ \ \ | |/ / / / |/| | | | | urlencode s3 copyObject() copysource | ||||
| * | | | | use S3Client::encodeKey(), fixes #8325 | Jörn Friedrich Dreyer | 2014-08-14 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | add unit test for #8325 | Jörn Friedrich Dreyer | 2014-08-14 | 1 | -17/+80 |
| | | | | | |||||
* | | | | | Update music repo | Morris Jobke | 2014-08-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #10534 from owncloud/autotest-cleanuponinterrupt | Morris Jobke | 2014-08-20 | 1 | -5/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Restore autotest config on SIGINT or SIGTERM | ||||
| * | | | | | Restore autotest config on SIGINT or SIGTERM | Vincent Petry | 2014-08-19 | 1 | -5/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When hitting Ctrl+C to interrupt unit test running, the old configuration was not restored properly. This fix traps the signal to properly restore the configuration after an interruption. | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-20 | 710 | -7117/+8110 |
| | | | | | | |||||
* | | | | | | Merge pull request #10525 from owncloud/remove-download-message | Clark Tomlinson | 2014-08-19 | 1 | -1/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove obsolete 'Download preparing' message for zip downloads, fix #3755 | ||||
| * | | | | | | remove obsolete 'Download preparing' message for zip downloads, fix #3755 | Jan-Christoph Borchardt | 2014-08-19 | 1 | -1/+0 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #10523 from owncloud/fix-shared-multiselect | Morris Jobke | 2014-08-19 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fix multiselect bar offset on shared page | ||||
| * | | | | | fix multiselect bar offset on shared page | Jan-Christoph Borchardt | 2014-08-19 | 1 | -1/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #9866 from owncloud/app-upgrade | Robin Appelman | 2014-08-19 | 10 | -57/+132 |
|\ \ \ \ \ | | | | | | | | | | | | | Don't do app upgrades in the background | ||||
| * | | | | | fix undefined variable | Robin Appelman | 2014-08-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | only set core version at the end | Robin Appelman | 2014-08-04 | 1 | -2/+0 |
| | | | | | |