summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | 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
* | | | | | | | | | | | | Merge pull request #22791 from owncloud/enc_master_key_improvementsVincent Petry2016-04-217-75/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | replaceUserKeys() actually deletes the users keys -> update method name and d...Bjoern Schiessle2016-03-183-3/+5
| * | | | | | | | | | | | | only create and update user specific key if no master key is enabledBjoern Schiessle2016-03-187-72/+113
* | | | | | | | | | | | | | Merge pull request #24133 from owncloud/tagging_psr4Joas Schilling2016-04-212-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Move \OC\Tagging to PSR-4Roeland Jago Douma2016-04-202-0/+0
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-21278-520/+560
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #24127 from owncloud/handle-app-loading-errorThomas Müller2016-04-209-18/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | In case an app has issues while loading the app is disabled and request proce...Thomas Müller2016-04-201-2/+10
| * | | | | | | | | | | | Catch class Error on all root entrypointsThomas Müller2016-04-206-12/+26
| * | | | | | | | | | | | With PHP7 Throwable is the new base interface for all Exception and Error - w...Thomas Müller2016-04-202-4/+4
* | | | | | | | | | | | | Merge pull request #24132 from owncloud/fix-web-updaterThomas Müller2016-04-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix web updater - fixes #24115Thomas Müller2016-04-201-3/+3