Squashed commit of the following:

commit 619b95d75bfe4712613ade400de066efb07c90f3
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Fri Feb 22 12:39:39 2013 +0100

    bugid-95783 | S:MTb Slider - bold on slide name

commit 63c88ef4bdf6c8c49e1ff1abc396dc454e0b38ee
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Fri Feb 22 15:15:09 2013 +0100

    bugid-98052 | S:MTb removed previev button

commit 9e45518c0a6f18138c89c9b71072164633f9a268
Author: Kamil Koterba <kamil@wikia-inc.com>
Date:   Mon Feb 25 07:57:27 2013 +0000

    BugId:43986 fix for failed test WikiaHomePageTest

commit 3ba9db321a1a08b59f0187db17d46d279d163187
Author: liz <liz@wikia-inc.com>
Date:   Thu Feb 21 00:55:11 2013 +0000

    bugid:95941 making sure the video play button shows up in monobook

commit 7ca02ab86aa13fbecc24c40801fc93811ffdbfb4
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Fri Feb 22 13:39:26 2013 +0100

    bugid-98052 | Hubs V2 check user permision for see future dates [first round]

commit fb02ec0ad73031289af57887f9f42f915ac742c0
Author: Lukasz Konieczny <lukaszk@wikia-inc.com>
Date:   Thu Feb 21 11:47:53 2013 +0000

    BugId-98049: Added test for validation modules and preparing footer data

commit 0e695c02ffdfa9afe7433e35dc6fcba4ad49e8c2
Author: Hyun Lim <hyun@wikia-inc.com>
Date:   Fri Feb 15 01:30:33 2013 +0000

    bugId::96192 Checking in qqq message

commit 2c0257f06168112027bab62a9a65719b48483b73
Author: Kamil Koterba <kamil@wikia-inc.com>
Date:   Thu Feb 21 19:50:19 2013 +0000

    BugId:43986 Changed getWikiEditCount function name to getEditCountWiki

commit bc817152b9f89846ab0ee6b399e2b5720931ce13
Author: Hyun Lim <hyun@wikia-inc.com>
Date:   Fri Feb 15 02:12:59 2013 +0000

    bugId::96192 Removed useless code

commit 9c3eb528445226b109eaed0afb3307900cc859cd
Author: Hyun Lim <hyun@wikia-inc.com>
Date:   Fri Feb 15 02:06:28 2013 +0000

    bugId::96192 Changed video removal handler to reload the page

commit ec6112d5cb5bd259061a214f8b15667e856a5721
Author: nAndy <nandy@wikia-inc.com>
Date:   Fri Feb 22 10:47:45 2013 +0000

    added login-button class in user login dropdown template

commit 98b340a90515e09140fdbef6068c7154457dad43
Author: nAndy <nandy@wikia-inc.com>
Date:   Tue Feb 19 09:50:07 2013 +0000

    fix for two email sent after clicking "Forgot you password?" in login dropdown

commit 79c1733afd00971292b466cf84522bae3bf21822
Author: Lukasz Konieczny <lukaszk@wikia-inc.com>
Date:   Fri Feb 22 13:55:38 2013 +0000

    BugId-97921: Show modal for uploading a video after logged in

commit 1bbc16ea96c5d9760573872e328a56432c79cbd4
Author: sebastian-wikia <sebastianm@wikia-inc.com>
Date:   Tue Feb 19 23:48:12 2013 +0000

    Naming changes and small bugfixes

commit d62923bb9d9dd58473c89f35c13ddf750c4bc630
Merge: a7ad204 ec454d8
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Fri Apr 12 10:16:42 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit a7ad2040a344b6bfd3ad5fdd7585e094f698a55b
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 20 15:20:50 2013 +0100

    bugid-98045 | S:MTb wikia's pick structured data

commit d2585e1840c37f5b5460a05e16d7a747ee5e4791
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Fri Feb 22 16:54:45 2013 +0100

    bugid-95783 | S:MTb Slider - fixed unit tests

commit 24c23a54eb7fabe3ad0410489daedb32e23f0b58
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Thu Apr 11 17:50:58 2013 +0200

    sync with dev

commit 7e9fca047d8698a7de0c620ffa55d026a50ef312
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Thu Feb 21 10:15:37 2013 +0100

    bugid-98052 | Hubs V2 way to render hub from selected day

commit 3f712bdc1b74bf58068f75457348171fe70152a1
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Thu Apr 11 17:42:20 2013 +0200

    fix for bad merge

commit 1ae6b863f8ceee36ae02517edeb7b8c51bb7263b
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Fri Feb 22 11:52:32 2013 +0000

    bugid-98052 | Hubs V2 Hook model [changes]

commit 7e78c9ac75b8353e0a3af1834cb8718793b8b843
Author: saipetch <saipetch@wikia-inc.com>
Date:   Thu Feb 14 13:09:59 2013 -0800

    Video (bugid 95954): update functions and template for removing/unremoving video on file page

commit 41aec719857e6cad34d1164d463e616cc8818140
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Tue Feb 26 15:46:25 2013 +0100

    bugid-96419 | S:MTb added message on publish hub

commit cfedbcfedd6ac510181af5c93f53cc91ba8b2a9b
Author: nAndy <nandy@wikia-inc.com>
Date:   Fri Feb 22 16:03:36 2013 +0000

    added new message and new field in fields declaration of Wikia's picks module in SMTb

commit d8dc42731c7e1015fda270fe953957691b9a43e1
Author: Kamil Koterba <kamil@wikia-inc.com>
Date:   Mon Feb 11 16:41:45 2013 +0000

    BugId:43986 add create wikia_user_properties table to create new wiki

commit 3003e4651c553253051e25454196466b8d68fc80
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Mon Feb 25 18:23:49 2013 +0100

    bugid-98117 | S:CNW fixed accented characters [added loading AMD module before DOM ready]

commit ad1502fa9b81516f2b0a74f1a40f3db7adb69985
Author: Hyun Lim <hyun@wikia-inc.com>
Date:   Fri Feb 22 23:14:02 2013 +0000

    bugId::98201 Fixed error for file protection, and fixed error message handling

commit 0935bb5ee8b871c4576b37b7f8541b9ec2d41e05
Author: Federico 'Lox' Lucignano <federico@wikia-inc.com>
Date:   Mon Feb 25 13:10:13 2013 +0100

    Fix for BugId:98262

commit 7e78a926b521e632c507e8d40901b109b7cf59c3
Author: Jakub Olek <jolek@wikia-inc.com>
Date:   Mon Feb 25 13:54:29 2013 +0100

    WikiaMobile: Media Gallery: Update dots when opening gallery

commit a50a828826843063f47940db87635902ffc7809f
Author: Jakub Olek <jolek@wikia-inc.com>
Date:   Mon Feb 25 14:00:23 2013 +0100

    WikiaMobile: Media Gallery: Check if dots exists before updating them

commit 9026380a4485897ed03bc973a0ec87aa36755ffc
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Mon Feb 25 16:16:42 2013 +0100

    bugid-96419 | Hubs V2 added new date format to handle in URL

commit 46e573abeeed3e04c9c56eaeb5edb54e1525a39a
Author: Jakub Olek <jolek@wikia-inc.com>
Date:   Mon Feb 25 16:32:05 2013 +0100

    Give more time to browsers to fetch images

commit e777f7affe10ab82bad85f0e61c343128fef9444
Author: Jakub Olek <jolek@wikia-inc.com>
Date:   Tue Feb 26 16:47:12 2013 +0100

    WikiaMobile: Gallery: Fixes for resizing video in modal

commit 6b19c1d646259bf1942875d9b425c59daa04fab8
Author: nAndy <nandy@wikia-inc.com>
Date:   Fri Feb 22 12:15:10 2013 +0000

    added urldecode in case the url was copied from address bar and has mb characters in example: Andrzej_%C5%81ukaszewski

commit 8b91bb1ead237547be91395963cb3644805e552b
Author: sebastian-wikia <sebastianm@wikia-inc.com>
Date:   Tue Feb 19 23:21:46 2013 +0000

    Removing dependency on Related Videos from HubsV2 and Marketing Toolbox

commit c01a99554d953a613e3b4f281aa0217c7744f649
Author: Marcin Maciejewski <marcin@wikia-inc.com>
Date:   Wed Feb 20 13:17:21 2013 +0000

    bugid-97699: UserLogin: Error message styling change for remember password functionality

commit bd648233b611c6c028f04c52f457fe28f317f306
Author: Jakub Olek <jolek@wikia-inc.com>
Date:   Mon Feb 25 16:35:06 2013 +0100

    WikiaMobile: pager - Don't touch elements that don't need that

commit ab79360e6174a2f54d8149a9d148eff1cddaf489
Merge: d68ec17 dad6197
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Thu Apr 11 15:51:10 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit d68ec17930782b125450f0b10b0eae9690bd9475
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Fri Feb 22 16:30:07 2013 +0100

    bugid-98097 | S:MTb Slider - added new field

commit 7fbad9c3d87cb1c7529f7612d338d7bc0e529ac9
Author: macbre <maciej.brencz@gmail.com>
Date:   Mon Feb 25 18:14:43 2013 +0100

    SharedHelp: fix for too long memcache keys

commit 374c78765de1f69c4b829d4a99f3babb92c7176c
Author: liz <liz@wikia-inc.com>
Date:   Thu Feb 21 19:47:43 2013 +0000

    bugid:97797 commenting out autocomplete feature for now

commit 7c9c66609103792a524827715a2aac24d12927f1
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Mon Feb 25 17:29:49 2013 -0800

    (BugId:95221) Reduce min-height of editor from 500px to 300px.

commit 51142470aedca31e9fc5d4a9533d3d0abe4048be
Author: Owen Davis <owen@wikia-inc.com>
Date:   Tue Feb 19 16:36:03 2013 -0800

    fix warning on staff/internal from FogbugzTag ext

commit 3c75495aa1d8dd44f50030f75b97a0b20589f2cc
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Thu Apr 11 14:44:44 2013 +0200

    sync with dev

commit 766c1b5fd6fe2220636f9be32c715bc811f31448
Author: liz <liz@wikia-inc.com>
Date:   Fri Feb 15 21:28:41 2013 +0000

    updating i18n message

commit a72f0d53ec102149c64cfc822ce3e316054d0da3
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 21 15:41:45 2013 +0100

    ResourceLoader: add ResourceLoaderModifyMaxAge hook

commit c06f42ae444cdd93efa7a3fae2ddb5f51fa5bce6
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 21 17:55:28 2013 +0100

    Bind to ResourceLoaderModifyMaxAge hook and modify TTL when needed

commit 370d75343ea882a9794c72410600578a4dc5ab51
Author: Kamil Koterba <kamil@wikia-inc.com>
Date:   Thu Feb 21 17:53:16 2013 +0000

    BugId:43986 moving getEditCount to UserStatsService class

commit 799d387e8255039c61b6320fd5b21181607db147
Author: Timothy Quievryn <timq@wikia-inc.com>
Date:   Wed Feb 20 14:15:31 2013 +0000

    Fix for BugID:98092

commit adc1761dbc848e77ed8356b0e252fd28bab14136
Author: Timothy Quievryn <timq@wikia-inc.com>
Date:   Wed Feb 20 20:00:00 2013 +0000

    Fix for bugid 97701

commit 596bfdc559b9c83a2819b72e439d7cc97fa8513a
Author: Adam Robak <adamr@wikia-inc.com>
Date:   Thu Jan 10 12:55:18 2013 +0100

    BugId: 93359 -- list-style set to none for table of content (wall & forum)

commit 9dc199fa513d286bccd9c05d9af67028f78307c4
Author: Adam Robak <adamr@wikia-inc.com>
Date:   Mon Feb 25 15:39:21 2013 +0100

    added width for file input and text file instead of size attribute

commit 956a14c9c2349f6177093a9a548064ed78a2349f
Author: Geoff Papilion <geoffp@wikia-inc.com>
Date:   Fri Feb 22 13:09:15 2013 -0800

    ignoring build dir

commit fb023e5a4280b753005877a636bdd966061367b8
Author: sovq <sovq@Wikia-inc.com>
Date:   Mon Feb 25 13:38:56 2013 +0100

    message typo

commit 9557cd614f3a9bd6d58545230139348b98d350d2
Author: sovq <sovq@Wikia-inc.com>
Date:   Mon Feb 25 13:13:55 2013 +0100

    bugid-98311-replacing hardcoded message with key

commit e54614f212f64b1c932bf226ab37a2226494f92c
Author: liz <liz@wikia-inc.com>
Date:   Wed Feb 20 00:04:32 2013 +0000

    bugid:97570 fixing fatal in placeholder href

commit 0693d854d96d602c1d0b70bd47f581a83b548691
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Tue Feb 19 17:58:53 2013 +0100

    bugid-97991 | Fixed founder emails [2nd time]

commit 0aab47411f900b70c80a9745bd4d02bfff0cb8dd
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Fri Feb 15 17:55:09 2013 -0800

    We don't need to pass category data to JavaScript on edit pages anymore.

commit 62d5b3552ad46274c8a64d37871f766c7b3b5b2f
Merge: 84a351c 5dfcb83
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Thu Apr 11 11:43:48 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit 84a351c5674d944100b35540b8bbaae0204f11bc
Author: grunny <grunny@wikia-inc.com>
Date:   Fri Feb 22 02:18:24 2013 +1000

    (BugID: 97893) Clearing "disabled" does not undisable

commit 683673642880cbcb4d42de466625fa72810a8411
Merge: a8dd119 0b9f610
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Apr 10 16:42:14 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit a8dd1190f76dd97d92feb86a353a4eae6ec0e867
Merge: 2b2a32b 880b471
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Apr 10 10:40:29 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit 2b2a32b8ad2fb41f82799dbc428ea1dd2c3d0760
Author: Jakub Olek <jolek@wikia-inc.com>
Date:   Mon Mar 25 12:50:06 2013 +0100

    Add js integration tests to jenkins

commit 8d51c80216d240bd890cae49efde3ecee53eba46
Author: Kamil Koterba <kamil@wikia-inc.com>
Date:   Fri Feb 22 14:51:07 2013 +0000

    Revert "BugId:43986 Refactoring GetStats to use getEditCountWiki"

    This reverts commit 02786e9a18f860fcb8be6dab5e0f96a7ec5adf09.

    This change will be a part of seperate pull request.

    Conflicts:
    	includes/wikia/services/UserStatsService.class.php

commit 92a027c965de419a6da37900f3bd5e2ebbc6c445
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Thu Feb 21 14:09:58 2013 +0100

    bugid-98051 | S:MTb - js interactions for publish

commit 5842e002cb8d93add2c728ce5c315f4354a08ccc
Author: Lukasz Konieczny <lukaszk@wikia-inc.com>
Date:   Thu Mar 7 15:19:09 2013 +0000

    BugId-98998: Module Service for Hub Pages (not finished)

commit c7f984887225c10ba73aa5b1dd81f7ed540a5bf1
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Wed Feb 27 13:00:12 2013 -0800

    CategorySelect: wfMessage update

commit 773ac895bc8a3cf9c1d70ddb2ce73724e44bf9f5
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Tue Feb 19 14:40:04 2013 -0800

    Hide hidden categories based on user preferences.

commit 2dcbb0d4a8e0dfad9eea77983a8bf2ca26afcfa8
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Tue Feb 19 15:06:54 2013 -0800

    (BugId:97932) - Add some top padding to prevent bumping into stuff above.

commit 0889edc2e1e444a420ed661f2dd6648f681be96b
Author: Hyun Lim <hyun@wikia-inc.com>
Date:   Fri Feb 15 01:27:58 2013 +0000

    bugId::96192 Added UI for removing videos on Special Videos page

commit 2109c7e72f4a950f4617bd68e175a088c9d7efcc
Merge: 076b332 add6a43
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Apr 9 10:18:47 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit 076b3320eb9efc9817f9ced92750ef4a6ccc2cab
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 20 12:38:36 2013 +0000

    bugid-98041 | S:MTb Slider get wikitext

commit 5aa04288ec88254e6ad8f62a79176baca05ec78f
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 20 11:48:03 2013 +0000

    added mocked data not to block work on template for slider; added new template for slider and returned its content in SpecialWikiaHubsV2_index.php template instead of renderView()

commit 118ce412b7e8d0b6a57c481696e42e2e3522b05b
Author: nAndy <nandy@wikia-inc.com>
Date:   Fri Feb 22 16:08:04 2013 +0000

    fixed unit tests

    Conflicts:
    	extensions/wikia/WikiaHubsServices/tests/modules/MarketingToolboxModuleWikiaspicksServiceTest.php

commit d7e2517825f26e3cbb057d4dbcb2b88815b2fa56
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Mon Apr 8 17:16:15 2013 +0200

    sync with dev

commit ea49bfb7cb2b3f78ee4b6ea70fdbe06843faeef4
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Mon Apr 8 17:15:28 2013 +0200

    sync with dev

commit 45bc9e44b241f4b7e06869094e0e59868d9c0cbe
Author: Kamil Koterba <kamil@wikia-inc.com>
Date:   Mon Feb 25 16:32:35 2013 +0000

    BugId:97360 Script for moving Webinars pages to file pages

commit 49f2953861d3e6d8080dcd71c0d498b32eb2be19
Author: Kamil Koterba <kamil@wikia-inc.com>
Date:   Mon Feb 11 16:39:42 2013 +0000

    BugId:43986 sql code for creating wikia_user_properties table

commit 55ba11ab2ed30dd949f02edf739fd24e94a225bd
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Fri Feb 22 12:13:10 2013 +0100

    bugid-98052 | Hubs V2 moved some methods from hook class into model

commit 97101d567a0fd8c14665ef55ac36b0dc473d9c2e
Author: sebastian-wikia <sebastianm@wikia-inc.com>
Date:   Thu Feb 14 23:05:09 2013 +0000

    WAM Api proposal
    Semi-final
    Added additional field to query on.
    Updated documentation.
    Streamlined callback definition in WikiService

commit a65b6fdbfac0cde27f0227967b2f99d3764f656b
Author: Geoff Papilion <geoffp@wikia-inc.com>
Date:   Fri Feb 22 13:07:53 2013 -0800

    adding build test script

commit add6a432ee42d3c7f2c4cf82f2220abb884c241f
Merge: cf4cf7a 04df787
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Mon Apr 8 13:07:48 2013 +0200

    Merge branch 'phalanx-redoux' into dev

commit 04df787a2aac03f3dbdd34312635094947843a11
Merge: 3b627c7 12b6ad9
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Mon Apr 8 09:41:25 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit 3b627c7e14a2334fc0afc10db650647850bc1f49
Merge: ebaefe7 301d0db
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Fri Apr 5 10:11:57 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit ebaefe7cb0977d30003bcf7751852e55c9d43aeb
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Apr 4 14:32:03 2013 +0200

    BAC-155: Migrate JS unit tests to the new framework

commit 6bedb2c2da3a74f572d84ec8d076bbf2c148dfc5
Merge: ac5d25f 5a3bca4
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Thu Apr 4 09:53:46 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit ac5d25fb27a5404732e31b9dbaa5bfdf58a5a826
Merge: e3b9872 c263634
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Apr 3 17:41:09 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit e3b9872313a5a5f557f3d16ade7608b84715c9df
Merge: 78cdb9f 89ac6f0
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Apr 3 10:09:36 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit 78cdb9f74a16af79321bc69cc0a2c9a6a77cea2d
Merge: 961423f a6a8886
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Apr 2 17:22:39 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit 961423f265997ba10ac578b700f3202aff6260cb
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Apr 2 16:54:06 2013 +0200

    BAC-155: Migrate JS unit tests to the new framework

commit 15588a1470d7317328a0230bd937f68c4499d521
Merge: 5b700ba 3709582
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Apr 2 12:18:17 2013 +0200

    Merge branch 'dev' into phalanx-redoux

commit 5b700ba91076da077a6526f0b4c8624c07790412
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Mar 28 17:05:55 2013 +0100

    BAC-137: PhalanxII: Can't edit existing block

commit aa8c97923867f7701101169f7233883c4eb7cd62
Merge: 35bc5a5 3bffbce
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Mar 27 16:30:37 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 35bc5a546f2ed3148a62e574ea01e7d43e194be7
Author: moliwikia <moli@wikia-inc.com>
Date:   Wed Mar 27 14:53:05 2013 +0000

    replace Phalanx class with hook (BAC-134)

commit 48b0d940b86f663bca770dbb731788cc173cd3c9
Merge: bd8771b 865ed06
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Mar 27 10:27:03 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit bd8771b522ff419eb1ff4753846621c43e518418
Merge: 510e7bb 6444f0b
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Mar 26 11:40:56 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 510e7bb9549fa859708c978c860ef8ca3c59e7da
Author: moliwikia <moli@wikia-inc.com>
Date:   Thu Mar 21 13:49:59 2013 +0000

    back to previous version of maintenance script

commit f85c1a78b48bd85cd1b6d7df7e7eaa164e1dede3
Merge: 98646d0 a73d8d0
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Thu Mar 21 09:54:35 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 98646d052d8bb5c20e9e564c309fed8596d2f73d
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Mar 19 18:30:05 2013 +0100

    BAC-96: unit tests for Phalanx::newFromType()

commit 969036cf776c976f1a7433a2e98f5c18f0c40fd4
Merge: eb21126 dee7cc5
Author: Maciej Brencz <maciej.brencz@gmail.com>
Date:   Tue Mar 19 08:28:39 2013 -0700

    Merge pull request #513 from Wikia/blac-96

    Blac 96

commit dee7cc5567c591c8166aab1f99d54bced9086a70
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Mar 19 15:37:38 2013 +0100

    BAC-96: UserProfilePageV3 - PhalanxModel::newFromType

commit c7c7ea475fbf28126d0ec0ddafbef74400f9c4ca
Merge: 30a2a04 c51eb25
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Mar 19 13:52:36 2013 +0100

    Merge branch 'phalanx-redoux' into blac-96

commit eb21126faefa7190b9ed63813096fc3e58b9f7a6
Merge: c51eb25 25462fd
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Mar 19 10:12:10 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit c51eb259fe22bdcaebf27382b98744785be5ed99
Author: macbre <maciej.brencz@gmail.com>
Date:   Mon Mar 18 15:13:04 2013 +0100

    PhalanxHooks: check "phalanxexempt" user right

commit dfe115c5dbf887abbd3dd9fb26f91bb81c5843fa
Merge: 7199815 0fce565
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Fri Mar 15 09:47:21 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 7199815a4da524771771e28f807114e5c13bad21
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Mar 13 18:11:36 2013 +0100

    PhalanxII: remove PhalanxController (was not used)

commit 0f41f0146c3b5ed82414df7e0a56a632e2cc75b4
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Mar 13 18:08:23 2013 +0100

    PhalanxII: remove maintenance directory

commit a02e94f711c5a38e977cbd0a35b13038707ce32f
Merge: d1c845b 5d947f9
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Mar 13 09:54:07 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit d1c845b4cf7a0d68a5fa39d6e7c92cb8b22d0913
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Mar 12 18:32:05 2013 +0100

    Special:Phalanx - remove unused CSS rules

commit d0b34ff13fa69670f3778bf5b1d882ccb95d5dfe
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Mar 12 18:27:16 2013 +0100

    Remove PhalanxSpecialController::refresh method (was unused)

commit 3fa28190154cd9b982dde3d35ea65b1e2caacba8
Merge: d69eed1 2343ab6
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Mar 12 16:13:04 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit d69eed1e0bfcdb712b9346f439dbb8f91caddcc1
Merge: 5493728 9cad6e3
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Mar 12 12:44:07 2013 +0100

    Merge branch 'bac-106-error-handling' into phalanx-redoux

commit 9cad6e3ea23293da395e2b17277697e1e4446056
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Mar 12 12:43:33 2013 +0100

    BAC-106: better error handling in Phalanx UI

commit 5493728cb1dcdbe7e66bccad8bac01763fe0160b
Merge: bfc84cd e333464
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Mar 12 09:44:17 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit bfc84cd3ec53f899ab644e3bd518df8dd7a2e691
Author: Szumo <szumo@wikia-inc.com>
Date:   Mon Mar 11 17:16:26 2013 +0100

    BAC-105: Separate PhalanxII profiling info per service method

commit e743731716e6d0f0bf7ba025bebca5f28b9ea108
Author: moliwikia <moli@wikia-inc.com>
Date:   Mon Mar 11 15:02:07 2013 +0000

    remove debugs

commit dc7bb147edb0a022b58e3a1e3ef86b7d3b8aefd8
Merge: 0278b16 0727682
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Mon Mar 11 13:58:01 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 0278b1672c89929395ca6dc3f7c2abb1a947dca7
Author: moliwikia <moli@wikia-inc.com>
Date:   Fri Mar 8 17:06:07 2013 +0000

    remove unused extension (BAC-98)

commit 752c5b26dfa91870efd0c73f6e3767a07ae38683
Author: moliwikia <moli@wikia-inc.com>
Date:   Fri Mar 8 15:35:22 2013 +0000

    added hooks to edit/delete Phalanx block + use those hooks on PhalanxSpecial page (BAC-97)

commit 2449751cc767767839ced8d2d28f9cf344d1762b
Merge: 2a82edc 4206807
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Fri Mar 8 13:41:10 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 2a82edc2b530f67b5419ce00000109f6da6d6933
Merge: d98a550 a113266
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Fri Mar 8 10:01:45 2013 +0100

    Merge branch 'dev' into phalanx-redoux

    Conflicts:
    	extensions/wikia/SpecialSendGridPostback/SendGridPostback.php

commit d98a550c051e459b5a3f16fb54fe1cd2c176af4c
Author: moliwikia <moli@wikia-inc.com>
Date:   Thu Mar 7 11:13:13 2013 +0000

    fixed test - wiki_creation => match_wiki_creation

commit 7b3250aa8888d95e2714146936ccf6a343da4da2
Merge: 9d9268c 30a2a04
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Mar 7 11:36:31 2013 +0100

    Merge branch 'blac-96' into phalanx-redoux

commit 30a2a048f8204adcac758efb18f15f74fe1cf326
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Mar 7 11:34:42 2013 +0100

    BAC-96: Remove hardcoded references to Phalanx - UserProfilePageV3

commit 0b66adc35269bb234017f65d954d59156a5bab85
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Mar 7 11:33:00 2013 +0100

    PhalanxService: log response + better docs

commit 9d9268c1216c501a15017a76d9ba265ddfaa314c
Merge: 3940639 69bb249
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Thu Mar 7 09:47:32 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 394063903c6dbc2415dbabd2a6f6b8302a5821e5
Author: Szumo <szumo@wikia-inc.com>
Date:   Wed Mar 6 17:51:01 2013 +0100

    Nicer logging

commit 703f5170253655e9609ecbe8704451346c104c1f
Merge: 8b770a3 f17537d
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Mar 6 14:49:22 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 8b770a304caa798dbcf567b82dbb969d48c12e17
Merge: 4951cce c81c102
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Mar 6 10:20:25 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 4951ccefb92c4c39084987e2987b7939d9e85011
Merge: c5975e5 bf1ee27
Author: Krzysztof Krzyżaniak (eloy) <eloy@kofeina.net>
Date:   Tue Mar 5 20:39:36 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit c5975e5fcba01c9f4cec8049c6042837d9505aca
Author: moliwikia <moli@wikia-inc.com>
Date:   Tue Mar 5 14:46:19 2013 +0000

    fixed phalanx fallbacks + remove unused class from CreateNewWiki

commit dd1767a07cb4f3fe5eafe387a580859d32ef84fa
Author: moliwikia <moli@wikia-inc.com>
Date:   Tue Mar 5 11:39:24 2013 +0000

    block content of undelete page (BAC-80)

commit 7f5237a3d6958243426f4b4e572c477c766b7f01
Merge: 23522bb 3f0c00f
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Mar 5 09:42:02 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 23522bb8c60f47609d56c79ded9bc33f844a31cf
Author: moliwikia <moli@wikia-inc.com>
Date:   Mon Mar 4 16:48:08 2013 +0000

    added maintenance script to rebuild cache for fallback class + fixed fallback methods

commit 7478b81b4fff431da7535e71ca75c06cd6f68e9b
Merge: 36fc487 ef5cef8
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Mon Mar 4 16:56:03 2013 +0100

    Merge branch 'dev' into phalanx-redoux

    Conflicts:
    	extensions/wikia/WikiaHubsV2/hooks/WikiaHubsV2Hooks.php

commit 36fc487a4ae3638327eeac258648443e4c3eb115
Merge: 3862792 a3a719b
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Mon Mar 4 13:34:23 2013 +0100

    Merge branch 'dev' into phalanx-redoux

    Conflicts:
    	extensions/wikia/WikiaHubsV2/WikiaHubsV2.i18n.php

commit 386279228fb157b740a7aab88bcd882dfb46eb6c
Merge: 856ecb0 dac1ba3
Author: Krzysztof Krzyżaniak (eloy) <eloy@kofeina.net>
Date:   Mon Mar 4 11:35:59 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 856ecb0ddae2e1e953ea14840177b4c7eb90dfe6
Merge: 678ff05 4d624fb
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Fri Mar 1 16:15:03 2013 +0100

    Merge branch 'dev' into phalanx-redoux

    Conflicts:
    	includes/User.php

commit 678ff050fc1964397215872bdd5d44b6a1d32d8c
Author: macbre <maciej.brencz@gmail.com>
Date:   Fri Mar 1 14:51:46 2013 +0100

    UserSignupTest: make sure that IP is mocked in the test

commit ca55676594a1ad347c1569a9ef5d53644032eac5
Author: macbre <maciej.brencz@gmail.com>
Date:   Fri Mar 1 14:20:54 2013 +0100

    PhalanxServiceTest: be more verbose when fail

commit 6c2337f6e42336768eb90fa7c7419a8a2a3f8e4c
Author: macbre <maciej.brencz@gmail.com>
Date:   Fri Mar 1 13:44:59 2013 +0100

    /MarketingToolboxModuleWikiaspicksService - remove duplicated method

    Fix unit tests in phalanx-redoux branch (BAC-88)

commit 9bc0042fbb2f8a1e3592e0eea8c0e7d55cd9914b
Author: Lukasz Konieczny <lukaszk@wikia-inc.com>
Date:   Wed Feb 20 11:33:53 2013 +0000

    BugId-98040: Added method to prepare data structure for Slider

commit 4f49f3b7843a17bd457c808faabfe419cd9cca79
Merge: 4dca421 ba78c1a
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Fri Mar 1 10:29:55 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 4dca42118b5e05e6f50259609ece0753dce2f758
Merge: 8d41d2b 12938bf
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Thu Feb 28 17:56:24 2013 +0100

    Merge branch 'dev' into phalanx-redoux

    Conflicts:
    	extensions/wikia/WikiaHubsServices/WikiaHubsServices.setup.php
    	extensions/wikia/WikiaHubsServices/tests/modules/MarketingToolboxModuleFeaturedvideoServiceTest.php
    	extensions/wikia/WikiaHubsV2/SpecialWikiaHubsV2Controller.class.php
    	extensions/wikia/WikiaHubsV2/js/WikiaHubsV2.js

commit 8d41d2bd29dd9013f3420992224776b746c3e1b2
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Fri Feb 22 14:43:11 2013 -0800

    Fix track unit tests.

commit bab7549bc243f946b5ba989abaf738cd7b98d57e
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Fri Feb 22 14:17:41 2013 -0800

    Fix WikiaMobile tests which depend on tracker.

commit 7b824232a8d56b6d2bf04c2aa76cc2f4e99420ef
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 28 17:29:32 2013 +0100

    Special:Phalanx - improve tooltips handling

commit 14addf6719c58d6379f92e601208b22c57ccc384
Author: nAndy <nandy@wikia-inc.com>
Date:   Thu Feb 28 15:02:38 2013 +0000

    removed php warning from hub rendering when there are no popular videos

commit 38e882342fccaed102b590bd4640d2d35e0e0baa
Author: nAndy <nandy@wikia-inc.com>
Date:   Thu Feb 28 15:02:11 2013 +0000

    added top margin to paragraph below feature video

commit 0fd5d6a5887ab29a855313cae3c1d1a584663904
Author: nAndy <nandy@wikia-inc.com>
Date:   Thu Feb 28 13:57:43 2013 +0000

    added class for sponsored images

commit 20d973aa2f4f43db0fc3be7883638d687e039e7f
Author: nAndy <nandy@wikia-inc.com>
Date:   Thu Feb 28 13:52:53 2013 +0000

    alphabetic order of css properties

commit 7a3bee315fea11a32a95661a95b21bb74cbbfde3
Author: nAndy <nandy@wikia-inc.com>
Date:   Thu Feb 28 13:34:14 2013 +0000

    extracted sponsored image markup generating method, used the same way to render sponsored box in Wikia's Picks module as in Feature Video module

commit ffeb4a59c03bf44c84eba5f84fa6c036f70ff674
Author: nAndy <nandy@wikia-inc.com>
Date:   Thu Feb 28 13:11:09 2013 +0000

    added SponsoredBox.scss import and removed unused NewsTabs

commit 70fba8aa661ebe07899e0da178c1a81356702f63
Author: nAndy <nandy@wikia-inc.com>
Date:   Thu Feb 28 13:10:40 2013 +0000

    extracted .sponoredbox and removed border for h2 element in feature video module

commit 963c3d846abc0404b934fd559d1e82a2d65376ee
Author: Lukasz Konieczny <lukaszk@wikia-inc.com>
Date:   Thu Feb 28 12:59:27 2013 +0000

    BugId-98666: Force login revised. Added 'forceLoggedIn' property and set to true when user is logged in.

commit 4248e5c476cc1a4810033bd1ba6ae4c26d0cd173
Author: nAndy <nandy@wikia-inc.com>
Date:   Thu Feb 28 12:49:20 2013 +0000

    changed styling of sponsored image in Feature Video module

commit 570fbc2570cbb1f3dd67f584d9e5ab09a76d23df
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Thu Feb 28 12:51:48 2013 +0100

    bugid-98665 | Hubs v2 get promoted - added tracking data [changed params for tracking]

commit ab18f279ccae688777ad07f0d31891b5eeb36ca3
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Thu Feb 28 10:33:58 2013 +0100

    bugid-98665 | Hubs v2 get promoted - added tracking data

commit b3bedf999abd17f2818c48e5d36494c36117fcef
Author: grunny <grunny@wikia-inc.com>
Date:   Thu Feb 28 19:23:37 2013 +1000

    (BugID: 98710) Update staff welcome messages

commit a97a7f1c28031f2ccecbec1ed23465d389ecab88
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Thu Feb 28 09:35:21 2013 +0100

    bugid-98668 | Hubs v2 get promoted - code cleanup done

commit 34361b45871c5957cf0904a09e9a934a38b66842
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Thu Feb 28 08:17:21 2013 +0100

    bugid-95786 | Hubs v2 popular videos finished

commit 62c02ec4eb337f279cbbdf4e94648deebf3ac9d2
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Wed Feb 27 18:19:46 2013 -0800

    (BugId:95911) Fix new lines being added in certain scenarios in table cells.

commit 059860f4edd1ebcbc0f48068813dce818e2017ea
Author: Robert Elwell <robert@wikia-inc.com>
Date:   Thu Feb 28 00:49:29 2013 +0000

    imported global namespaced WAMService to Wikia\Search\IndexService with use statement

commit 0092ce1ee681e2f037d6b1905bbb332ecf878335
Author: Marcin Maciejewski <marcin@wikia-inc.com>
Date:   Wed Feb 27 17:56:22 2013 +0000

    bugid-98663: Hubs: Featured Video - Revise tracking code

commit 8b01ba40800f151cf9cfb685efff4bbd3dba046b
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 15:32:58 2013 +0000

    added sponsored image

commit d8b49bb0e90ad0090455cf108c5eb15a26dc14f0
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 15:32:02 2013 +0000

    overwritten render() method

commit ef4eaa464ce65d6a78f20203429b8cbdcd5fb297
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 16:25:27 2013 +0100

    bugid-98668 | Hubs V2 get promoted code cleanup

commit 90c3e447ae822b962cf5adb7344e8298849c2272
Author: Lukasz Konieczny <lukaszk@wikia-inc.com>
Date:   Wed Feb 27 15:12:59 2013 +0000

    Updated code test: thumb size moved to data provider

commit a25973cbfca14e64f3aa364152d4bb2110255101
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 16:08:48 2013 +0100

    bugid-98239 | Hubs V2 get promoted - input maxlength atrributes [constants]

commit 0a4bae64cdccf320c21366146bcf0d10c557e035
Author: Lukasz Konieczny <lukaszk@wikia-inc.com>
Date:   Wed Feb 27 14:56:16 2013 +0000

    Added missing methods

commit 925ce2515b41ad2fa655dc70b4f4b1363d050f5c
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 15:56:35 2013 +0100

    bugid-98239 | Hubs V2 get promoted - input maxlength atrributes

commit 843ed5444eeea71175a8fa2328401452528baca4
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 14:52:18 2013 +0000

    adjusted template to returned data from SMTb

commit a027b99833e3f01a52dbc7c9f4df407a67f46bf1
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 15:47:37 2013 +0100

    bugid-98239 | Hubs v2 fixed old getPromoted functionality

commit eccb672109ef5648f567066014a3ef8d249eebc5
Author: Marcin Maciejewski <marcin@wikia-inc.com>
Date:   Wed Feb 27 14:45:22 2013 +0000

    bugid-98660: Hubs: Popular Videos - Revise tracking code

commit 1834b21a691f611271c4654c59e836729d8fbed6
Author: Lukasz Konieczny <lukaszk@wikia-inc.com>
Date:   Wed Feb 27 14:43:28 2013 +0000

    Added test for 'getStructuredData' method

commit 94e11e07378e7cca748a4b549aa405d0f3c1db32
Author: Lukasz Konieczny <lukaszk@wikia-inc.com>
Date:   Wed Feb 27 11:42:21 2013 +0000

    Added 'getStructuredData' method

commit 81b66fd5e8ee0e519a9e812440f226b5423ac01a
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 14:35:20 2013 +0000

    removed unnecesarry templates, added new template for Feature Video module

commit 7273deac32330d3c8f3b191f5e51f878b1a76222
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 15:12:01 2013 +0100

    bugid-98661 | Hubs v2 FeaturedVideo getStructuredData

commit 9fcda26fc15f4c3495997795aaef4e52cfd33bd9
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 13:23:51 2013 +0000

    added previously removed template...

commit 1a1d2e5d8c00387720306e7b748f586410992244
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 13:23:03 2013 +0000

    deleted template to add it in next commit... weirdo...

commit be60266cbb19e1189f43982c2a7bdd5609a686f0
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 13:19:38 2013 +0000

    better fix for not loading lightbox on WikiaHubsV2 hub page

commit e34349c164a912b438ac284bf89b0f6ad7edb174
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 12:32:27 2013 +0000

    load lightbox on WikiaHub page

commit 5ccc2f708d650aefff10587817b4f55f5f0685f0
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 13:02:20 2013 +0100

    bugid-98656 | Hubs V2 Popular videos - changed way for getting thumb url

commit 94d4fa59ca7c86d2ec851a28818b13e7d4bec00e
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 11:48:06 2013 +0000

    changed classes names to be more descriptive, removed unnecessary style definitions

commit d4b4717c0ea44d2f9dafc6a0274239bac6d99a2c
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 12:38:19 2013 +0100

    bugid-98656 | Hubs V2 code clean

commit 5cb8cc040bbb0bb1d2e655284bc32030dc79a1b0
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 12:01:34 2013 +0100

    bugid-98656 | Hubs V2 code clean

commit f4fae4e8446d0ac3cebd883451ac85bed9da9eb9
Author: nAndy <nandy@wikia-inc.com>
Date:   Wed Feb 27 10:55:49 2013 +0000

    removed old template, added new template and reorganized it, added mocked data for now

commit 700ec0fae604ea9cbf8f54215ae58a0cd8709c65
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 11:48:13 2013 +0100

    bugid-98656 | Hubs V2 get data about video for getStructuredData

commit 4246a02ac99c72ae8401955aa932332e1e1b4a90
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 27 10:38:38 2013 +0100

    bugid-98656 | Hubs V2 code clean

commit 626a45d6095f18b77d8eb056a97360426820f5bd
Author: moliwikia <moli@wikia-inc.com>
Date:   Thu Feb 28 15:33:58 2013 +0000

    added phalanx hook to undelete process (BAC-80)

commit ef8ce1fc57cee6c60a33e1f5ce4783ad615c801b
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 28 12:43:15 2013 +0100

    BAC-85: Remove hardcoded block type checkboxes from Special:Phalanx

commit f2cdeba21fe08fc6519c0b83005c9681c665a382
Merge: b4418a1 8a02f85
Author: Krzysztof Krzyżaniak (eloy) <eloy@kofeina.net>
Date:   Wed Feb 27 22:22:05 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit b4418a1849bbaf12e328b8c01b42179d9de2f0e8
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Wed Feb 20 11:15:01 2013 -0800

    (Re: @gabrys) Make WikiaTracker into an AMD module

    Conflicts:
    	extensions/wikia/JSVariables/JSVariables.php
    	resources/wikia/Resources.php
    	resources/wikia/modules/tracker.js

commit 001fd9d5d90099c05cba8f0a3ad2ac4b8371031c
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Wed Feb 20 11:15:01 2013 -0800

    (Re: @gabrys) Make WikiaTracker into an AMD module

    Conflicts:
    	extensions/wikia/JSVariables/JSVariables.php
    	resources/wikia/modules/tracker.js

commit 76fcaed741ff854d6c5e53e57753768fd0f05629
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Thu Feb 21 17:27:01 2013 -0800

    Add tracker.stub and refactor dependencies.

    Conflicts:
    	resources/wikia/modules/tracker.js
    	resources/wikia/modules/tracker.stub.js

commit 7c260156fbf38c8e7d38aa0570ce766b5f14dc3d
Author: liz <liz@wikia-inc.com>
Date:   Wed Feb 20 19:51:11 2013 +0000

    more updates to querystring in lightbox. bugid:96341)

commit 787ca24c2245517bb63fa04eea6b874688ec6bd1
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Feb 19 11:15:35 2013 +0100

    AMD: split window.js into three separate files

    Conflicts:
    	resources/wikia/modules/cache.js

commit 45559a047bdc783b82dd6ee2de9e0ac6d74de9d5
Author: liz <liz@wikia-inc.com>
Date:   Thu Feb 21 22:44:14 2013 +0000

    adding unit tests for querystring pushState and replaceState

commit 8f4c6f241b318b486a4b8c8fce3861ed792c67df
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Wed Feb 20 10:27:11 2013 +0000

    bugid-68510 | S:MTb Popular videos - fixed navigation and video preview

    Conflicts:
    	extensions/wikia/SpecialMarketingToolbox/js/EditHubNavigation.js

commit 047b7670b29d60ca86d0438b2415e5c893743fd7
Author: liz <liz@wikia-inc.com>
Date:   Tue Feb 19 21:39:53 2013 +0000

    bugid:98037 adding safegaurd when both lightbox extensions are loaded on a hubs page

commit d42d588efa4ab37b0980e12e12e422526718e65d
Author: liz <liz@wikia-inc.com>
Date:   Fri Feb 15 18:43:29 2013 +0000

    sorting out messaging for adding file to editor on page load

commit 3cc93900376c27e6a5353ef631891889c17f431a
Author: saipetch <saipetch@wikia-inc.com>
Date:   Thu Feb 14 13:23:02 2013 -0800

    Video (bugid 95954): redirect to homepage after remove file

commit ad3dd20435f52698d48ed5345b0459990f6cbf57
Author: liz <liz@wikia-inc.com>
Date:   Fri Feb 15 00:28:21 2013 +0000

    bugid:97798 loading editor with file added

    Conflicts:
    	extensions/wikia/EditPageLayout/EditPageLayout.class.php
    	extensions/wikia/VideoEmbedTool/js/VET.js

commit a48fc7f0a684c91b16dd3830f4c082b40523446f
Author: sebastian-wikia <sebastianm@wikia-inc.com>
Date:   Fri Feb 22 19:45:09 2013 +0000

    Linting fixes

commit 8c98535b1622ba4569497af14d350187040a129a
Author: marzjan <sebastianm@wikia-inc.com>
Date:   Mon Oct 1 10:04:36 2012 +0000

    BugID: 48494 - restyling of error messages in edit preview modal

    git-svn-id: svn+ssh://svn.wikia-code.com/svn/wikia/trunk@60815 e846bd91-c042-42a7-a218-4b65e2c1904d

    Conflicts:
    	extensions/wikia/Oasis/Oasis.i18n.php

commit 7f4fe8350fc9b1015c8e644137050c12db7681ab
Author: sebastian-wikia <sebastianm@wikia-inc.com>
Date:   Fri Feb 22 19:26:29 2013 +0000

    BugID: 97163

    Making sure that the promise of getting messages is resolved before
    using them.

commit ea277f1451c05dfaf270724058a58a4633c00afa
Author: macbre <maciej.brencz@gmail.com>
Date:   Fri Feb 22 18:11:48 2013 +0100

    Fix PHP lint "Method 'link' not found in class" error

    Skin::link method no longer exists. Use Linker::link instead.

commit af88bea6b77fb6941bc55e24543fd52b3a731d4c
Author: macbre <maciej.brencz@gmail.com>
Date:   Mon Feb 25 17:59:54 2013 +0100

    LatestPhotosController: fix for memcache key length (BugId:69170)

commit c444b0d53cd2f62ae7681251b3815f4a134a09dc
Author: saipetch <saipetch@wikia-inc.com>
Date:   Fri Feb 22 12:23:51 2013 -0800

    Video (bugid 95954): removed remove and unremove on file page

    Conflicts:
    	extensions/wikia/VideoHandlers/VideoHandlerHooks.class.php
    	skins/oasis/modules/PageHeaderController.class.php

commit c0493f1d1107b2bc884e31c0a736fd98c941aa33
Author: macbre <maciej.brencz@gmail.com>
Date:   Fri Feb 22 17:05:41 2013 +0100

    Add /includes/resourceloader/wikia/tests to the list of unit tests

commit 7a0fe65545cd816f6540f1c55868030e1f30aa77
Author: Adam Robak <adamr@wikia-inc.com>
Date:   Mon Feb 25 15:38:16 2013 +0100

    size removed from file input and text file, added width to css

commit c0667494688fb08b16ec1064264fc45be49a54cc
Author: Hyun Lim <hyun@wikia-inc.com>
Date:   Mon Feb 25 22:02:39 2013 +0000

    bugId::98306 Updated deprecated live with on

commit 0a3440f812e778ca353a7a8b2742a15ef52f2e85
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Tue Feb 19 16:19:46 2013 -0800

    (BugId:97580) - Add interlanglinks to preview modal html.

commit b0e97fb8ee2df6d911f7f2af7030113ff28543fb
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Tue Feb 19 17:37:50 2013 -0800

    Fix CategorySelect for widescreen mode.

commit 9d9dca3bdf989af03e1f92fe1577ee263dc1c41c
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Mon Feb 25 15:33:30 2013 +0100

    bugid-98117 | S:CNW fixed accented characters [converted lib into AMD module]

    Conflicts:
    	extensions/wikia/CreateNewWiki/js/CreateNewWiki.js

commit 06b9e06ac6c55280eab0ba128a3043828e793c95
Author: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date:   Sun Feb 24 18:08:34 2013 +0000

    Localisation updates from http://translatewiki.net.

commit bc423277d3297a6cced11096f80b9de555099087
Author: liz <liz@wikia-inc.com>
Date:   Sat Feb 23 00:29:50 2013 +0000

    bugid:95681 updating lightbox template versioning

    Conflicts:
    	extensions/wikia/Lightbox/js/Lightbox.js

commit 1a8ee286e6883f9c31dde9c00b50dd5257bde24c
Author: liz <liz@wikia-inc.com>
Date:   Wed Feb 20 19:26:54 2013 +0000

    bugid:96341 fixing lightbox urls not getting escaped properly and refactoring lightbox to use Querystring module

    Conflicts:
    	extensions/wikia/AssetsManager/config.php

commit e334a069fe0b54483a93f7a6db74c2b02d3c2ed9
Author: liz <liz@wikia-inc.com>
Date:   Thu Feb 21 19:18:50 2013 +0000

    adding autocomplete support to lightbox

commit 1aff8905f8140381b403c3955369155ffc62c8e9
Author: liz <liz@wikia-inc.com>
Date:   Fri Feb 15 01:50:29 2013 +0000

    adding messaging to editor when it's loaded with a file prepended

    Conflicts:
    	extensions/wikia/EditPageLayout/EditPageLayout.class.php

commit ad2a85a023082385d45fa511c83b844cb31d032c
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Fri Feb 15 17:48:54 2013 -0800

    Truly associates category data to the DOM.

    Fixes not correctly de-duping categories with HTML entities. No longer
    have to re-parse articles when loading CategorySelect. When saving
    categories on article pages, the view is updated with a more accurate
    DOM structure since it uses the same mechanisms as the original article
    view request. Category types are now added to category data so it can be
    used for styling purposes. Among other things, fixes BugId:97734.

    Conflicts:
    	extensions/wikia/CategorySelect/js/CategorySelect.js
    	extensions/wikia/CategorySelect/templates/CategorySelectController_category.mustache
    	extensions/wikia/CategorySelect/templates/CategorySelectController_categoryEdit.mustache

commit a2451a2dde6c02c9d9b714b6e18fc04c093dc152
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Thu Feb 14 17:53:45 2013 -0800

    Build categoryLinks manually so we can preserve category ordering across view/edit pages.

commit 761d4b7eb8ee5ebc56d82658036f0b3be6dcbc9e
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Thu Feb 14 17:51:12 2013 -0800

    Add getCategoryLinks() and getCategoryType().

    Conflicts:
    	extensions/wikia/CategorySelect/CategorySelect.class.php

commit abbe45932abdd3fb3325468be0d8d809d1c669d9
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Feb 19 12:54:18 2013 +0100

    BLAC-47: it should use this function anyway

commit d1f74426c0f4740e2674b3c738cf3eea9025d292
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Thu Feb 14 11:29:25 2013 -0800

    Add hidden property to category object.

commit bca47d9145b2bc6937ef2f313ee0f33165fe8ad5
Author: macbre <maciej.brencz@gmail.com>
Date:   Fri Feb 22 15:14:34 2013 +0100

    AssetsManager: add debug logging

commit 52ecb8afcff00b8366b513348b6d390b9f537027
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Mon Feb 25 16:54:38 2013 -0800

    (BugId:97703) Fix converting HTML entities to characters when editing wikitext in source mode.

commit 12cad813719e1075c621e368c6ba108f2c4fa4d4
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Thu Feb 21 17:19:45 2013 -0800

    Remove _wtq, it is no longer used.

    Conflicts:
    	extensions/wikia/JSVariables/JSVariables.php

commit f1f51274f5e6fdd42c5f2d5806e9fe93a5d3aca6
Author: Władysław Bodzek <wladek@wikia-inc.com>
Date:   Tue Feb 19 15:03:13 2013 +0100

    bugid:98014 - changed storage for achievements notification queue to memcached

commit 0a843edb1f360f27b692b845b0eca1292f79d501
Author: saipetch <saipetch@wikia-inc.com>
Date:   Tue Feb 19 16:21:25 2013 -0800

    Video (bugid 97842): GlobalUsage - add hooks and fix non-en wiki url.

commit 1edb8846849a318774c527bb0b2f2fb0e5290a72
Author: Adam Robak <adamr@wikia-inc.com>
Date:   Mon Feb 25 14:02:45 2013 +0100

    change file path to full path

    Conflicts:
    	extensions/wikia/AssetsManager/builders/AssetsManagerSassBuilder.class.php

commit cbedf3ead63a59791386415936c8cd6d52f82ba4
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Fri Feb 15 18:17:49 2013 -0800

    Data properties pulled from HTML attributes are always lowercase.

    Conflicts:
    	extensions/wikia/CategorySelect/js/CategorySelect.js
    	extensions/wikia/CategorySelect/templates/CategorySelectController_category.mustache
    	extensions/wikia/CategorySelect/templates/CategorySelectController_categoryEdit.mustache

commit 0c6ab4570dd46e338ed37169dbb6822413c59c22
Author: moliwikia <moli@wikia-inc.com>
Date:   Wed Feb 27 13:47:18 2013 +0000

    added new hooks to block invalid titles, related pages and description on CreateTopList page (BAC-79)

commit 8d7adb53c718c4fdf5597792f7ce204ea2ed3bbf
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Fri Feb 22 13:55:51 2013 -0800

    Add tracker.stub to tracker_js group in assets manager.

    Conflicts:
    	extensions/wikia/AssetsManager/config.php

commit 638c80b8d98870ffd91cc5a7f53fe53a3a1ab578
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 05:52:32 2013 +0100

    BugId:97416 - Introducing AdLogicPageLevelParamsLegacy

    This fixes Evolve and GamePro providers
    Also document is removed from AdLogicPageLevelParams as well as dartUrl dependency

commit 80b38e8dd9969e4cd098e7cfc596da9052c9c10e
Author: Przemek Piotrowski (Nef) <ppiotr@wikia-inc.com>
Date:   Wed Feb 20 17:22:10 2013 -0800

    bugid:97754 hubs tweak for evolve

    Conflicts:
    	extensions/wikia/AdEngine/js/AdProviderAdDriver2.js

commit e1740b0a9fb8e79f5d111ff5bfe261404983e310
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Tue Feb 19 23:44:55 2013 +0100

    BugId:97352 - Update RL dependencies of AdEngine

commit 13b14e0675c72b27f22d9b57e860df285fe64315
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Mon Feb 25 14:09:49 2013 -0800

    AbTest: a better log method.

    Conflicts:
    	extensions/wikia/AbTesting/js/AbTest.js

commit 73f8d8b620e908a86abedb742c52a34e1b03458e
Author: Kyle Florence <kflorence@wikia-inc.com>
Date:   Wed Feb 20 16:41:38 2013 -0800

    WikiaTracker -> Wikia.Tracker

    Conflicts:
    	extensions/wikia/AdEngine/js/AdEngine2.configLateAds.js
    	extensions/wikia/AdEngine/js/AdEngine2.run.js
    	extensions/wikia/AdEngine/js/AdProviderAdDriver2.js
    	extensions/wikia/AdEngine/js/AdProviderEvolve.js
    	extensions/wikia/AdEngine/js/AdProviderGamePro.js
    	extensions/wikia/JSVariables/JSVariables.php
    	extensions/wikia/VideoEmbedTool/js/VET.js
    	extensions/wikia/WikiaHomePage/js/WikiaHomePage.js
    	extensions/wikia/WikiaMobile/js/tests/adsTest.js
    	extensions/wikia/WikiaQuiz/js/WikiaPlayQuiz.js
    	resources/wikia/modules/tracker.js

commit c84e96b373218515e3ad8b12b2c79b01bb61f871
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 27 13:41:58 2013 +0100

    AdProviderEvolveTest: fix unit tests

commit fb85d9e0df8dfa13cac083c5e6890d8fbdcdf30f
Merge: 3f6b2c6 0d02fc52
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Feb 27 13:35:26 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 3f6b2c64573e275ad84a3f69e21f82ee6164502f
Merge: b350f63 d368422
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Feb 27 12:13:51 2013 +0100

    Merge branch 'dev' into phalanx-redoux

    Conflicts:
    	extensions/wikia/SpecialVideos/templates/SpecialVideosSpecial_index.php
    	resources/wikia/modules/cache.js

commit b350f6374dd77765ab0c51d0c32323e09648cb1e
Author: moliwikia <moli@wikia-inc.com>
Date:   Wed Feb 27 12:02:20 2013 +0100

    Fixed PHP lint (BAC-20)

commit 671d79b333813e6935c866a35347875d2b2de877
Merge: 57fe605 08aaf4b
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Feb 26 17:45:41 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 57fe60522f11141e7d94032e3d4ceb0851407acb
Author: Damian Jozwiak <damian@wikia-inc.com>
Date:   Tue Feb 26 17:26:11 2013 +0100

    bugid-96419 | S:MTb added message on publish hub [fixed]

commit 3a6487bd88a71c6140aa5eab4997246c4e6f11eb
Author: Jakub Olek <jolek@wikia-inc.com>
Date:   Tue Feb 26 16:47:12 2013 +0100

    WikiaMobile: Gallery: Fixes for resizing video in modal

commit c8f201d927181a8325be017cb68d6168829e672b
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Tue Feb 26 14:35:54 2013 +0100

    BugId:97416 - Use wgAdDriverUseGpt variable and don't set it by cookie

commit 42489cc186737bab1959e61b116cb09a2a1cabbe
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 08:07:34 2013 +0100

    BugId:97416 - Evolve to use DartUrl

commit 7e92f789c2b74d3475ecc64d2eddc591272fbe41
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 07:52:01 2013 +0100

    BugId:97416 - Don't pass Krux directly to AdProviderEvolve

commit a6c85a5bf2b6ecf66f21cec11350a98c4b054842
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 06:31:02 2013 +0100

    BugId:97416 - AdConfig2Late jslint

commit 21a590a92caf357c88460437e4fd22155e848b16
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 05:52:32 2013 +0100

    BugId:97416 - Introducing AdLogicPageLevelParamsLegacy

    This fixes Evolve and GamePro providers
    Also document is removed from AdLogicPageLevelParams as well as dartUrl dependency

commit a3c7d58b61bc2ee0556a3181d8d75bf72789b1ab
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 05:59:16 2013 +0100

    BugId:97416 - AdProviderEvolve jslint

commit 14d167aeeef344ece105755388d87b42d18ca67f
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 04:51:52 2013 +0100

    BugId:97416 - WikiaDartHelper update (less params)

commit 51da93e97a5531ee59d5458951e5e3f961cc8c4f
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 02:48:00 2013 +0100

    BugId:97416 - Represent custom key values as dict/array

commit 6d639abc1722126fb3a0fd5432a37e242b9c6eae
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 01:43:19 2013 +0100

    BugId:97416 - WikiaGptHelper

commit 85b53bf65f8c50145ddeee195548cdefd00dccef
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 01:31:38 2013 +0100

    BugId:97416 - Removing dis=large parameter

commit 0fdeb4e64ba7fc8afa986ffca00f1c95a5d61acc
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Sat Feb 23 00:40:06 2013 +0100

    BugId:97416 - WikiaDartHelper getPageLevelParams

commit 093d6dae7c3db4247ceb47d1ba7685322a244e7b
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Fri Feb 22 02:19:43 2013 +0100

    BugId:97416 - WikiaDartHelper cleanup

commit 508ab129cfc0c0eb7792723a4603b72640777cb9
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Fri Feb 22 07:02:54 2013 +0100

    BugId:97416 - DartUrlTest update/fix

commit e9b303ac2a32c8bc3c7cde31ebb90e7164a25ae6
Author: Piotr Gabryjeluk <rychu@wikia-inc.com>
Date:   Fri Feb 22 06:58:42 2013 +0100

    BugId:97416 - WikiaDartHelper test for per-wiki DART key values

commit 226f4e3a39fc7a4f3c30ab1d1ef05b90ecc98bd2
Author: moliwikia <moli@wikia-inc.com>
Date:   Tue Feb 26 16:36:22 2013 +0000

    fixed block page for blogs

commit e6a063903b3e3c0d1de19702d8867d28a56624b0
Author: moliwikia <moli@wikia-inc.com>
Date:   Tue Feb 26 16:13:34 2013 +0000

    added fallbacks to all Phalanx methods

commit caa664dd478e0151b9f5eaefe854cb02d34dbc23
Merge: a0fd15a 3cd519f
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Feb 26 16:51:59 2013 +0100

    Merge branch 'dev' into phalanx-redoux

    Conflicts:
    	extensions/wikia/SpecialMarketingToolbox/js/EditHub.js
    	extensions/wikia/WikiaHubsV2/hooks/WikiaHubsV2Hooks.php

commit a0fd15a468c49ca4be65a17378c34d1f7fd748bb
Merge: 950dc19 5f0abe3
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Tue Feb 26 16:33:58 2013 +0100

    Merge branch 'dev' into phalanx-redoux

commit 950dc1958b76190b532eaacb764374b0a0ae6547
Author: Maciej Szumocki <szumo@wikia-inc.com>
Date:   Tue Feb 26 13:32:44 2013 +0000

    Phalanx: Removing forced reload test

commit b765a3b6f7faac9fc36e26b5e8693b574def12b1
Author: moliwikia <moli@wikia-inc.com>
Date:   Mon Feb 25 17:00:50 2013 +0000

    added hook to toplist class to check title in phalanx + bugs fixed

commit 42e5154f64a8c4eb7483f3e9767da9d8e68a267f
Author: macbre <maciej.brencz@gmail.com>
Date:   Mon Feb 25 11:46:28 2013 +0100

    LogEventsList: ugly fix for a notice

commit 4486ab3594f3338707a0a9c8875489b6b7244911
Author: Szumo <szumo@wikia-inc.com>
Date:   Thu Feb 21 18:35:54 2013 +0100

    BLAC-51

commit 257d731c79f5740c57a686e4105f9fcb6994540d
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Feb 19 17:33:27 2013 +0100

    gw.config.js: fix IE8 issue

commit 7b2038c8d0bce9d0d5355b55a83d6420d7e9aa7c
Author: moliwikia <moli@wikia-inc.com>
Date:   Thu Feb 21 16:18:38 2013 +0000

    fixed errors in service + models

commit 73dcd815326cbcbe0c612a11ec01a3c7c7f486cb
Author: moliwikia <moli@wikia-inc.com>
Date:   Thu Feb 21 16:02:12 2013 +0000

    class Service extends WikiaObject

commit 678c5e08a36d3b9aca52bb3bb46eff406a9a80d5
Author: moliwikia <moli@wikia-inc.com>
Date:   Thu Feb 21 14:48:50 2013 +0000

    typo fix

commit 07822a8194b300615b098b73cf7bdac84334183b
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 21 15:41:07 2013 +0100

    PhalanxPager: fix a notice

commit a74b90d23a345d2764401009f21445d25c9c2d97
Author: moliwikia <moli@wikia-inc.com>
Date:   Thu Feb 21 14:36:27 2013 +0000

    remove unused block (recent questions on Answers)

commit 5a6ad703a8dbc4e5cdb8a60248a7b094624d0241
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 16:43:22 2013 +0100

    WikiaTracker: define dependency on wikia.log

    Backporting to dev - #446

commit 63559490c29b6c02cebaf668ae56c9a1a23570f1
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 17:44:41 2013 +0100

    Unit tests: remove dependency on config.xml file

commit b8dc3131c5d9f3b2a3e061c2c91afe942fe38af2
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 17:35:41 2013 +0100

    Unit tests: add phpunit.xml to the repo

commit 020fa2eeda2237b656c6ca91328124e63014b5d1
Author: Krzysztof Krzyżaniak (eloy) <eloy@wikia-inc.com>
Date:   Wed Feb 20 16:19:43 2013 +0100

    create configuration for devboxes

commit 5732daad74f3b84c35e4b3ec05ed1a8eab33a9c0
Merge: 9f1f11b 139d723
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 21 14:03:00 2013 +0100

    Merge branch 'blac-53' into phalanx-redoux

commit 139d723becd4d169ecf74af920cca5c1ff0295d9
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 21 14:02:28 2013 +0100

    BLAC-53: PhalanxSpecial page - parameter wpPhalanxTypeFilter doesn't work

commit 9f1f11b7b6056290bd94cf94a1cee80fb609996c
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 21 13:50:39 2013 +0100

    Special:Phalanx - set a proper error message when trying to add an empty block

commit 28685100771ed823735f9467e776516545a0019c
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 21 11:51:08 2013 +0100

    Special:PhalanxStats:
     * add polish i18n
     * show full URLs on help page

commit ee9879014592636cd4e29851dfc732329158fde6
Author: macbre <maciej.brencz@gmail.com>
Date:   Thu Feb 21 11:14:41 2013 +0100

    BLAC-17:
    * UI improvements for Special:PhalanxStats
    * PHP lint hinting

commit 6073f8f19ce3545f8751af0f69c914bfc2a909d4
Merge: 48008be 23fd46e
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 16:16:04 2013 +0100

    Merge branch 'blac-17' into phalanx-redoux

commit 23fd46e48da7e04154220a3761c6875a1a05d543
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 16:14:34 2013 +0100

    Special:Phalanx - support "type" param in URL

commit 31a910cfe5cfef8c593f8b7d8c39cbaaa1e0ce2a
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 16:14:06 2013 +0100

    PhalanxService: a bit of PHP lint hinting

commit 48008beec2bd30ec7f3d147290f66048aeef3888
Author: moliwikia <moli@wikia-inc.com>
Date:   Wed Feb 20 15:05:09 2013 +0000

    fixed user block + added additional messages to the login form

commit ba440e65096b94fe0ddd0985698f06a9f3655404
Merge: 08b49e3 a1f9d61
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 15:33:52 2013 +0100

    Merge branch 'blac-17' into phalanx-redoux

commit a1f9d613833ec478d0e6efa9e155b9f0f4ce87db
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 15:33:19 2013 +0100

    PhalanxStats: fix cells ordering

commit 08b49e349a3ca025a6911f0b0543dfe0a7fa836a
Merge: 66ff72c 0058a84
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 13:18:33 2013 +0100

    Merge branch 'blac-17' into phalanx-redoux

commit 0058a847cb07303d65e9a6161cfadbefb134eca8
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 13:17:48 2013 +0100

    Special:Phalanx - show different message when editing / adding a block

commit 66ff72c7187d1b1315f1d33a26359c4e1114be8d
Merge: c6ae2a8 ba2fd08
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 12:57:44 2013 +0100

    Merge branch 'blac-17' into phalanx-redoux

commit ba2fd08cac0d0dfdf5915c8d7affc52660b402dd
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 12:57:08 2013 +0100

    Use mw.msg instead of JSMessages

commit c6ae2a866fa63a6944698a3b101ab3edb952b035
Merge: f8fe568 9122730
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 12:42:05 2013 +0100

    Merge branch 'blac-17' into phalanx-redoux

commit 912273075a1d66f540f7a6c11a76633748ba0b86
Author: macbre <maciej.brencz@gmail.com>
Date:   Wed Feb 20 12:41:15 2013 +0100

    * redirect when adding / editing a block
    * show feedback message in a new fancy way

commit f8fe568ec5cff676baf6512b20390a489c9aa15c
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Feb 19 18:26:48 2013 +0100

    Remove bullets from block list

commit a8e28c2bd26b31a7ec200ef3612c6947c97fe64e
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Feb 19 18:26:48 2013 +0100

    Remove bullets from block list

commit 13069a90c0bbaa11311bb2bea432fac81de6725b
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Feb 19 18:00:23 2013 +0100

    Add "Single mode" button to switch back from bulk mode

commit 4817bb77331197e87bb931a407e2a0dca78d7aba
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Feb 19 18:00:23 2013 +0100

    Add "Single mode" button to switch back from bulk mode

commit 1f89fb86c44bdd1292383e8eef42e2caa574181b
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Feb 19 17:33:27 2013 +0100

    gw.config.js: fix IE8 issue

commit 44f3fc212e88377a1beb361693cbfb10c27a793f
Author: moliwikia <moli@wikia-inc.com>
Date:   Tue Feb 19 15:29:42 2013 +0000

    fixed names of type blocks, remove old Phalanx class

commit a85c1944f6ed044071b1edcdddbae00114fe41bb
Merge: b82c2eb b036b61
Author: macbre <maciej.brencz@gmail.com>
Date:   Tue Feb 19 14:25:05 2013 +0100

    Merge branch 'blac-17' into phalanx-redoux

commit b82c2ebeaa53cf6bd36bd0ecc184c48d29f01f3e
Author: moliwikia <moli@wikia-inc.com>
Date:   Tue Feb 19 12:09:32 2013 +0000

    fixed PhalanxHooks class

commit a7db683b2afd5b99a73c039441340ddc6d2b0bd6
Author: moliwikia <moli@wikia-inc.com>
Date:   Tue Feb 19 11:51:40 2013 +0000

    fixed block message

commit 605f9b1bd3347e3af860f83b78779dbb68d2c8e1
Author: moliwikia <moli@wikia-inc.com>
Date:   Tue Feb 19 11:40:40 2013 +0000

    fixed title block