summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-2016-8/+60
|
* Merge pull request #24062 from owncloud/fix-gitignoreThomas Müller2016-04-195-80/+3
|\ | | | | Fix gitignore for core/vendor
| * remove unneeded filesMorris Jobke2016-04-184-79/+0
| |
| * Fix gitignore for core/vendorMorris Jobke2016-04-181-1/+3
| | | | | | | | * es6-promise and davclient.js
* | Merge pull request #24079 from owncloud/console_psr4Thomas Müller2016-04-192-0/+0
|\ \ | | | | | | Move \OC\Console to PSR-4
| * | Move \OC\Console to PSR-4Roeland Jago Douma2016-04-192-0/+0
| | |
* | | Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-userThomas Müller2016-04-197-5/+57
|\ \ \ | | | | | | | | Introduce isReadyForUser and verify in file transfer ownership
| * | | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786Thomas Müller2016-04-157-5/+57
| | | |
* | | | Merge pull request #24076 from ↵Lukas Reschke2016-04-192-18/+89
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/fix-initial-calendar-and-addressbook-names Fix displayname for initial calendars and address books
| * | | | Fix displayname for initial calendars and address books - fixes #24057Thomas Müller2016-04-182-18/+89
| | | | |
* | | | | Merge pull request #24054 from owncloud/data_fingerprintRoeland Douma2016-04-199-12/+232
|\ \ \ \ \ | |_|_|/ / |/| | | | Add data-fingerprint property
| * | | | Add config textRoeland Jago Douma2016-04-181-0/+13
| | | | |
| * | | | Add occ command for updating the data-fingerprintRoeland Jago Douma2016-04-183-0/+118
| | | | |
| * | | | Add data-fingerprint property to webdavRoeland Jago Douma2016-04-185-12/+101
| | | | |
* | | | | Merge pull request #23993 from owncloud/update-to-jquery2Thomas Müller2016-04-1915-5257/+4887
|\ \ \ \ \ | | | | | | | | | | | | Update jquery to version 2.2.3
| * | | | | Turn off jQuery animations when testingChristoph Wurst2016-04-181-0/+2
| | | | | |
| * | | | | downgrade jquery, update jquery-migrateChristoph Wurst2016-04-1511-3081/+2675
| | | | | |
| * | | | | add jquery files to gitChristoph Wurst2016-04-144-1/+9848
| | | | | |
| * | | | | update jquery to version 2.2.3Christoph Wurst2016-04-147-9830/+17
| | | | | |
* | | | | | Merge pull request #24074 from owncloud/integritycheck_psr4Thomas Müller2016-04-197-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move OC\IntegrityCheck to PSR-4
| * | | | | | Fix use statementRoeland Jago Douma2016-04-181-1/+1
| | | | | | |
| * | | | | | Move OC\IntegrityCheck to PSR-4Roeland Jago Douma2016-04-187-0/+0
| | | | | | |
* | | | | | | Merge pull request #23903 from ↵Thomas Müller2016-04-191-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-user-data-folder-creation-for-apache-login Ensure the user's data folder is created for IApacheBackend authentication
| * | | | | | | Fixes #23899Thomas Müller2016-04-111-0/+4
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1994-96/+44
| | | | | | | |
* | | | | | | | Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hookThomas Müller2016-04-1910-204/+142
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move post_removeFromGroup to shareManager
| * | | | | | | | Move post_removeFromGroup to shareManagerRoeland Jago Douma2016-04-1310-204/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last sharing hook to be moved over. * Added unit tests * Removed old tests that relied on old behaviour * Removed old hooks.php
* | | | | | | | | Merge pull request #24049 from owncloud/skjnldsv-fix-colors-valuesThomas Müller2016-04-191-1/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix rgb values
| * | | | | | | | | Fix rgb valuesJohn Molakvoæ2016-04-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix was required because values was too big for rgb and breaking the brightness calculation. Now we have the initial sat (70%) and the reduction to 60 if too bright working again.
* | | | | | | | | | Merge pull request #24056 from owncloud/move-logout-to-logincontrollerThomas Müller2016-04-1910-38/+95
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | Move logout to controller
| * | | | | | | | | Move logout to controllerLukas Reschke2016-04-1810-38/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testable code. Yay.
* | | | | | | | | | Revert "Fix displayname for initial calendars and address books - fixes #24057"Thomas Müller2016-04-182-89/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a5d3e5ed6893b35dc473a479105d95f03a403999.
* | | | | | | | | | Fix displayname for initial calendars and address books - fixes #24057Thomas Müller2016-04-182-18/+89
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24037 from owncloud/file_versions_defaultLukas Reschke2016-04-181-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | link to file_versioning.rst
| * | | | | | | | | link to file_versioning.rstCarla Schroder2016-04-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which describes files_versions and config.php settings backports to 8.2
* | | | | | | | | | Merge pull request #23911 from owncloud/split-upgrade-commandChristoph Wurst2016-04-1810-319/+434
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Move version check code out of class Updater
| * | | | | | | | | Remove deprecated HTTPHelperThomas Müller2016-04-184-24/+34
| | | | | | | | | |
| * | | | | | | | | Move version check code out of class UpdaterThomas Müller2016-04-1810-317/+422
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #23922 from ↵Thomas Müller2016-04-184-13/+62
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/upgrade-only-with-cli-for-big-installations Suggest cli based updater in case the instance is bigger
| * | | | | | | | | Suggest cli based updater in case the instance is bigger - #23913Thomas Müller2016-04-184-13/+62
| |/ / / / / / / /
* | | | | | | | | Merge pull request #24072 from owncloud/properly-escape-urlThomas Müller2016-04-182-1/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Properly escape URL
| * | | | | | | | Properly escape URLLukas Reschke2016-04-182-1/+15
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23499
* | | | | | | | Merge pull request #24058 from owncloud/fix-notification-pathsThomas Müller2016-04-181-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Adjust notification paths to PSR-4
| * | | | | | | Adjust notification paths to PSR-4Joas Schilling2016-04-181-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #23947 from owncloud/login-to-ctrlLukas Reschke2016-04-189-49/+398
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move login form into controller
| * | | | | | | Also check for an empty stringLukas Reschke2016-04-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP. Yay.
| * | | | | | | Keep used username in URLLukas Reschke2016-04-151-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required until the new controller can also handle POST requests
| * | | | | | | Rename `username` to `loginName`Lukas Reschke2016-04-153-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UID and login name are two different things.
| * | | | | | | Use !== instead of emptyLukas Reschke2016-04-152-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can be named null
| * | | | | | | Move login form into controllerLukas Reschke2016-04-159-48/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First step on getting the authorisation stuff cleaned up. This is only for the login form, all other stuff is still where it is.