Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-30 | 42 | -28/+274 |
| | |||||
* | Merge pull request #20051 from otetard/feature/newfilemenu_extend | Thomas Müller | 2015-10-29 | 1 | -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étard | 2015-10-26 | 1 | -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-subadmin | Thomas Müller | 2015-10-29 | 25 | -1793/+2538 |
|\ \ | | | | | | | Drop OC_SubAdmin and replace usages | ||||
| * | | Drop OC_SubAdmin and replace usages | Lukas Reschke | 2015-10-29 | 25 | -1793/+2538 |
| | | | |||||
* | | | Merge pull request #20060 from owncloud/cache-move-final-update-transaction | Robin Appelman | 2015-10-29 | 1 | -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 cache | Robin Appelman | 2015-10-29 | 1 | -2/+6 |
| | | | | |||||
* | | | | Merge pull request #20152 from owncloud/LukasReschke-patch-1 | Thomas Müller | 2015-10-29 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Remove invalid type-cast | ||||
| * | | | | Remove invalid type-cast | Lukas Reschke | 2015-10-29 | 1 | -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-consolidateiconupdate | Thomas Müller | 2015-10-29 | 8 | -11/+109 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix icon update to be more consistent | ||||
| * | | | | Fix icon update to be more consistent | Vincent Petry | 2015-10-29 | 8 | -11/+109 |
| | | | | | | | | | | | | | | | | | | | | Makes the details bar show the same icon as in the list. | ||||
* | | | | | Merge pull request #19592 from owncloud/availability-root-always-exists | Thomas Müller | 2015-10-29 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | The root of a storage always exists | ||||
| * | | | | | The root of a storage always exists | Robin Appelman | 2015-10-29 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #20134 from owncloud/pass-with-skipping | Thomas Müller | 2015-10-29 | 3 | -24/+27 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make Travis CI pass when DAV was not touched | ||||
| * | | | | | | Make Travis CI pass when DAV was not touched | Joas Schilling | 2015-10-29 | 3 | -24/+27 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #20141 from owncloud/checkboxes-settings-users | Thomas Müller | 2015-10-29 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Apply new checkbox style in users settings | ||||
| * | | | | | | | apply new checkbox style in users settings | Hendrik Leppelsack | 2015-10-29 | 1 | -5/+5 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #20144 from owncloud/gitignore-clover.xml | Thomas Müller | 2015-10-29 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ignore any clover.xml - which is generated by some phpunit calls | ||||
| * | | | | | | ignore any clover.xml - which is generated by some phpunit calls | Thomas Müller | 2015-10-29 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename | Thomas Müller | 2015-10-29 | 4 | -3/+74 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | On rename, also refresh storage_mtime of the target file | ||||
| * | | | | | | Fix locking unit tests due to filemtime addition | Vincent Petry | 2015-10-26 | 1 | -2/+10 |
| | | | | | | | |||||
| * | | | | | | Also adjust storage_mtime of target after rename | Vincent Petry | 2015-10-26 | 3 | -1/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some storages like Dropbox change their mtime on rename... | ||||
* | | | | | | | Merge pull request #11509 from owncloud/internal_email_template | Thomas Müller | 2015-10-29 | 3 | -5/+57 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Allow separate templates for internal and external share notifications | ||||
| * | | | | | | | Allow separate templates for internal and external share notifications | Stephen Colebrook | 2015-10-29 | 3 | -5/+57 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #19000 from ↵ | Thomas Müller | 2015-10-29 | 1 | -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 responses | Tim Dettrick | 2015-09-14 | 1 | -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-unavailable | Thomas Müller | 2015-10-29 | 4 | -14/+67 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Display external storage status as tooltip | ||||
| * | | | | | | | | Display storage status as tooltip | Robin McCorkell | 2015-10-23 | 4 | -7/+47 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove status indicator on modification | Robin McCorkell | 2015-10-23 | 1 | -8/+21 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #20140 from owncloud/provisioning_killappphp | Thomas Müller | 2015-10-29 | 1 | -20/+0 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Kill empty app.php in provisioning_api | ||||
| * | | | | | | | | | Kill empty app.php in provisioning_api | Joas Schilling | 2015-10-29 | 1 | -20/+0 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #19871 from owncloud/issue-19583-invalid-shares | Thomas Müller | 2015-10-29 | 6 | -8/+395 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Issue 19583 invalid shares | ||||
| * | | | | | | | | | Use the method | Joas Schilling | 2015-10-29 | 1 | -7/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add a repair step that checks for group membership on shares | Joas Schilling | 2015-10-29 | 4 | -1/+284 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Remove shares where the parent does not exist anymore | Joas Schilling | 2015-10-29 | 2 | -0/+110 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #20120 from owncloud/sharee-list-view-tests | Thomas Müller | 2015-10-29 | 1 | -0/+158 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | Add sharee list view js tests | ||||
| * | | | | | | | | Add sharee list view js tests | Tom Needham | 2015-10-29 | 1 | -0/+158 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #20126 from owncloud/LukasReschke-patch-1 | Thomas Müller | 2015-10-29 | 1 | -118/+82 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Update certificate bundle | ||||
| * | | | | | | | Fix format | Lukas Reschke | 2015-10-29 | 0 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Update certificate bundle | Lukas Reschke | 2015-10-29 | 1 | -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-invalidpath | Thomas Müller | 2015-10-29 | 3 | -10/+16 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fix file list reload callback result | ||||
| * | | | | | | Fix file list reload callback result | Vincent Petry | 2015-10-27 | 3 | -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 transifex | Jenkins for ownCloud | 2015-10-29 | 140 | -144/+466 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #19758 from owncloud/ext-fallback-getmimetype | Thomas Müller | 2015-10-28 | 3 | -45/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fallback to default mimetype detection mechanism | ||||
| * | | | | | | Fallback to default mimetype detection mechanism | Vincent Petry | 2015-10-13 | 3 | -45/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #19182 from cweiske/support-bzip2 | Thomas Müller | 2015-10-28 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix #19181: Support .bz2 app archives | ||||
| * | | | | | | | Fix #19181: Support .bz2 app archives | Christian Weiske | 2015-10-20 | 2 | -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_users | Thomas Müller | 2015-10-28 | 1 | -6/+11 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Initially load 250 users | ||||
| * | | | | | | | | Initially load at least 250 users | Jörn Friedrich Dreyer | 2015-10-28 | 1 | -6/+11 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #20089 from owncloud/litmus-test-webdav | Thomas Müller | 2015-10-28 | 7 | -0/+327 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Enable DAV app testing on travis |