summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use proper statement to retrieve the IP of an docker instanceMorris Jobke2015-10-306-8/+8
* Merge pull request #19680 from owncloud/ocs_sharing_api_integration_testingThomas Müller2015-10-305-58/+312
|\
| * Upgrade behat to 3.0.x and use @BeforeScenario and @AfterScenario to clean up...Thomas Müller2015-10-295-39/+43
| * added sharing feature fileSergio Bertolin2015-10-292-28/+278
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-3042-28/+274
* | Merge pull request #20051 from otetard/feature/newfilemenu_extendThomas Müller2015-10-291-31/+46
|\ \ | |/ |/|
| * Allow apps to add new items in the “New” filemenu.Olivier Tétard2015-10-261-31/+46
* | Merge pull request #20135 from owncloud/check-if-null-subadminThomas Müller2015-10-2925-1793/+2538
|\ \
| * | Drop OC_SubAdmin and replace usagesLukas Reschke2015-10-2925-1793/+2538
* | | Merge pull request #20060 from owncloud/cache-move-final-update-transactionRobin Appelman2015-10-291-2/+6
|\ \ \
| * | | include the final update in the transaction when moving a folder in the cacheRobin Appelman2015-10-291-2/+6
* | | | Merge pull request #20152 from owncloud/LukasReschke-patch-1Thomas Müller2015-10-291-4/+4
|\ \ \ \
| * | | | Remove invalid type-castLukas Reschke2015-10-291-4/+4
* | | | | Merge pull request #20122 from owncloud/files-consolidateiconupdateThomas Müller2015-10-298-11/+109
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix icon update to be more consistentVincent Petry2015-10-298-11/+109
* | | | | Merge pull request #19592 from owncloud/availability-root-always-existsThomas Müller2015-10-291-0/+3
|\ \ \ \ \
| * | | | | The root of a storage always existsRobin Appelman2015-10-291-0/+3
* | | | | | Merge pull request #20134 from owncloud/pass-with-skippingThomas Müller2015-10-293-24/+27
|\ \ \ \ \ \
| * | | | | | Make Travis CI pass when DAV was not touchedJoas Schilling2015-10-293-24/+27
* | | | | | | Merge pull request #20141 from owncloud/checkboxes-settings-usersThomas Müller2015-10-291-5/+5
|\ \ \ \ \ \ \
| * | | | | | | apply new checkbox style in users settingsHendrik Leppelsack2015-10-291-5/+5
|/ / / / / / /
* | | | | | | Merge pull request #20144 from owncloud/gitignore-clover.xmlThomas Müller2015-10-291-0/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | ignore any clover.xml - which is generated by some phpunit callsThomas Müller2015-10-291-0/+1
|/ / / / / /
* | | | | | Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrenameThomas Müller2015-10-294-3/+74
|\ \ \ \ \ \
| * | | | | | Fix locking unit tests due to filemtime additionVincent Petry2015-10-261-2/+10
| * | | | | | Also adjust storage_mtime of target after renameVincent Petry2015-10-263-1/+64
* | | | | | | Merge pull request #11509 from owncloud/internal_email_templateThomas Müller2015-10-293-5/+57
|\ \ \ \ \ \ \
| * | | | | | | Allow separate templates for internal and external share notificationsStephen Colebrook2015-10-293-5/+57
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-...Thomas Müller2015-10-291-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Don't log expected Swift 404 responsesTim Dettrick2015-09-141-1/+4
* | | | | | | | Merge pull request #19100 from owncloud/ext-tooltip-unavailableThomas Müller2015-10-294-14/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | Display storage status as tooltipRobin McCorkell2015-10-234-7/+47
| * | | | | | | | Remove status indicator on modificationRobin McCorkell2015-10-231-8/+21
* | | | | | | | | Merge pull request #20140 from owncloud/provisioning_killappphpThomas Müller2015-10-291-20/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Kill empty app.php in provisioning_apiJoas Schilling2015-10-291-20/+0
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #19871 from owncloud/issue-19583-invalid-sharesThomas Müller2015-10-296-8/+395
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use the methodJoas Schilling2015-10-291-7/+1
| * | | | | | | | | Add a repair step that checks for group membership on sharesJoas Schilling2015-10-294-1/+284
| * | | | | | | | | Remove shares where the parent does not exist anymoreJoas Schilling2015-10-292-0/+110
| |/ / / / / / / /
* | | | | | | | | Merge pull request #20120 from owncloud/sharee-list-view-testsThomas Müller2015-10-291-0/+158
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add sharee list view js testsTom Needham2015-10-291-0/+158
| |/ / / / / / /
* | | | | | | | Merge pull request #20126 from owncloud/LukasReschke-patch-1Thomas Müller2015-10-291-118/+82
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix formatLukas Reschke2015-10-290-0/+0
| * | | | | | | Update certificate bundleLukas Reschke2015-10-291-118/+82
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #20079 from owncloud/filelist-invalidpathThomas Müller2015-10-293-10/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix file list reload callback resultVincent Petry2015-10-273-10/+16
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-29140-144/+466
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #19758 from owncloud/ext-fallback-getmimetypeThomas Müller2015-10-283-45/+0
|\ \ \ \ \ \
| * | | | | | Fallback to default mimetype detection mechanismVincent Petry2015-10-133-45/+0
* | | | | | | Merge pull request #19182 from cweiske/support-bzip2Thomas Müller2015-10-282-2/+2
|\ \ \ \ \ \ \