Diffusion extension-CentralNotice 00c45d33e633

Merge remote-tracking branch 'origin/master' into HEAD
00c45d33e633
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
i18n/bg.json
i18n/ce.json
i18n/el.json
i18n/es.json
i18n/pl.json
i18n/tr.json
modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js

Change-Id: I2d05ab71687121cf5daa1b97203c610784199775

Details

Provenance

Authored on

Parents

rECNObe8758dca7dc: Localisation updates from https://translatewiki.net.
rECNO4ae59ab23b5e: Localisation updates from https://translatewiki.net.

Branches

Unknown

Tags

Unknown

ChangeId

I2d05ab71687121cf5daa1b97203c610784199775

Event Timeline

awight committed rECNO00c45d33e633: Merge remote-tracking branch 'origin/master' into HEAD (authored by awight).Aug 25 2014, 9:14 PM

Merged Changes

be8758dca7dc Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
dc89c28e6f5c Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
7b8f980162f1 Merge "Fix a typo in code that handles an old db schema"
Author
Ejegg
Browse Repository
No Audits
bf49a8773c52 Merge "Add dates to banner-hiding cookies (server side)"
Author
Ejegg
Browse Repository
No Audits
de452f808068 Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
be42ea474114 Merge "Localisation updates from https://translatewiki.net."
Author
Translation updater bot
Browse Repository
No Audits
7cb8e468ae1d Merge "Use public instead of var in classes"
Author
jenkins-bot
Browse Repository
No Audits
e8cd2c421274 Use public instead of var in classes
Author
Addshore
Browse Repository
No Audits
0548045d307d Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
a87e8063b993 Fix @returns >> @return phpdoc
Author
Addshore
Browse Repository
No Audits
4a766e262663 Merge "Use correct field names with addExtensionUpdate"
Author
awight
Browse Repository
No Audits
8f437b1f916c Use correct field names with addExtensionUpdate
Author
EBernhardson
Browse Repository
No Audits
0c519a656eec Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
832f60bb8435 Add dates to banner-hiding cookies (server side)
Author
Ejegg
Browse Repository
No Audits
a4ded64f6eb1 Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
2a15394f8e11 Fix a typo in code that handles an old db schema
Author
AndyRussG
Browse Repository
No Audits
ebb46dca9635 Merge "Add comments on changes, for logs and revisions"
Author
jenkins-bot
Browse Repository
No Audits
5c5597863bce Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
0ea4befef323 Add comments on changes, for logs and revisions
Author
AndyRussG
Browse Repository
No Audits
7523784f6aed Merge "Schema change for comments on changes for logs"
Author
jenkins-bot
Browse Repository
No Audits
baa15db00aae Schema change for comments on changes for logs
Author
AndyRussG
Browse Repository
No Audits
36f2bd1c487a Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
989ce9c7e7d0 Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
3f1a3bb33cba Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
9715c018ca6a Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
19c2d43c9b34 Merge "Fix banner name filter and put it in URLs"
Author
jenkins-bot
Browse Repository
No Audits
ab7534eceb2e Fix banner name filter and put it in URLs
Author
AndyRussG
Browse Repository
No Audits
350de7f3c61d Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
78f46af3e95a Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
3ed3a37d0f57 Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
4a8b35ceff04 Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits
93ea147192d2 Localisation updates from https://translatewiki.net.
Author
Translation updater bot
Browse Repository
No Audits

Changes (36)

Path

Size

CentralNotice.sql

CentralNoticeBannerLogPager.php

CentralNoticeCampaignLogPager.php

CentralNoticePageLogPager.php

i18n/

includes/

BannerMessage.php

CampaignLog.php

modules/

ext.centralNotice.adminUi.bannerEditor/

bannereditor.css

bannereditor.js

ext.centralNotice.adminUi.bannerManager/

bannermanager.css

bannermanager.js

ext.centralNotice.adminUi/

adminui.common.css

centralnotice.css

patches/

CNDatabasePatcher.php

patch-notice-logging-comments.sql

patch-template-logging-comments.sql

special/

SpecialCentralNotice.php

SpecialCentralNoticeBanners.php

rECNO00c45d33e633

CentralNotice.sql

Loading...

CentralNoticeBannerLogPager.php

Loading...

CentralNoticeCampaignLogPager.php

Loading...

CentralNoticePageLogPager.php

Loading...

i18n/bcl.json

Loading...

i18n/bg.json

Loading...

i18n/br.json

Loading...

i18n/ce.json

Loading...

i18n/el.json

Loading...

i18n/en.json

Loading...

i18n/es.json

Loading...

i18n/et.json

Loading...

i18n/it.json

Loading...

i18n/lrc.json

Loading...

i18n/nap.json

Loading...

i18n/nl.json

Loading...

i18n/pl.json

Loading...

i18n/si.json

Loading...

i18n/sl.json

Loading...

i18n/tr.json

Loading...

i18n/yi.json

Loading...

includes/Banner.php

Loading...

includes/BannerMessage.php

Loading...

includes/Campaign.php

Loading...

includes/CampaignLog.php

Loading...

modules/ext.centralNotice.adminUi.bannerEditor/bannereditor.css

Loading...

modules/ext.centralNotice.adminUi.bannerEditor/bannereditor.js

Loading...

modules/ext.centralNotice.adminUi.bannerManager/bannermanager.css

Loading...

modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js

Loading...

modules/ext.centralNotice.adminUi/adminui.common.css

Loading...

modules/ext.centralNotice.adminUi/centralnotice.css

Loading...

patches/CNDatabasePatcher.php

Loading...

patches/patch-notice-logging-comments.sql

Loading...

patches/patch-template-logging-comments.sql

Loading...

special/SpecialCentralNotice.php

Loading...

special/SpecialCentralNoticeBanners.php

Loading...