Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-20 | 16 | -8/+60 |
| | |||||
* | Merge pull request #24062 from owncloud/fix-gitignore | Thomas Müller | 2016-04-19 | 5 | -80/+3 |
|\ | | | | | Fix gitignore for core/vendor | ||||
| * | remove unneeded files | Morris Jobke | 2016-04-18 | 4 | -79/+0 |
| | | |||||
| * | Fix gitignore for core/vendor | Morris Jobke | 2016-04-18 | 1 | -1/+3 |
| | | | | | | | | * es6-promise and davclient.js | ||||
* | | Merge pull request #24079 from owncloud/console_psr4 | Thomas Müller | 2016-04-19 | 2 | -0/+0 |
|\ \ | | | | | | | Move \OC\Console to PSR-4 | ||||
| * | | Move \OC\Console to PSR-4 | Roeland Jago Douma | 2016-04-19 | 2 | -0/+0 |
| | | | |||||
* | | | Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user | Thomas Müller | 2016-04-19 | 7 | -5/+57 |
|\ \ \ | | | | | | | | | Introduce isReadyForUser and verify in file transfer ownership | ||||
| * | | | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 | Thomas Müller | 2016-04-15 | 7 | -5/+57 |
| | | | | |||||
* | | | | Merge pull request #24076 from ↵ | Lukas Reschke | 2016-04-19 | 2 | -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 #24057 | Thomas Müller | 2016-04-18 | 2 | -18/+89 |
| | | | | | |||||
* | | | | | Merge pull request #24054 from owncloud/data_fingerprint | Roeland Douma | 2016-04-19 | 9 | -12/+232 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add data-fingerprint property | ||||
| * | | | | Add config text | Roeland Jago Douma | 2016-04-18 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | Add occ command for updating the data-fingerprint | Roeland Jago Douma | 2016-04-18 | 3 | -0/+118 |
| | | | | | |||||
| * | | | | Add data-fingerprint property to webdav | Roeland Jago Douma | 2016-04-18 | 5 | -12/+101 |
| | | | | | |||||
* | | | | | Merge pull request #23993 from owncloud/update-to-jquery2 | Thomas Müller | 2016-04-19 | 15 | -5257/+4887 |
|\ \ \ \ \ | | | | | | | | | | | | | Update jquery to version 2.2.3 | ||||
| * | | | | | Turn off jQuery animations when testing | Christoph Wurst | 2016-04-18 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | downgrade jquery, update jquery-migrate | Christoph Wurst | 2016-04-15 | 11 | -3081/+2675 |
| | | | | | | |||||
| * | | | | | add jquery files to git | Christoph Wurst | 2016-04-14 | 4 | -1/+9848 |
| | | | | | | |||||
| * | | | | | update jquery to version 2.2.3 | Christoph Wurst | 2016-04-14 | 7 | -9830/+17 |
| | | | | | | |||||
* | | | | | | Merge pull request #24074 from owncloud/integritycheck_psr4 | Thomas Müller | 2016-04-19 | 7 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move OC\IntegrityCheck to PSR-4 | ||||
| * | | | | | | Fix use statement | Roeland Jago Douma | 2016-04-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Move OC\IntegrityCheck to PSR-4 | Roeland Jago Douma | 2016-04-18 | 7 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #23903 from ↵ | Thomas Müller | 2016-04-19 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-user-data-folder-creation-for-apache-login Ensure the user's data folder is created for IApacheBackend authentication | ||||
| * | | | | | | | Fixes #23899 | Thomas Müller | 2016-04-11 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-19 | 94 | -96/+44 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook | Thomas Müller | 2016-04-19 | 10 | -204/+142 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Move post_removeFromGroup to shareManager | ||||
| * | | | | | | | | Move post_removeFromGroup to shareManager | Roeland Jago Douma | 2016-04-13 | 10 | -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-values | Thomas Müller | 2016-04-19 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix rgb values | ||||
| * | | | | | | | | | Fix rgb values | John Molakvoæ | 2016-04-18 | 1 | -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-logincontroller | Thomas Müller | 2016-04-19 | 10 | -38/+95 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | Move logout to controller | ||||
| * | | | | | | | | | Move logout to controller | Lukas Reschke | 2016-04-18 | 10 | -38/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testable code. Yay. | ||||
* | | | | | | | | | | Revert "Fix displayname for initial calendars and address books - fixes #24057" | Thomas Müller | 2016-04-18 | 2 | -89/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a5d3e5ed6893b35dc473a479105d95f03a403999. | ||||
* | | | | | | | | | | Fix displayname for initial calendars and address books - fixes #24057 | Thomas Müller | 2016-04-18 | 2 | -18/+89 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #24037 from owncloud/file_versions_default | Lukas Reschke | 2016-04-18 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | link to file_versioning.rst | ||||
| * | | | | | | | | | link to file_versioning.rst | Carla Schroder | 2016-04-15 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which describes files_versions and config.php settings backports to 8.2 | ||||
* | | | | | | | | | | Merge pull request #23911 from owncloud/split-upgrade-command | Christoph Wurst | 2016-04-18 | 10 | -319/+434 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | Move version check code out of class Updater | ||||
| * | | | | | | | | | Remove deprecated HTTPHelper | Thomas Müller | 2016-04-18 | 4 | -24/+34 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Move version check code out of class Updater | Thomas Müller | 2016-04-18 | 10 | -317/+422 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #23922 from ↵ | Thomas Müller | 2016-04-18 | 4 | -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 - #23913 | Thomas Müller | 2016-04-18 | 4 | -13/+62 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #24072 from owncloud/properly-escape-url | Thomas Müller | 2016-04-18 | 2 | -1/+15 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Properly escape URL | ||||
| * | | | | | | | | Properly escape URL | Lukas Reschke | 2016-04-18 | 2 | -1/+15 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23499 | ||||
* | | | | | | | | Merge pull request #24058 from owncloud/fix-notification-paths | Thomas Müller | 2016-04-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Adjust notification paths to PSR-4 | ||||
| * | | | | | | | Adjust notification paths to PSR-4 | Joas Schilling | 2016-04-18 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #23947 from owncloud/login-to-ctrl | Lukas Reschke | 2016-04-18 | 9 | -49/+398 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move login form into controller | ||||
| * | | | | | | | Also check for an empty string | Lukas Reschke | 2016-04-15 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP. Yay. | ||||
| * | | | | | | | Keep used username in URL | Lukas Reschke | 2016-04-15 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required until the new controller can also handle POST requests | ||||
| * | | | | | | | Rename `username` to `loginName` | Lukas Reschke | 2016-04-15 | 3 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UID and login name are two different things. | ||||
| * | | | | | | | Use !== instead of empty | Lukas Reschke | 2016-04-15 | 2 | -4/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can be named null | ||||
| * | | | | | | | Move login form into controller | Lukas Reschke | 2016-04-15 | 9 | -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. |