summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14838 from owncloud/add-curl-hard-dependencyThomas Müller2015-03-121-3/+4
|\ | | | | Add cURL as hard-dependency
| * Add cURL as hard-dependencyLukas Reschke2015-03-121-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-masterMorris Jobke2015-03-121-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 columnThomas Müller2015-03-121-83/+0
|/
* Merge pull request #14785 from ↵Thomas Müller2015-03-121-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 navigationJoas Schilling2015-03-111-2/+0
| |
* | Merge pull request #14613 from kampka/no-table-prefixMorris Jobke2015-03-121-2/+6
|\ \ | | | | | | Install command should not require table prefix
| * | Install command should not require table prefixChristian Kampka2015-03-111-2/+6
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-12122-362/+116
| | |
* | | Merge pull request #14809 from rullzer/avatarcontroller_cache_fixThomas Müller2015-03-111-1/+4
|\ \ \ | | | | | | | | Fix the avatarcontroller cache needing the cache dir
| * | | Fix the avatarcontroller cache needing the cache dirRoeland Jago Douma2015-03-111-1/+4
| | | | | | | | | | | | | | | | | | | | This was removed in 82254ad5efb65e8650567f49343ec37eb55e2f3e and unfortunatly missed by jenkins before mering into master.
* | | | Merge pull request #14357 from owncloud/fix/1373Morris Jobke2015-03-111-7/+7
|\ \ \ \ | |/ / / |/| | | Run `updateDataDirectory` after Update
| * | | Run `updateDataDirectory` after UpdateLukas Reschke2015-03-021-7/+7
| | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/13731
* | | | Merge pull request #14705 from rullzer/avatarcontrollerLukas Reschke2015-03-1113-197/+752
|\ \ \ \ | | | | | | | | | | Move AvatarController to AppFramework
| * | | | Avatar controller moved to AppFrameWorkRoeland Jago Douma2015-03-1113-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-userMorris Jobke2015-03-112-26/+28
|\ \ \ \ \ | | | | | | | | | | | | Only make sure the cache directory exists when we use it
| * | | | | Only make sure the cache directory exists when we use itRobin Appelman2015-02-042-26/+28
| | | | | |
* | | | | | Merge pull request #14798 from owncloud/enable-oci-autotest-masterLukas Reschke2015-03-112-7/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Setting oci as supported database
| * | | | | | Don't play with config values ...Thomas Müller2015-03-112-8/+12
| | | | | | |
| * | | | | | Setting oci as supported databaseThomas Müller2015-03-111-0/+1
| | | | | | |
* | | | | | | Merge pull request #14794 from owncloud/add-console-command-user-addMorris Jobke2015-03-112-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 consoleJoas Schilling2015-03-112-0/+116
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #13648 from oparoz/sfnt-fonts-previewMorris Jobke2015-03-113-1/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add support for font previews
| * | | | | | | Add support for font previewsOlivier Paroz2015-02-243-1/+22
| | | | | | | |
* | | | | | | | Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-viewLukas Reschke2015-03-112-1/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow iframes from same domain in share view
| * | | | | | | | Allow iframes from same domain in share viewLukas Reschke2015-03-102-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 Jobke2015-03-113-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 dropdownJoas Schilling2015-02-233-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #13678
* | | | | | | | | Merge pull request #13513 from owncloud/repair-legacystoragenofatalfailMorris Jobke2015-03-116-64/+124
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Do not abort when meeting unfixable legacy storages
| * | | | | | | | | Fixed expected warning count on repair failVincent Petry2015-02-271-1/+1
| | | | | | | | | |
| * | | | | | | | | Detect that the done flag was not set after repair failVincent Petry2015-02-271-2/+2
| | | | | | | | | |
| * | | | | | | | | Properly forward repair errors and warningsVincent Petry2015-02-275-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 storagesVincent Petry2015-02-272-64/+80
| | | | | | | | | |
* | | | | | | | | | Merge pull request #14791 from owncloud/fix-14516Lukas Reschke2015-03-115-10/+104
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Adding a more meaningful message for sabre dav exception
| * | | | | | | | | | Adding a more meaningful message for sabre dav exception - fixes #14516Thomas Müller2015-03-115-10/+104
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #14788 from cmeh/patch-3Thomas Müller2015-03-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Correct "one invalid characters" to "one invalid character"
| * | | | | | | | | | Correct "one invalid characters" to "one invalid character"cmeh2015-03-111-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-applistThomas Müller2015-03-111-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 Schilling2015-03-111-2/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #14789 from owncloud/better-app-install-error-messagesBernhard Posselt2015-03-112-7/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | display app update error messages
| * | | | | | | | | | | display app update error messages - fixes #14611Thomas Müller2015-03-112-7/+12
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-masterThomas Müller2015-03-119-357/+193
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Use occ to install ownCloud in autotest.sh
| * | | | | | | | | | Properly handle available databases at runtime and respect setup checks in ↵Thomas Müller2015-03-116-155/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command line as well
| * | | | | | | | | | No need to restart the web server in cli modeThomas Müller2015-03-111-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Use occ to install ownCloud in autotest.shThomas Müller2015-03-114-201/+28
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #14783 from owncloud/dont-timeout-cron-masterMorris Jobke2015-03-111-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | cron.php on cli has no time limitation - fixes #14481
| * | | | | | | | | | cron.php on cli has no time limitation - fixes #14481Thomas Müller2015-03-111-0/+3
| | | | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-11126-426/+142
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #14640 from owncloud/rescanversionsonlyonceThomas Müller2015-03-111-3/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Only rescan versions once in trashbin
| * | | | | | | | | | Only rescan versions once in trashbinVincent Petry2015-03-021-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever versions need to be rescanned, only do it once per PHP request. Happens whenever multiple files need to be expired.