summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [upgrade] switch to debug logging on upgradeMorris Jobke2015-09-292-0/+12
| | | | | * resets afterwards * adds output about the previous log level
* Merge pull request #18286 from owncloud/stable8-backport-17785Morris Jobke2015-08-191-1/+2
|\ | | | | [stable8] fix mobile scrolling, lower sidebar sensitivity, fix #11193
| * fix mobile scrolling, lower sidebar sensitivity, fix #11193Jan-Christoph Borchardt2015-08-131-1/+2
| |
* | tests for _parseTime with hex and empty stringsMorris Jobke2015-07-292-0/+6
| |
* | Fix parsing of sharetime as stringMorris Jobke2015-07-292-0/+31
|/ | | | | | | In some cases the ajax/share.php will return the share time as string. If this is the case it would get parsed completely wrong and cause the share dropdown to not work anymore. This change will properly cast the string to an interger and also fallback if this is not possible.
* Merge pull request #17158 from ↵Morris Jobke2015-07-162-1/+27
|\ | | | | | | | | owncloud/backport-15772-no-permission-restriction-for-owner [stable8] Backport 15772 no permission restriction for owner
| * Added unit test for reshare by share ownerVincent Petry2015-06-251-0/+26
| | | | | | | | | | Conflicts: core/js/tests/specs/shareSpec.js
| * Do not restrict permissions for the original ownerJoas Schilling2015-06-251-1/+1
| | | | | | | | | | Conflicts: core/js/share.js
* | [updater] mark failure in redMorris Jobke2015-07-061-1/+2
| |
* | [updater] propagate error case properlyMorris Jobke2015-07-061-6/+11
|/ | | | | | * add $success to the updateEnd hook * add new return code for a update failure * add exception class to failure hook message
* Merge pull request #16744 from owncloud/backport-15260Vincent Petry2015-06-161-0/+55
|\ | | | | [stable8] Backport scrollbar fixes
| * fix scrutinizer issuesJan-Christoph Borchardt2015-06-041-6/+9
| |
| * adjust controls bar width to not overlay scrollbarJan-Christoph Borchardt2015-06-041-0/+52
| |
* | Merge pull request #16596 from owncloud/backport-16565Joas Schilling2015-06-091-0/+5
|\ \ | | | | | | Add check for availability of /dev/urandom
| * | Add check for availability of /dev/urandomLukas Reschke2015-05-271-0/+5
| | | | | | | | | | | | Backport of https://github.com/owncloud/core/pull/16565 to stable8
* | | Upgrade jquery-migrate to 1.2.1Morris Jobke2015-06-097-516/+544
| |/ |/|
* | Add min-height to login page for IE8 and IE9Morris Jobke2015-06-031-0/+1
| |
* | Revert "fix theme in IE8 and IE9"Morris Jobke2015-06-031-0/+5
| | | | | | | | This reverts commit bb79a6b4f0a94e82c723b90d193a4391f725fb23.
* | Merge pull request #16423 from rullzer/backport_15738Morris Jobke2015-05-282-10/+53
|\ \ | |/ |/| [stable8] Fix to make sure expiration date is properly set
| * Fix to make sure expiration date is properly setRoeland Jago Douma2015-05-182-10/+53
| | | | | | | | | | | | | | | | This did not happen correctly when the password was enforced since a different code path was taken. * moved generation of the default date string to separate function * added unit test
* | Merge pull request #16416 from owncloud/stable8-16415Morris Jobke2015-05-271-5/+0
|\ \ | | | | | | [stable8] fix theme in IE8 and IE9
| * | fix theme in IE8 and IE9Morris Jobke2015-05-181-5/+0
| |/
* / Skip disable3rdParty AppsSteffen Lindner2015-05-211-2/+12
|/
* Merge pull request #15797 from owncloud/stable8-backport-15489Jörn Friedrich Dreyer2015-05-132-0/+10
|\ | | | | Stable8 backport 15489
| * more robust share dialogMorris Jobke2015-04-221-0/+4
| |
| * do not disclose information, show generic error on login pageJörn Friedrich Dreyer2015-04-221-0/+6
| | | | | | | | | | | | Conflicts: core/templates/login.php lib/base.php
* | fix filepickerMorris Jobke2015-04-141-1/+1
|/ | | | | | * add ability to filter for mimetype * fixes #15526 * fixes #11563
* Add "Reply-To" support for sharing notificationsLukas Reschke2015-04-121-2/+2
| | | | Very hacky backport of https://github.com/owncloud/core/pull/15541 - I changed the code path to use OC_Mail instead the OCP pendant since I didn't want to modify the public API. (OCP\Util::sendMail() is anyways deprecated with 8.1)
* do not show update notification on mobile, fix overlapping of header menus, ↵Jan-Christoph Borchardt2015-03-251-0/+5
| | | | fix #10544
* Remove hard dependency on cURL for 8.0Lukas Reschke2015-03-231-0/+5
| | | | | | This removes the recently introduced hard dependency on cURL for 8.0, for 8.1 it will still stay there. Instead a warning will now be shown to the user asking to install the PHP cURL extension within the administrative interface of ownCloud.
* Properly forward repair errors and warningsVincent Petry2015-03-163-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 #14755 from owncloud/backport/14753Morris Jobke2015-03-111-0/+2
|\ | | | | [stable8] Verify CSRF token already in update.php and not the EventSource code
| * 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 ;-)
* | Maintenance mode message might be misleadingJoas Schilling2015-03-091-1/+1
|/
* Append search results to custom containerRaimund Schlüßler2015-02-271-4/+11
| | | | | * fixes #13968 * fix variable already defined
* print app upgrade information to console as wellThomas Müller2015-02-251-0/+6
|
* 3rd-party apps are disabled on upgrade - refs #14026Thomas Müller2015-02-253-11/+28
| | | | | Conflicts: lib/private/app.php
* Fix #14310Raimund Schlüßler2015-02-191-1/+1
|
* Merge pull request #14373 from owncloud/fix-nav-s8Morris Jobke2015-02-191-0/+1
|\ | | | | Backport #14338 to stable8
| * if no link text has been set for the navigation show the link nonethelessBernhard Posselt2015-02-191-0/+1
| |
* | Remove old l10n filesJoas Schilling2015-02-191-9/+0
|/
* generate valid human readable text for 0 - fixed #9342Thomas Müller2015-02-122-1/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-0628-84/+140
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-0612-0/+36
|
* Update installation.phpcmeh2015-02-061-1/+1
| | | In line 161, "SQLite" has now the same capitalisation as in line 159.
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-0674-82/+30
|
* Don't highly discourageThomas Müller2015-02-051-1/+1
|
* Merge pull request #13907 from owncloud/enhance-sqlite-warningBernhard Posselt2015-02-051-1/+6
|\ | | | | enhance sqlite warning on admin page as well as during setup
| * enhance sqlite warning on admin page as well as during setup - fixes #13906Thomas Müller2015-02-041-1/+6
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-052-32/+66
|/