aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-2454-90/+268
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-2324-48/+136
|
* Merge pull request #24177 from owncloud/deprecate-update.phpThomas Müller2016-04-221-0/+18
|\ | | | | Deprecate appinfo/update.php - RepairSteps within info.xml are to be …
| * Deprecate appinfo/update.php - RepairSteps within info.xml are to be usedThomas Müller2016-04-221-0/+18
| |
* | Merge pull request #24210 from owncloud/because-some-people-do-not-thinkThomas Müller2016-04-221-0/+2
|\ \ | | | | | | Add link to security page
| * | Add link to security pageLukas Reschke2016-04-221-0/+2
| | | | | | | | | Because some people do not think…
* | | Merge pull request #24209 from owncloud/encryption_psr4Thomas Müller2016-04-2216-0/+0
|\ \ \ | |/ / |/| | Move \OC\Encryption to PSR-4
| * | Move \OC\Encryption to PSR-4Roeland Jago Douma2016-04-2216-0/+0
|/ /
* | Merge pull request #24187 from ↵Thomas Müller2016-04-222-2/+24
|\ \ | |/ |/| | | | | owncloud/fs-initmountpoint-rethrowifusernotfoundagain Mark $usersSetup only if user was found in initMountPoints
| * Mark $usersSetup only if user was found in initMountPointsVincent Petry2016-04-222-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_psr4Thomas Müller2016-04-2228-27/+25
|\ \ | | | | | | Move \OC\AppFramework to PSR-4
| * | Fix inconsistent nameing of AppFrameworkRoeland Jago Douma2016-04-2210-22/+20
| | |
| * | Move \OC\AppFramework to PSR-4Roeland Jago Douma2016-04-2223-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-shibbolethThomas Müller2016-04-221-4/+8
|\ \ \ | | | | | | | | Disable web updater if ldap or shibboleth are installed
| * | | Disable web updater if ldap or shibboleth are installed - refs ↵Thomas Müller2016-04-221-4/+8
|/ / / | | | | | | | | | https://github.com/owncloud/core/issues/23913#issuecomment-213432232
* | | Merge pull request #24124 from owncloud/encryped-size-progationThomas Müller2016-04-224-15/+79
|\ \ \ | |/ / |/| | dont do optimized size propagation for encrypted files
| * | dont do optimized size propagation for encrypted filesRobin Appelman2016-04-212-1/+11
| | |
| * | Add unit tests for shared size propagation with encryptionRobin Appelman2016-04-212-14/+68
| | |
* | | Merge pull request #23918 from owncloud/cruds-for-federated-sharesBjörn Schießle2016-04-228-78/+136
|\ \ \ | | | | | | | | bring back CRUDS permissions for federated shares
| * | | always share with same default permissions, no special handling for remote ↵Björn Schießle2016-04-201-15/+11
| | | | | | | | | | | | | | | | shares
| * | | if share-permissions exists we use this information as indicator to check if ↵Björn Schießle2016-04-201-0/+3
| | | | | | | | | | | | | | | | the file has changed or not
| * | | ask for share-permissions on propfindBjörn Schießle2016-04-202-1/+18
| | | |
| * | | return correct share permissions on propfindBjörn Schießle2016-04-183-40/+88
| | | |
| * | | set correct permissions in shareinfoBjörn Schießle2016-04-181-3/+11
| | | |
| * | | bring back CRUDS permissions for federated sharesBjoern Schiessle2016-04-182-19/+5
| | | |
* | | | Merge pull request #24085 from owncloud/feedback-on-app-migrationsThomas Müller2016-04-229-57/+158
|\ \ \ \ | |_|_|/ |/| | | App migration steps need to push feedback to the user ....
| * | | Adding pre- and post-migration repair stepsThomas Müller2016-04-225-33/+128
| | | |
| * | | Remove deprecated HTTPHelper from InfoParserThomas Müller2016-04-226-27/+33
| | | |
* | | | Merge pull request #24166 from owncloud/drop-old-calendar-and-contacts-tablesThomas Müller2016-04-221-0/+7
|\ \ \ \ | | | | | | | | | | Drop old calendar and contacts tables
| * | | | Drop old calendar and contacts tables - fixes #21889Thomas Müller2016-04-221-0/+7
| | | | |
* | | | | Merge pull request #24191 from owncloud/setup_psr4Roeland Douma2016-04-225-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Move \OC\Setup to PSR-4
| * | | | | Move \OC\Repair to PSR-4Roeland Jago Douma2016-04-225-0/+0
| |/ / / /
* | | | | Merge pull request #24183 from owncloud/change-background-job-sort-orderThomas Müller2016-04-222-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 ASCJoas Schilling2016-04-222-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-nulluserThomas Müller2016-04-222-0/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Throw NoUserException when attempting to init mount point for null user
| * | | | | Throw NoUserException when attempting to init mount point for null userVincent Petry2016-04-222-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-delayLukas Reschke2016-04-222-4/+17
|\ \ \ \ \ | | | | | | | | | | | | Delay reloading the page if an ajax error occurs, show notification
| * | | | | Add test for reload delayRobin McCorkell2016-04-201-3/+15
| | | | | |
| * | | | | Delay reloading the page if an ajax error occurs, show notificationRobin McCorkell2016-04-201-1/+2
| | | | | |
* | | | | | Merge pull request #24151 from owncloud/create-personal-calendarThomas Müller2016-04-222-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üller2016-04-212-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | exists - fixes #24082
* | | | | | Merge pull request #24173 from owncloud/master-certificateVincent Petry2016-04-222-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | [master] Ignore certificate file if it starts with file://
| * | | | | | [master] Ignore certificate file if it starts with file://Lukas Reschke2016-04-212-0/+15
| | | | | | |
* | | | | | | Merge pull request #24174 from owncloud/repair_psr4Thomas Müller2016-04-2218-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Move \OC\Repair to PSR-4
| * | | | | | Move \OC\Repair to PSR-4Roeland Jago Douma2016-04-2118-0/+0
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2230-0/+38
| | | | | |
* | | | | | Merge pull request #24157 from ↵Thomas Müller2016-04-211-6/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | owncloud/files-app-is-not-available-on-public-page OCA.Files.App is not available on public page
| * | | | | OCA.Files.App is not available on public pageChristoph Wurst2016-04-211-6/+9
| |/ / / /
* | | | | Merge pull request #24145 from owncloud/limit-cron-execution-timeVincent Petry2016-04-211-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Make sure that CLI cron doesn't run for ever, but makes use of the ne…
| * | | | | Make sure that CLI cron doesn't run for ever, but makes use of the next spawnJoas Schilling2016-04-211-0/+8
| | | | | |