summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-1318-2/+92
|
* 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-1280-338/+0
| |
* | Merge pull request #14705 from rullzer/avatarcontrollerLukas Reschke2015-03-115-188/+298
|\ \ | | | | | | Move AvatarController to AppFramework
| * | Avatar controller moved to AppFrameWorkRoeland Jago Douma2015-03-115-188/+298
| | | | | | | | | | | | | | | | | | | | | | | | * 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 #14798 from owncloud/enable-oci-autotest-masterLukas Reschke2015-03-111-1/+1
|\ \ \ | | | | | | | | Setting oci as supported database
| * | | Don't play with config values ...Thomas Müller2015-03-111-2/+1
| | | |
| * | | 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 #13513 from owncloud/repair-legacystoragenofatalfailMorris Jobke2015-03-113-0/+15
|\ \ \ | | | | | | | | Do not abort when meeting unfixable legacy storages
| * | | Properly forward repair errors and warningsVincent Petry2015-02-273-0/+15
| | | | | | | | | | | | | | | | | | | | This makes repair errors and warnings visible for the user when upgrading on the command line or in the web UI.
* | | | 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
| | | | |
* | | | | Properly handle available databases at runtime and respect setup checks in ↵Thomas Müller2015-03-112-135/+45
| |_|/ / |/| | | | | | | | | | | command line as well
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-112-0/+6
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-102-2/+50
| | | |
* | | | Verify CSRF token already in update.php and not the EventSource codeLukas Reschke2015-03-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue report: > Hum, well I upgraded the package then visited the web interface to trigger the update and it failed; the UI would say there was a possible CSRF attack and after that it'd be stuck in maintenance mode. Tried a few times (by editing maintenance to false in owncloud.conf) and same result each time. That smells partially like an issue caused by our EventSource implementation, due to legacy concerns the CSRF verification happens within the EventSource handling and not when the actual endpoint is called, what happens here then is: 1. User has somehow an invalid CSRF token in session (or none at all) 2. User clicks the update button 3. Invalid CSRF token is sent to update.php - no CSRF check there => Instance gets set in maintenance mode 4. Invalid CSRF token is processed by the EventSource code => Code Execution is stopped and ownCloud is stuck in maintenance mode I have a work-around for this problem, basically it verifies the CSRF token already in step 3 and cancels execution then. The same error will be shown to the user however he can work around it by refreshing the page – as stated by the error. I think that’s an acceptable behaviour for now: INSERT LINK To verify this test: 1. Delete your ownCloud cookies 2. Increment the version in version.php 3. Try to upgrade => Before the patch: Instance shows an error, is set to upgrade mode and a refresh does not help => After the patch: Instance shows an error, a refresh helps though. This is not really the best fix as a better solution would be to catch such situations when bootstrapping ownCloud, however, I don’t dare to touch base.php for this sake only, you never know what breaks then… That said: There might be other bugs as well, especially the stacktrace is somewhat confusing but then again it installing ownCloud under /usr/share/owncloud/ and I bet that is part of the whole issue ;-)
* | | | Merge pull request #14743 from owncloud/autoconfig-passwordMorris Jobke2015-03-091-0/+8
|\ \ \ \ | | | | | | | | | | Convert 'abcpassword' to 'abcpass' during setup
| * | | | Convert 'abcpassword' to 'abcpass' during setupRobin McCorkell2015-03-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which is more consistent with config.php
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-098-54/+184
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0810-10/+30
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0712-4/+24
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0616-0/+56
| | | |
* | | | Merge pull request #14582 from rullzer/avatar_fixesMorris Jobke2015-03-044-37/+72
|\ \ \ \ | | | | | | | | | | Avatars in share dialog fixes
| * | | | Avatars in share dialog fixesRoeland Jago Douma2015-03-034-37/+72
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * Avatar for "xxxx share with you..." to the left * Avatars for groups and remote shares (use default placeholder) * Modified and added unit tests * Use the same css for all the avatars in the dropdown
* | | | Merge pull request #14651 from ↵Morris Jobke2015-03-044-1/+441
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins Let users configure security headers in their Webserver
| * | | | Added missing done() calls for async testsVincent Petry2015-03-031-20/+31
| | | | |
| * | | | Let users configure security headers in their WebserverLukas Reschke2015-03-024-1/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing this in the PHP code is not the right approach for multiple reasons: 1. A bug in the PHP code prevents them from being added to the response. 2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud) 3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations. This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0422-12/+90
| | | | |
* | | | | Merge pull request #14653 from sebomoto/fix_loading_feedbackMorris Jobke2015-03-031-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | fix for loading spinner reappearing after errors in db-connection
| * | | | fix for loading spinner reappearing after errors in db-connectionSebastian Bolt2015-03-021-0/+1
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0370-82/+90
| | | |
* | | | Merge pull request #14615 from kampka/cron-commandLukas Reschke2015-03-025-0/+179
|\ \ \ \ | |/ / / |/| | | Allow configuring background job mode from the console
| * | | Allow configuring background job mode from the consoleChristian Kampka2015-03-025-0/+179
| | |/ | |/|
* | | Maintenance mode message might be misleadingJoas Schilling2015-03-021-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-022-0/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-018-0/+36
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-288-4/+58
| |
* | Merge pull request #14585 from owncloud/fix-avatars-for-users-with-atLukas Reschke2015-02-272-3/+3
|\ \ | | | | | | Use custom attribute instead of the div identifier
| * | Use custom attribute instead of the div identifierLukas Reschke2015-02-272-3/+3
| |/ | | | | | | | | | | Otherwise problems arrive when a username contains characters such as an `@` Fixes https://github.com/owncloud/user_shibboleth/issues/38
* / Fix avatars in masterLukas Reschke2015-02-271-1/+1
|/
* Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-2733-665/+181
|\ | | | | Revert "Updating license headers"
| * Revert "Updating license headers"Morris Jobke2015-02-2633-665/+181
| | | | | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2718-0/+94
| |
* | Merge pull request #13969 from raimund-schluessler/masterMorris Jobke2015-02-261-4/+11
|\ \ | | | | | | Append search results to custom container
| * | Fix variable already definedRaimund Schlüßler2015-02-091-1/+1
| | |
| * | Append search results to custom containerRaimund Schlüßler2015-02-081-4/+11
| | | | | | | | | | | | fixes #13968
* | | Merge pull request #14208 from owncloud/oc-msg-remove-object-dependencyMorris Jobke2015-02-261-36/+71
|\ \ \ | |_|/ |/| | Remove dependency from arbitrary data object structure for easier usage
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-06 21:28:12 +0000