Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-25 | 10 | -4/+10 |
| | |||||
* | Merge pull request #24213 from owncloud/systemtag_psr4 | Lukas Reschke | 2016-04-24 | 4 | -0/+0 |
|\ | | | | | Move \OC\SystemTag to PSR-4 | ||||
| * | Move \OC\SystemTag to PSR-4 | Roeland Jago Douma | 2016-04-22 | 4 | -0/+0 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-24 | 54 | -90/+268 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-23 | 24 | -48/+136 |
|/ | |||||
* | Merge pull request #24177 from owncloud/deprecate-update.php | Thomas Müller | 2016-04-22 | 1 | -0/+18 |
|\ | | | | | Deprecate appinfo/update.php - RepairSteps within info.xml are to be … | ||||
| * | Deprecate appinfo/update.php - RepairSteps within info.xml are to be used | Thomas Müller | 2016-04-22 | 1 | -0/+18 |
| | | |||||
* | | Merge pull request #24210 from owncloud/because-some-people-do-not-think | Thomas Müller | 2016-04-22 | 1 | -0/+2 |
|\ \ | | | | | | | Add link to security page | ||||
| * | | Add link to security page | Lukas Reschke | 2016-04-22 | 1 | -0/+2 |
| | | | | | | | | | Because some people do not think… | ||||
* | | | Merge pull request #24209 from owncloud/encryption_psr4 | Thomas Müller | 2016-04-22 | 16 | -0/+0 |
|\ \ \ | |/ / |/| | | Move \OC\Encryption to PSR-4 | ||||
| * | | Move \OC\Encryption to PSR-4 | Roeland Jago Douma | 2016-04-22 | 16 | -0/+0 |
|/ / | |||||
* | | Merge pull request #24187 from ↵ | Thomas Müller | 2016-04-22 | 2 | -2/+24 |
|\ \ | |/ |/| | | | | | owncloud/fs-initmountpoint-rethrowifusernotfoundagain Mark $usersSetup only if user was found in initMountPoints | ||||
| * | Mark $usersSetup only if user was found in initMountPoints | Vincent Petry | 2016-04-22 | 2 | -2/+24 |
| | | | | | | | | | | | | | | | | | | | | initMountPoints is marking a user as successfully initialized too early. If the user was not found an NoUserException was thrown, the second time initMountPoints is called would not rethrow the exception and happily continue. This fix makes sure that we consistently throw NoUserException when initMountPoints is called repeatedly with invalid users. | ||||
* | | Merge pull request #24200 from owncloud/appframework_psr4 | Thomas Müller | 2016-04-22 | 28 | -27/+25 |
|\ \ | | | | | | | Move \OC\AppFramework to PSR-4 | ||||
| * | | Fix inconsistent nameing of AppFramework | Roeland Jago Douma | 2016-04-22 | 10 | -22/+20 |
| | | | |||||
| * | | Move \OC\AppFramework to PSR-4 | Roeland Jago Douma | 2016-04-22 | 23 | -5/+5 |
| | | | | | | | | | | | | * Also moved the autoloader setup a bit up since we need it in initpaths | ||||
* | | | Merge pull request #24201 from owncloud/no-web-updater-for-ldap-and-shibboleth | Thomas Müller | 2016-04-22 | 1 | -4/+8 |
|\ \ \ | | | | | | | | | Disable web updater if ldap or shibboleth are installed | ||||
| * | | | Disable web updater if ldap or shibboleth are installed - refs ↵ | Thomas Müller | 2016-04-22 | 1 | -4/+8 |
|/ / / | | | | | | | | | | https://github.com/owncloud/core/issues/23913#issuecomment-213432232 | ||||
* | | | Merge pull request #24124 from owncloud/encryped-size-progation | Thomas Müller | 2016-04-22 | 4 | -15/+79 |
|\ \ \ | |/ / |/| | | dont do optimized size propagation for encrypted files | ||||
| * | | dont do optimized size propagation for encrypted files | Robin Appelman | 2016-04-21 | 2 | -1/+11 |
| | | | |||||
| * | | Add unit tests for shared size propagation with encryption | Robin Appelman | 2016-04-21 | 2 | -14/+68 |
| | | | |||||
* | | | Merge pull request #23918 from owncloud/cruds-for-federated-shares | Björn Schießle | 2016-04-22 | 8 | -78/+136 |
|\ \ \ | | | | | | | | | bring back CRUDS permissions for federated shares | ||||
| * | | | always share with same default permissions, no special handling for remote ↵ | Björn Schießle | 2016-04-20 | 1 | -15/+11 |
| | | | | | | | | | | | | | | | | shares | ||||
| * | | | if share-permissions exists we use this information as indicator to check if ↵ | Björn Schießle | 2016-04-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | the file has changed or not | ||||
| * | | | ask for share-permissions on propfind | Björn Schießle | 2016-04-20 | 2 | -1/+18 |
| | | | | |||||
| * | | | return correct share permissions on propfind | Björn Schießle | 2016-04-18 | 3 | -40/+88 |
| | | | | |||||
| * | | | set correct permissions in shareinfo | Björn Schießle | 2016-04-18 | 1 | -3/+11 |
| | | | | |||||
| * | | | bring back CRUDS permissions for federated shares | Bjoern Schiessle | 2016-04-18 | 2 | -19/+5 |
| | | | | |||||
* | | | | Merge pull request #24085 from owncloud/feedback-on-app-migrations | Thomas Müller | 2016-04-22 | 9 | -57/+158 |
|\ \ \ \ | |_|_|/ |/| | | | App migration steps need to push feedback to the user .... | ||||
| * | | | Adding pre- and post-migration repair steps | Thomas Müller | 2016-04-22 | 5 | -33/+128 |
| | | | | |||||
| * | | | Remove deprecated HTTPHelper from InfoParser | Thomas Müller | 2016-04-22 | 6 | -27/+33 |
| | | | | |||||
* | | | | Merge pull request #24166 from owncloud/drop-old-calendar-and-contacts-tables | Thomas Müller | 2016-04-22 | 1 | -0/+7 |
|\ \ \ \ | | | | | | | | | | | Drop old calendar and contacts tables | ||||
| * | | | | Drop old calendar and contacts tables - fixes #21889 | Thomas Müller | 2016-04-22 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Merge pull request #24191 from owncloud/setup_psr4 | Roeland Douma | 2016-04-22 | 5 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Move \OC\Setup to PSR-4 | ||||
| * | | | | | Move \OC\Repair to PSR-4 | Roeland Jago Douma | 2016-04-22 | 5 | -0/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #24183 from owncloud/change-background-job-sort-order | Thomas Müller | 2016-04-22 | 2 | -7/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Change the sort order of background jobs to be DESC instead of ASC | ||||
| * | | | | | Change the sort order of background jobs to be DESC instead of ASC | Joas Schilling | 2016-04-22 | 2 | -7/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In theory, if your instance ever creates more jobs then your system cron can handle, the default background jobs get never executed anymore. Because everytime when the joblist returns the next job it looks for the next ID, however there is always a new next ID, so it will never wrap back to execute the low IDs. But when we change the sort order to be DESC, we make sure that these low IDs are always executed, before the system jumps back up to execute the new IDs. | ||||
* | | | | | | Merge pull request #24186 from owncloud/fs-initmountpoint-nulluser | Thomas Müller | 2016-04-22 | 2 | -0/+25 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Throw NoUserException when attempting to init mount point for null user | ||||
| * | | | | | Throw NoUserException when attempting to init mount point for null user | Vincent Petry | 2016-04-22 | 2 | -0/+25 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some scenarios initMountPoints is called with an empty user, and also there is no user in the session. In such cases, it is unsafe to let the code move on with an empty user. | ||||
* | | | | | Merge pull request #24126 from owncloud/err-reload-delay | Lukas Reschke | 2016-04-22 | 2 | -4/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | Delay reloading the page if an ajax error occurs, show notification | ||||
| * | | | | | Add test for reload delay | Robin McCorkell | 2016-04-20 | 1 | -3/+15 |
| | | | | | | |||||
| * | | | | | Delay reloading the page if an ajax error occurs, show notification | Robin McCorkell | 2016-04-20 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #24151 from owncloud/create-personal-calendar | Thomas Müller | 2016-04-22 | 2 | -1/+83 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Personal calendar should be generated even if the birthday calendar a… | ||||
| * | | | | | Personal calendar should be generated even if the birthday calendar already ↵ | Thomas Müller | 2016-04-21 | 2 | -1/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | exists - fixes #24082 | ||||
* | | | | | | Merge pull request #24173 from owncloud/master-certificate | Vincent Petry | 2016-04-22 | 2 | -0/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [master] Ignore certificate file if it starts with file:// | ||||
| * | | | | | | [master] Ignore certificate file if it starts with file:// | Lukas Reschke | 2016-04-21 | 2 | -0/+15 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24174 from owncloud/repair_psr4 | Thomas Müller | 2016-04-22 | 18 | -0/+0 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Move \OC\Repair to PSR-4 | ||||
| * | | | | | | Move \OC\Repair to PSR-4 | Roeland Jago Douma | 2016-04-21 | 18 | -0/+0 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-22 | 30 | -0/+38 |
| | | | | | | |||||
* | | | | | | Merge pull request #24157 from ↵ | Thomas Müller | 2016-04-21 | 1 | -6/+9 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | owncloud/files-app-is-not-available-on-public-page OCA.Files.App is not available on public page |