summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24187 from owncloud/fs-initmountpoint-rethrowifusernotfou...Thomas Müller2016-04-222-2/+24
|\
| * Mark $usersSetup only if user was found in initMountPointsVincent Petry2016-04-222-2/+24
* | Merge pull request #24200 from owncloud/appframework_psr4Thomas Müller2016-04-2228-27/+25
|\ \
| * | Fix inconsistent nameing of AppFrameworkRoeland Jago Douma2016-04-2210-22/+20
| * | Move \OC\AppFramework to PSR-4Roeland Jago Douma2016-04-2223-5/+5
* | | 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 - refs https://github...Thomas Müller2016-04-221-4/+8
|/ / /
* | | Merge pull request #24124 from owncloud/encryped-size-progationThomas Müller2016-04-224-15/+79
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \
| * | | always share with same default permissions, no special handling for remote sh...Björn Schießle2016-04-201-15/+11
| * | | if share-permissions exists we use this information as indicator to check if ...Björn Schießle2016-04-201-0/+3
| * | | 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 - fixes #21889Thomas Müller2016-04-221-0/+7
* | | | | Merge pull request #24191 from owncloud/setup_psr4Roeland Douma2016-04-225-0/+0
|\ \ \ \ \
| * | | | | 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 ASCJoas Schilling2016-04-222-7/+16
* | | | | | 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 userVincent Petry2016-04-222-0/+25
| |/ / / /
* | | | | Merge pull request #24126 from owncloud/err-reload-delayLukas Reschke2016-04-222-4/+17
|\ \ \ \ \
| * | | | | 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 already e...Thomas Müller2016-04-212-1/+83
* | | | | | Merge pull request #24173 from owncloud/master-certificateVincent Petry2016-04-222-0/+15
|\ \ \ \ \ \
| * | | | | | [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-4Roeland Jago Douma2016-04-2118-0/+0
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2230-0/+38
* | | | | | Merge pull request #24157 from owncloud/files-app-is-not-available-on-public-...Thomas Müller2016-04-211-6/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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 next spawnJoas Schilling2016-04-211-0/+8
* | | | | | Merge pull request #24155 from owncloud/fix-birthday_calendar-aclThomas Müller2016-04-214-8/+27
|\ \ \ \ \ \
| * | | | | | Birthday calendar should never have write acl - fixes #24154Thomas Müller2016-04-214-8/+27
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #24111 from owncloud/chunk-users-in-background-jobsBjörn Schießle2016-04-213-56/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Chunk the users correctly in the trashbin and versions background jobJoas Schilling2016-04-203-56/+24
* | | | | | Merge pull request #24138 from owncloud/revert-22760-tooltip-cssfixThomas Müller2016-04-211-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert "add word wrap to tooltips. Fixes #22746"Lukas Reschke2016-04-201-1/+0
* | | | | | Merge pull request #24135 from owncloud/also-write-htaccess-from-cliThomas Müller2016-04-211-7/+15
|\ \ \ \ \ \
| * | | | | | Write .htaccess also from CLILukas Reschke2016-04-201-7/+15