summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 Owncloud apps to add new items to the “new” file menu.
| * Allow apps to add new items in the “New” filemenu.Olivier Tétard2015-10-261-31/+46
| | | | | | | | | | | | | | Owncloud apps can now add new items to the “new” file menu. A new `addMenuEntry()` was added to `NewFileMenu`. To add a new item, you have to attach a plugin to `OCA.Files.NewFileMenu` that will call `addMenuEntry()`.
* | Merge pull request #20135 from owncloud/check-if-null-subadminThomas Müller2015-10-2925-1793/+2538
|\ \ | | | | | | Drop OC_SubAdmin and replace usages
| * | 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 cache
| * | | 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-cast
| * | | | Remove invalid type-castLukas Reschke2015-10-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required. Fixes https://github.com/owncloud/core/issues/20095
* | | | | Merge pull request #20122 from owncloud/files-consolidateiconupdateThomas Müller2015-10-298-11/+109
|\ \ \ \ \ | |/ / / / |/| | | | Fix icon update to be more consistent
| * | | | Fix icon update to be more consistentVincent Petry2015-10-298-11/+109
| | | | | | | | | | | | | | | | | | | | Makes the details bar show the same icon as in the list.
* | | | | Merge pull request #19592 from owncloud/availability-root-always-existsThomas Müller2015-10-291-0/+3
|\ \ \ \ \ | | | | | | | | | | | | The root of a storage always exists
| * | | | | 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 touched
| * | | | | | 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 settings
| * | | | | | | 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 calls
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | On rename, also refresh storage_mtime of the target file
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some storages like Dropbox change their mtime on rename...
* | | | | | | Merge pull request #11509 from owncloud/internal_email_templateThomas Müller2015-10-293-5/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow separate templates for internal and external share notifications
| * | | | | | | Allow separate templates for internal and external share notificationsStephen Colebrook2015-10-293-5/+57
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #19000 from ↵Thomas Müller2015-10-291-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UoM-ResPlat-DevOps/swift-squelch-expected-404-errors Don't log expected Swift 404 responses in files_external
| * | | | | | | Don't log expected Swift 404 responsesTim Dettrick2015-09-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File existence checks are expected in some cases to be false, so passing 404 Not Found errors through to the logs just causes noise.
* | | | | | | | Merge pull request #19100 from owncloud/ext-tooltip-unavailableThomas Müller2015-10-294-14/+67
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Display external storage status as tooltip
| * | | | | | | | 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_api
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Issue 19583 invalid shares
| * | | | | | | | | 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 tests
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Update certificate bundle
| * | | | | | | Fix formatLukas Reschke2015-10-290-0/+0
| | | | | | | |
| * | | | | | | Update certificate bundleLukas Reschke2015-10-291-118/+82
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syncs with ca-certificates version 2.5. - Removes expired TURKTRUST Certificate Services Provider Root 1 (https://bugzilla.mozilla.org/show_bug.cgi?id=1165992) - Removes obsolete TC TrustCenter certificates (https://bugzilla.mozilla.org/show_bug.cgi?id=1159070) - Removes ComSign Secured certificate as it is not used for websites (https://bugzilla.mozilla.org/show_bug.cgi?id=1160208) - Adds updated TURKTRUST certificates as the old ones are expired (https://hg.mozilla.org/integration/mozilla-inbound/rev/2f1a37cb43ac) - Add Certinomis as root certificate (https://bugzilla.mozilla.org/show_bug.cgi?id=1169083)
* | | | | | | Merge pull request #20079 from owncloud/filelist-invalidpathThomas Müller2015-10-293-10/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix file list reload callback result
| * | | | | | Fix file list reload callback resultVincent Petry2015-10-273-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All reloadCallback must return either true for success or false in case of failure / non-existing folder. Some file lists only have a root folder (favorite, shares), so restrict the path to that to avoid having a wrong path in the breadcrumbs.
* | | | | | | [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 mechanism
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix #19181: Support .bz2 app archives
| * | | | | | | Fix #19181: Support .bz2 app archivesChristian Weiske2015-10-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At first a bz2 handling in needs to be fixed; PEAR's Archive_Tar otherwise gives the following error: > Unsupported compression type "bz" > Supported types are "gz", "bz2" and "lzma2" After that we can whitelist the application/bz2 MIME type in the installer.
* | | | | | | | Merge pull request #20108 from owncloud/initially_load_250_usersThomas Müller2015-10-281-6/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Initially load 250 users
| * | | | | | | | Initially load at least 250 usersJörn Friedrich Dreyer2015-10-281-6/+11
| | | | | | | | |
* | | | | | | | | Merge pull request #20089 from owncloud/litmus-test-webdavThomas Müller2015-10-287-0/+327
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable DAV app testing on travis