bsitu ad691fb838 Use array_merge_resursive when merging based on array keys ... When two array have the same keys, we want to merge them into one array rather than one overwriting another one This was preventing count and rawcount from appearing inside the messages and alerts object returned by the API. Change-Id: I989b9b0994a33925faf52c6d99d8c46920e62cd6		2014-08-13 00:42:07 +00:00
..
api	Use array_merge_resursive when merging based on array keys	2014-08-13 00:42:07 +00:00
browser	QA: Add browser test for sign up notifications	2014-08-07 14:47:41 -07:00
externals	Add ability to run QUnit tests	2014-08-01 15:55:22 -07:00
includes	Add support for splitting notifications into alert & message	2014-08-05 14:50:54 -07:00
qunit/overlay	Hygiene: Split buildOverlay into smaller functions	2014-08-06 20:28:55 +00:00
BatchRowUpdateTest.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
bootstrap.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
ContainmentSetTest.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
DiffParserTest.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
DiscussionParserTest.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
echo.suite.xml	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
EmailFormatterTest.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
NotificationControllerTest.php	Generalize a couple implementations of EchoGetDefaultNotifiedUsers	2014-08-01 12:31:53 -07:00
NotificationFormatterTest.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
NotifUserTest.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
SupressionMaintenanceTest.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
TalkPageFunctionalTest.php	Directory reshuffle, add dev tools	2014-08-01 22:38:41 +00:00
UserLocatorTest.php	Convert existing notifications to use user-locators	2014-08-04 11:16:34 -07:00