Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cherry-picked from 781f6731122cf622bcdf64441d247b5e37a2c3d0
|
|
js items
|
|
|
|
|
|
(part of 031d20c4 on master, Error was: Uncaught ReferenceError: inspect is not defined)
|
|
because of timing issues
(cherry picked from commit 6c6c4821c5a28df7d80cc414a7cf64025859c194)
|
|
(part of f235957d on master)
|
|
(part of f35d4339 on master)
|
|
(cherry picked from commit bf4b31eae07e4c7debf391f90a163b01b0e8c930)
|
|
(cherry picked from commit c8682f71ca510b63d67bcf5c28e29992bfed94f2)
|
|
In order to avoid segfaulting tests
(cherry picked from commit b682cf8ede7f60d770d39b1d48e6f15fd796774b)
|
|
(cherry picked from commit 891ed122447ca88938b150da9858d6d4c271d020)
|
|
(cherry picked from commit 064bf94147a90234007c8a124ba7bd9fc27fc0cd)
|
|
(cherry picked from commit 071f22c5c038c962823af003a28663d0d2734a16)
|
|
#524)
(cherry picked from commit 8e07d0781150206fae722d9b9dcbdafd727665f6)
|
|
(cherry picked from commit 37a1d886c6960080bbd03cad757c722b494a0220)
|
|
(cherry picked from commit 5cd010cb008b6e28988de5a5b7e9e769eea80907)
Conflicts:
framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
|
|
(cherry picked from commit b4599f7b557902f6a3eb7aaa7facb86c9d1349cc)
|
|
(cherry picked from commit b438554637e082544d2288e5c3654448c2f53683)
|
|
(cherry picked from commit c66097eac2c2691bf0047829275962ec0bf2b41f)
|
|
(cherry picked from commit f95623e43ce5829b91d1fde0e7978aca96e3e936)
|
|
(cherry picked from commit 3abca1f10ace63b2daa93870f17049c047b53abe)
|
|
(cherry picked from commit f550fd22072fb189762d45d8e9f077423c439c6b)
|
|
This allows derived classes to override the method's implementation
(cherry picked from commit 69f6eddaba7425392e5d0f7893155390eda244fc)
|
|
(cherry picked from commit 6784c512fdccd03aee8864b7c94758909d3cd3d0)
|
|
prado-cli.php moved to /bin(cherry picked from commit 888f241829e8922e95c5c925a192a50fe34264cd)
Conflicts:
demos/quickstart/protected/pages/GettingStarted/CommandLine.page
|
|
prado-cli.php moved to /bin(cherry picked from commit 00bc3da51fbc0a6231d08c85a44df5762f9c5545)
|
|
(cherry picked from commit e2fb2ab1e2b5925f16d4dd5c3ac514a0e54ee026)
Conflicts:
framework/Web/Javascripts/source/prado/controls/slider.js
|
|
(cherry picked from commit eaaa9da0c4912f782c3a1043b710ac1b598a41a5)
|
|
(cherry picked from commit 68bbb645ba5be61c2e3024ac3943c7346b30f1f2)
Conflicts:
tests/FunctionalTests/tickets/tests/Ticket587TestCase.php
tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
|
|
(cherry picked from commit 4e15c84379b99434515c119b72a6c8afcbf917dd)
|
|
(cherry picked from commit 3d0ecbdc3141740be8d9ddda0a2c6f293dbc099c)
|
|
(cherry picked from commit b2de810e574634c3b443ff5c5ccef5879e3caffd)
Conflicts:
framework/Web/UI/TClientScriptManager.php
|
|
(cherry picked from commit 4ce02f6973aa40c313364b5ff7990f2244309790)
Conflicts:
tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
tests/FunctionalTests/tickets/tests/Ticket769TestCase.php
tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php
tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php
tests/FunctionalTests/validators/tests/DatePickerTestCase.php
|
|
compatibility layer
(cherry picked from commit 82774aa0a41562a325f31c901584ec01c8238573)
Conflicts:
tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php
tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php
tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
tests/FunctionalTests/tickets/tests/Ticket769TestCase.php
tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php
|
|
browser's quirks mode
(cherry picked from commit a0d6864093cf13a96dafa8a47b5c43891b2b864f)
Conflicts:
tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page
tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
|
|
(cherry picked from commit b340ed9cc57f327785ebc0c1b8fb725ffb02d647)
|
|
(cherry picked from commit ae7a187ec50d2a4d68fc9b22acf7d46660eca402)
|
|
(cherry picked from commit 410af66fc8843177bb68561e556d7bd51c4d71c1)
Conflicts:
tests/FunctionalTests/tickets/tests/Ticket769TestCase.php
|
|
sent; send error trace in the body, since headers are limited in size
(cherry picked from commit 0700ac0eb6d1cb884ca6d568f798ed785c38e908)
|