jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikidata, fix client resource module and css fix
......................................................................
Update Wikidata, fix client resource module and css fix
Change-Id: I4782051682f3c217087bcfcd12a8942bd86cc45d
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
M extensions/Wikibase/lib/resources/wikibase.css
M vendor/composer/installed.json
7 files changed, 85 insertions(+), 84 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index 8779744..3550095 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414066435";
\ No newline at end of file
+$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414423605";
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 987da14..83ef905 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414066435";
\ No newline at end of file
+$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414423605";
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index f70a74f..492ebc4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1205,7 +1205,7 @@
"source": {
"type": "git",
"url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "a903db86a23bdf268adaee0af4a386e49e9bbcae"
+ "reference": "6a55876fb0153ff65686d8a9c9689105256d99f8"
},
"require": {
"data-values/common": "~0.2.0",
@@ -1273,7 +1273,7 @@
"issues": "https://bugzilla.wikimedia.org/";,
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2014-10-22 20:04:23"
+ "time": "2014-10-27 14:12:59"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
b/extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
index f02cc5e..6b5b9e0 100644
--- a/extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
+++ b/extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
@@ -5,7 +5,7 @@
( function( mw, wb ) {
'use strict';
- var MODULE = wb.client;
+ var MODULE = wb;
/**
* @return {mediaWiki.Api}
diff --git
a/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
b/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
index 2219342..e24ef4b 100644
--- a/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
+++ b/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
@@ -31,7 +31,7 @@
$linkItemLink
.show()
.linkitem( {
- mwApiForRepo:
wikibase.client.getMwApiForRepo(),
+ mwApiForRepo:
wikibase.getMwApiForRepo(),
pageTitle: ( new mw.Title(
mw.config.get( 'wgTitle' ),
mw.config.get(
'wgNamespaceNumber' )
diff --git a/extensions/Wikibase/lib/resources/wikibase.css
b/extensions/Wikibase/lib/resources/wikibase.css
index 878b761..d77231a 100644
--- a/extensions/Wikibase/lib/resources/wikibase.css
+++ b/extensions/Wikibase/lib/resources/wikibase.css
@@ -60,6 +60,7 @@
margin-top: 1em;
padding-left: 10px;
border-bottom: none;
+ width: 100%;
}
/* entity container */
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index fd03e40..26b2e71 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1230,84 +1230,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.25wmf5",
- "version_normalized": "dev-wmf/1.25wmf5",
- "source": {
- "type": "git",
- "url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "a903db86a23bdf268adaee0af4a386e49e9bbcae"
- },
- "require": {
- "data-values/common": "~0.2.0",
- "data-values/data-types": "~0.4.0",
- "data-values/data-values": "~0.1.0",
- "data-values/geo": "~1.0.0",
- "data-values/interfaces": "~0.1.4",
- "data-values/javascript": "~0.6.0",
- "data-values/number": "~0.4.0",
- "data-values/serialization": "~1.0",
- "data-values/time": "~0.6.0",
- "data-values/validators": "~0.1.0",
- "data-values/value-view": "~0.7.0",
- "diff/diff": "~1.0",
- "php": ">=5.3.2",
- "wikibase/data-model": "~2.0",
- "wikibase/data-model-javascript": "~0.3.0",
- "wikibase/data-model-serialization": "~1.2",
- "wikibase/easyrdf_lite": "~0.8.1",
- "wikibase/internal-serialization": "~1.3",
- "wikibase/serialization-javascript": "~1.1.1"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.23"
- },
- "time": "2014-10-22 20:04:23",
- "type": "mediawiki-extension",
- "installation-source": "source",
- "autoload": {
- "files": [
- "Wikibase.composer.php"
- ],
- "classmap": [
- "client/includes/",
- "client/WikibaseClient.hooks.php",
- "client/tests/phpunit/",
- "lib/includes/",
- "lib/WikibaseLib.hooks.php",
- "lib/tests/phpunit/",
- "repo/includes/",
- "repo/maintenance/",
- "repo/tests/phpunit/",
- "repo/Wikibase.hooks.php"
- ],
- "psr-4": {
- "Wikibase\\Repo\\View\\": "repo/includes/View"
- }
- },
- "license": [
- "GNU GPL v2+"
- ],
- "authors": [
- {
- "name": "The Wikidata team"
- }
- ],
- "description": "Structured data repository for MediaWiki",
- "homepage": "http://wikiba.se";,
- "keywords": [
- "wikibase",
- "wikibaseclient",
- "wikibaselib",
- "wikibaserepo",
- "wikidata"
- ],
- "support": {
- "issues": "https://bugzilla.wikimedia.org/";,
- "irc": "irc://irc.freenode.net/wikidata"
- }
- },
- {
"name": "wikibase/data-model",
"version": "2.0.2",
"version_normalized": "2.0.2.0",
@@ -1365,5 +1287,83 @@
"wikibase",
"wikidata"
]
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.25wmf5",
+ "version_normalized": "dev-wmf/1.25wmf5",
+ "source": {
+ "type": "git",
+ "url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
+ "reference": "6a55876fb0153ff65686d8a9c9689105256d99f8"
+ },
+ "require": {
+ "data-values/common": "~0.2.0",
+ "data-values/data-types": "~0.4.0",
+ "data-values/data-values": "~0.1.0",
+ "data-values/geo": "~1.0.0",
+ "data-values/interfaces": "~0.1.4",
+ "data-values/javascript": "~0.6.0",
+ "data-values/number": "~0.4.0",
+ "data-values/serialization": "~1.0",
+ "data-values/time": "~0.6.0",
+ "data-values/validators": "~0.1.0",
+ "data-values/value-view": "~0.7.0",
+ "diff/diff": "~1.0",
+ "php": ">=5.3.2",
+ "wikibase/data-model": "~2.0",
+ "wikibase/data-model-javascript": "~0.3.0",
+ "wikibase/data-model-serialization": "~1.2",
+ "wikibase/easyrdf_lite": "~0.8.1",
+ "wikibase/internal-serialization": "~1.3",
+ "wikibase/serialization-javascript": "~1.1.1"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.23"
+ },
+ "time": "2014-10-27 14:12:59",
+ "type": "mediawiki-extension",
+ "installation-source": "source",
+ "autoload": {
+ "files": [
+ "Wikibase.composer.php"
+ ],
+ "classmap": [
+ "client/includes/",
+ "client/WikibaseClient.hooks.php",
+ "client/tests/phpunit/",
+ "lib/includes/",
+ "lib/WikibaseLib.hooks.php",
+ "lib/tests/phpunit/",
+ "repo/includes/",
+ "repo/maintenance/",
+ "repo/tests/phpunit/",
+ "repo/Wikibase.hooks.php"
+ ],
+ "psr-4": {
+ "Wikibase\\Repo\\View\\": "repo/includes/View"
+ }
+ },
+ "license": [
+ "GNU GPL v2+"
+ ],
+ "authors": [
+ {
+ "name": "The Wikidata team"
+ }
+ ],
+ "description": "Structured data repository for MediaWiki",
+ "homepage": "http://wikiba.se";,
+ "keywords": [
+ "wikibase",
+ "wikibaseclient",
+ "wikibaselib",
+ "wikibaserepo",
+ "wikidata"
+ ],
+ "support": {
+ "issues": "https://bugzilla.wikimedia.org/";,
+ "irc": "irc://irc.freenode.net/wikidata"
+ }
}
]
--
To view, visit https://gerrit.wikimedia.org/r/168973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4782051682f3c217087bcfcd12a8942bd86cc45d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf5
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
