Commit graph

2437 commits

Author SHA1 Message Date
jenkins-bot 7f44c242a0 Merge "Fix broken and incomplete PHPDoc tags" 2015-12-14 15:57:57 +00:00
Thiemo Mättig 66d5e17a25 Fix broken and incomplete PHPDoc tags
Change-Id: I0c8928a2dbf67cb15841fae6cc55c363357ec265
2015-12-14 11:03:09 +01:00
Thiemo Mättig 27e1a986da Fix visibility of setUp methods in tests
Change-Id: Ib1c425b9934a8325a4338f160aafcf17216aa250
2015-12-14 11:02:34 +01:00
Translation updater bot edb8320d7e Localisation updates from https://translatewiki.net.
Change-Id: Ia9bc78e94fc735e2f7077da0f6bad2b8182ed9cc
2015-12-13 22:17:21 +01:00
jenkins-bot 2603f1c30a Merge "Update grunt-jsonlint to 1.0.6" 2015-12-12 01:37:10 +00:00
Translation updater bot 45425782dd Localisation updates from https://translatewiki.net.
Change-Id: I8d302b17c697e57051f4351df485f646649addda
2015-12-11 23:49:15 +01:00
Kunal Mehta cfdc6cb3d0 Unbreak notformat=text|html in the API
Just pass any unknown formats through.

Change-Id: I156b49a959b5453cd37cd4c3d58652b5420132f3
2015-12-10 15:23:57 -08:00
Translation updater bot 4a2c663867 Localisation updates from https://translatewiki.net.
Change-Id: I67ba3992e6dfee892a48973d3e2f00ca3ae7dfcc
2015-12-10 22:53:35 +01:00
jenkins-bot b8bd7c80a8 Merge "Add support for cross-wiki notifications to Schema:EchoInteraction" 2015-12-10 19:27:30 +00:00
jenkins-bot ade37b5925 Merge "Share code between EchoNotificationMapper::fetchByUser & fetchUnreadByUser" 2015-12-10 19:16:17 +00:00
Kunal Mehta 479d7a2dd9 Add support for cross-wiki notifications to Schema:EchoInteraction
Adds support in the logger code that is unused for now.

Note that I9bf6f4bcd41d8da5 must be deployed before this can be used on
Wikimedia sites.

Bug: T120158
Change-Id: I1968f36e21139975d25231ac25c22a73dea6fd0d
2015-12-10 10:07:20 -08:00
Matthias Mullie 2a1abc0281 Share code between EchoNotificationMapper::fetchByUser & fetchUnreadByUser
The only difference at this point is that fetchByUser initializes
the EchoNotification object with $targetPages. It doesn't really
matter that it doesn't have the target pages, since fetchUnreadByUser
is currently only used in the flyout, where those target pages aren't
used. But regardless of what method was used to fetch the data, I
think the data should be the same.

And now, there's less code duplication...

Change-Id: I04c7b98794af5427a2217dd337108e7eea1e65c5
2015-12-10 17:19:46 +01:00
jenkins-bot fd8c15de1b Merge "Bump Schema:Echo to oldid=7731316" 2015-12-10 04:52:08 +00:00
Paladox eed93d18b9 Update grunt-jsonlint to 1.0.6
Change-Id: I14701a8168e98c3a10a1269324222ebc9772e328
2015-12-09 21:50:29 +00:00
Translation updater bot bae87f21f2 Localisation updates from https://translatewiki.net.
Change-Id: I0ce4be67bdfc3e345a7fe12e8d9e3eceb0ec65f5
2015-12-09 21:40:46 +01:00
Stephane Bisson 04d4da2783 Presentation model for edit-user-talk
Bug: T116843
Change-Id: Ia11f5b57747ed0be5d4b00c75925d5fcdde87c43
2015-12-09 13:35:10 -05:00
jenkins-bot 47fd3b5896 Merge "Presentation model for page-linked" 2015-12-09 18:02:15 +00:00
Kunal Mehta 7e72ac4dac Bump Schema:Echo to oldid=7731316
This adds "other" to the notificationGroup enum. This was already bumped
in wmf-config, but not in the extension itself.

Change-Id: If67754cfc40c004cebbf93d8b0e7d221d6620e61
2015-12-08 23:02:09 -08:00
jenkins-bot 84fb2e5a83 Merge "Use CentralIdLookup instead of hardcoding for CentralAuth" 2015-12-09 01:09:46 +00:00
Kunal Mehta 999c53a1c3 Use CentralIdLookup instead of hardcoding for CentralAuth
Change-Id: I5b2d23588ab6b026d1a2100b9c16a74e9aefbd73
2015-12-08 16:54:23 -08:00
Translation updater bot 02ec5fe213 Localisation updates from https://translatewiki.net.
Change-Id: I6c6dd3b4e4640fe91fa310e3de04f73875ce45bf
2015-12-08 22:22:27 +01:00
mhutti1 ea64fe4770 Redirect anonymous user to login page from Special:Notifications
Added code to redirect the user and display a short message informing
them of the need to login.

Bug: T118873
Change-Id: I2145bc1502dbd19d660302d9f19e0d4a2ad5ad50
2015-12-08 11:55:15 -08:00
Stephane Bisson a9f307ceab Presentation model for page-linked
Bug: T116843
Change-Id: Id9894b98a0dd7554a529ff763aaf0f719e36152b
2015-12-08 14:02:19 -05:00
jenkins-bot 7898576e88 Merge "Follow-up 65638384: update calls to normalizer functions" 2015-12-08 01:43:02 +00:00
Roan Kattouw ece6e3f80a Follow-up 65638384: update calls to normalizer functions
Change-Id: Id6352b133e88827047dac85423b6914b83e71909
2015-12-07 16:49:24 -08:00
Translation updater bot dc631c2c30 Localisation updates from https://translatewiki.net.
Change-Id: Ib4970b553112e0bc472c17a9fa5213ca294869b5
2015-12-07 23:12:54 +01:00
matejsuchanek c4b41a3f60 Add Czech alias of Special:Notifications
Change-Id: I63ae5316d4493798907ef995b091feb2e304c453
2015-12-07 17:21:16 +01:00
Translation updater bot 0e72980c55 Localisation updates from https://translatewiki.net.
Change-Id: I1b027cdb662e93abb9822d59446425841460260c
2015-12-06 21:43:04 +01:00
Translation updater bot f225059d5f Localisation updates from https://translatewiki.net.
Change-Id: I9422137fb1430fd4fdfc05cdc741cdc36356af14
2015-12-05 23:10:19 +01:00
Stephane Bisson e0cf7ea74c Balance brackets in en.json
The problem was introduced by I1cd7caa7bfe811bab89a0c6950c1aeaf1739aac6

Change-Id: I81def611127f0f438764f8aea19e7f2d5c47d969
2015-12-05 11:57:32 -05:00
Stephane Bisson 14b842bd34 Add gender support for the viewing user for mention notification
Bug: T119321
Change-Id: I1cd7caa7bfe811bab89a0c6950c1aeaf1739aac6
2015-12-04 16:53:11 -05:00
Stephane Bisson 65638384fc Normalize links in Special:Notifications formatter
Change-Id: I35354a3b27a59ee9740c6330bb3df22a8f7d6093
2015-12-03 11:11:15 -05:00
jenkins-bot b813835907 Merge "Allow grouping for getBundleCount()" 2015-12-02 21:56:04 +00:00
Translation updater bot 993a221bff Localisation updates from https://translatewiki.net.
Change-Id: I8da2bdf15e3d8ec29eec8c9b5f6fab0e6ebda526
2015-12-02 21:55:22 +01:00
Roan Kattouw 52f4b91204 Allow grouping for getBundleCount()
Presentation models that display the number of bundled notifications
typically group these by a property like agent or page ID. For example,
every edit someone makes to a user talk page generates an event,
so there could be 5 edit-user-talk events by only 2 distinct users;
in that case we want to display "Foo and 1 other user left a message",
not "Foo and 4 other users".

With this change, a presentation model that wants such behavior
can pass a callback to getBundleCount() that retursn the user ID, which
will cause getBundleCount() to return the number of distinct
users rather than the total number of notifications.

Change-Id: I79c8dd14277eff0d2ec27f155b1d13dca1e571a8
2015-12-02 08:16:19 -08:00
Translation updater bot ac316bdb47 Localisation updates from https://translatewiki.net.
Change-Id: Ia84b43f60fcc9edb046aae3de736cca9a57f5714
2015-12-01 21:32:53 +01:00
jenkins-bot 434a034120 Merge "Special:Notifications formatter" 2015-11-30 21:30:05 +00:00
Translation updater bot 948a73db24 Localisation updates from https://translatewiki.net.
Change-Id: I7fa863505528c440a66431972d4c8432d61a3667
2015-11-30 21:33:34 +01:00
jenkins-bot 7dc40bc160 Merge "Get bundled notifications count" 2015-11-30 20:12:38 +00:00
Translation updater bot f9ae56803b Localisation updates from https://translatewiki.net.
Change-Id: I6813e6317091afed8869bba04892790be92e465a
2015-11-28 21:44:21 +01:00
Stephane Bisson 259effc235 Get bundled notifications count
Utility functions to get the count of bundled notifications
for display and plural purposes.

Change-Id: I74d5ad244dec337a94e59c2118c33e474cd76797
2015-11-27 14:28:35 -05:00
Translation updater bot f4d42418ab Localisation updates from https://translatewiki.net.
Change-Id: I3435f92748712fe7b2c6d4f29a2468d3e0be6f1d
2015-11-26 22:00:10 +01:00
jenkins-bot a8171d1f75 Merge "EventPresentationModel: Cache the result of getBundledEvents()" 2015-11-25 18:39:01 +00:00
Roan Kattouw 104075d2d4 EventPresentationModel: Cache the result of getBundledEvents()
Change-Id: I83ce3b7754055dd494fcde41f043144294da2f3f
2015-11-25 10:33:47 -08:00
Kunal Mehta 2892108b65 Special:Notifications formatter
I'm not really sure where to stick the primary link. I could wrap the
entire notification in a <a> tag, but all the text becomes ugly (I
suppose we could hack around it with CSS?). For now I just added it
before all the secondary links.

Change-Id: I4f6add9ecfb367660d1a6346825382ad415bdb77
2015-11-25 10:22:04 -08:00
Roan Kattouw 23734e3539 Follow-up b85f978ddd: don't check for the non-existent CentralAuth class
Change-Id: Ie7ca022c659f9856641aaec6183eadf8a86865a2
2015-11-24 19:34:27 -08:00
Translation updater bot 1641275d50 Localisation updates from https://translatewiki.net.
Change-Id: I6242d71101507bc41489e415371d5c6e8e21a7e7
2015-11-24 23:08:01 +01:00
jenkins-bot 046537f6b4 Merge "Add a global overlay to Echo" 2015-11-24 18:54:18 +00:00
jenkins-bot cdee3093b3 Merge "Add secondary link details: icon & description" 2015-11-24 18:54:15 +00:00
Kunal Mehta 5be28ba4df Require a User object to be passed to EchoEvent::userCan()
All callers were already doing this.

Change-Id: If9e20e3d4740bcdb8842592e4cd988f8b35e1300
2015-11-23 16:08:17 -08:00