Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14838 from owncloud/add-curl-hard-dependency | Thomas Müller | 2015-03-12 | 1 | -3/+4 |
|\ | | | | | Add cURL as hard-dependency | ||||
| * | Add cURL as hard-dependency | Lukas Reschke | 2015-03-12 | 1 | -3/+4 |
|/ | | | | It is required by other functionalities such as S2S anyways and ownCloud will fail hard at a lot of places without it. | ||||
* | Merge pull request #14830 from owncloud/kill-locks-table-master | Morris Jobke | 2015-03-12 | 1 | -83/+0 |
|\ | | | | | we no longer support webdav locks - no need to keep the column | ||||
| * | we no longer support webdav locks - no need to keep the column | Thomas Müller | 2015-03-12 | 1 | -83/+0 |
|/ | |||||
* | Merge pull request #14785 from ↵ | Thomas Müller | 2015-03-12 | 1 | -2/+0 |
|\ | | | | | | | | | owncloud/issue/14733-active-class-missing-for-admin-navigation-entry Do not overwrite the active menu entry of the navigation | ||||
| * | Do not overwrite the active menu entry of the navigation | Joas Schilling | 2015-03-11 | 1 | -2/+0 |
| | | |||||
* | | Merge pull request #14613 from kampka/no-table-prefix | Morris Jobke | 2015-03-12 | 1 | -2/+6 |
|\ \ | | | | | | | Install command should not require table prefix | ||||
| * | | Install command should not require table prefix | Christian Kampka | 2015-03-11 | 1 | -2/+6 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-12 | 122 | -362/+116 |
| | | | |||||
* | | | Merge pull request #14809 from rullzer/avatarcontroller_cache_fix | Thomas Müller | 2015-03-11 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Fix the avatarcontroller cache needing the cache dir | ||||
| * | | | Fix the avatarcontroller cache needing the cache dir | Roeland Jago Douma | 2015-03-11 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | This was removed in 82254ad5efb65e8650567f49343ec37eb55e2f3e and unfortunatly missed by jenkins before mering into master. | ||||
* | | | | Merge pull request #14357 from owncloud/fix/1373 | Morris Jobke | 2015-03-11 | 1 | -7/+7 |
|\ \ \ \ | |/ / / |/| | | | Run `updateDataDirectory` after Update | ||||
| * | | | Run `updateDataDirectory` after Update | Lukas Reschke | 2015-03-02 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/13731 | ||||
* | | | | Merge pull request #14705 from rullzer/avatarcontroller | Lukas Reschke | 2015-03-11 | 13 | -197/+752 |
|\ \ \ \ | | | | | | | | | | | Move AvatarController to AppFramework | ||||
| * | | | | Avatar controller moved to AppFrameWork | Roeland Jago Douma | 2015-03-11 | 13 | -197/+752 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Original avatarcontroller migrated to the appframework * Added DataDisplayResponse that show data inline in the browser (used to retrun the image) * Removed some unneeded code * Added unit tests for the avatarcontroller | ||||
* | | | | | Merge pull request #13893 from owncloud/create-cachedir-on-user | Morris Jobke | 2015-03-11 | 2 | -26/+28 |
|\ \ \ \ \ | | | | | | | | | | | | | Only make sure the cache directory exists when we use it | ||||
| * | | | | | Only make sure the cache directory exists when we use it | Robin Appelman | 2015-02-04 | 2 | -26/+28 |
| | | | | | | |||||
* | | | | | | Merge pull request #14798 from owncloud/enable-oci-autotest-master | Lukas Reschke | 2015-03-11 | 2 | -7/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Setting oci as supported database | ||||
| * | | | | | | Don't play with config values ... | Thomas Müller | 2015-03-11 | 2 | -8/+12 |
| | | | | | | | |||||
| * | | | | | | Setting oci as supported database | Thomas Müller | 2015-03-11 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #14794 from owncloud/add-console-command-user-add | Morris Jobke | 2015-03-11 | 2 | -0/+116 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add a console command user:add to create users over the console | ||||
| * | | | | | | | Add a console command user:add to create users over the console | Joas Schilling | 2015-03-11 | 2 | -0/+116 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #13648 from oparoz/sfnt-fonts-preview | Morris Jobke | 2015-03-11 | 3 | -1/+22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add support for font previews | ||||
| * | | | | | | | Add support for font previews | Olivier Paroz | 2015-02-24 | 3 | -1/+22 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view | Lukas Reschke | 2015-03-11 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Allow iframes from same domain in share view | ||||
| * | | | | | | | | Allow iframes from same domain in share view | Lukas Reschke | 2015-03-10 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required because the PDF Viewer itself is embedded using an iframe from the same domain. The default policy is blocking this. Going on further, we have to come up with a solution in the future how to handle previews by applications, one example might be that they call their own endpoint and not the generic share page to allow applications to have full control over how to display previews. Anyways, to test this behaviour use a decent newer browser (such as Chrome 41) and share a PDF file, obviously the PDF viewer needs to be enabled as well. Without this patch publicly shared PDF files should not get previewed and an error is thrown. (if it isn't then your browser is probably not obeying our Content-Security-Policy and you might consider switching to another one ;)) | ||||
* | | | | | | | | | Merge pull request #13839 from ↵ | Morris Jobke | 2015-03-11 | 3 | -1/+82 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown Better finding the remote URL from user input in share dropdown | ||||
| * | | | | | | | | Extract the remote host from user input in share dropdown | Joas Schilling | 2015-02-23 | 3 | -1/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #13678 | ||||
* | | | | | | | | | Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail | Morris Jobke | 2015-03-11 | 6 | -64/+124 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Do not abort when meeting unfixable legacy storages | ||||
| * | | | | | | | | | Fixed expected warning count on repair fail | Vincent Petry | 2015-02-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Detect that the done flag was not set after repair fail | Vincent Petry | 2015-02-27 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Properly forward repair errors and warnings | Vincent Petry | 2015-02-27 | 5 | -1/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes repair errors and warnings visible for the user when upgrading on the command line or in the web UI. | ||||
| * | | | | | | | | | Do not abort when meeting unfixable legacy storages | Vincent Petry | 2015-02-27 | 2 | -64/+80 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #14791 from owncloud/fix-14516 | Lukas Reschke | 2015-03-11 | 5 | -10/+104 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Adding a more meaningful message for sabre dav exception | ||||
| * | | | | | | | | | | Adding a more meaningful message for sabre dav exception - fixes #14516 | Thomas Müller | 2015-03-11 | 5 | -10/+104 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #14788 from cmeh/patch-3 | Thomas Müller | 2015-03-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Correct "one invalid characters" to "one invalid character" | ||||
| * | | | | | | | | | | Correct "one invalid characters" to "one invalid character" | cmeh | 2015-03-11 | 1 | -1/+1 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | Corrected "one invalid characters" to "one invalid character" in line 1575. | ||||
* | | | | | | | | | | Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist | Thomas Müller | 2015-03-11 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add an option to include the installed app version in "occ app:list" | ||||
| * | | | | | | | | | | Always include the installed app version in "occ app:list" | Joas Schilling | 2015-03-11 | 1 | -2/+3 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #14789 from owncloud/better-app-install-error-messages | Bernhard Posselt | 2015-03-11 | 2 | -7/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | display app update error messages | ||||
| * | | | | | | | | | | | display app update error messages - fixes #14611 | Thomas Müller | 2015-03-11 | 2 | -7/+12 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-master | Thomas Müller | 2015-03-11 | 9 | -357/+193 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Use occ to install ownCloud in autotest.sh | ||||
| * | | | | | | | | | | Properly handle available databases at runtime and respect setup checks in ↵ | Thomas Müller | 2015-03-11 | 6 | -155/+164 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command line as well | ||||
| * | | | | | | | | | | No need to restart the web server in cli mode | Thomas Müller | 2015-03-11 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Use occ to install ownCloud in autotest.sh | Thomas Müller | 2015-03-11 | 4 | -201/+28 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #14783 from owncloud/dont-timeout-cron-master | Morris Jobke | 2015-03-11 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | cron.php on cli has no time limitation - fixes #14481 | ||||
| * | | | | | | | | | | cron.php on cli has no time limitation - fixes #14481 | Thomas Müller | 2015-03-11 | 1 | -0/+3 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-11 | 126 | -426/+142 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #14640 from owncloud/rescanversionsonlyonce | Thomas Müller | 2015-03-11 | 1 | -3/+13 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Only rescan versions once in trashbin | ||||
| * | | | | | | | | | | Only rescan versions once in trashbin | Vincent Petry | 2015-03-02 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever versions need to be rescanned, only do it once per PHP request. Happens whenever multiple files need to be expired. |