You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2014/10/13 07:50:41 UTC

[1/5] git commit: [flex-tlf] [refs/heads/FlexUnit4TestsTLF] - minor comment change so it's actually correct

Repository: flex-tlf
Updated Branches:
  refs/heads/FlexUnit4TestsTLF 0ca7dea0f -> 620baf268


minor comment change so it's actually correct


Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/cc353539
Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/cc353539
Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/cc353539

Branch: refs/heads/FlexUnit4TestsTLF
Commit: cc353539893f21644b54e5f3f2c021331cc982fc
Parents: 592b45f
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Aug 25 22:59:49 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Aug 25 22:59:49 2014 +1000

----------------------------------------------------------------------
 .../src/flashx/textLayout/conversion/TextFieldHtmlImporter.as      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/cc353539/textLayout/src/flashx/textLayout/conversion/TextFieldHtmlImporter.as
----------------------------------------------------------------------
diff --git a/textLayout/src/flashx/textLayout/conversion/TextFieldHtmlImporter.as b/textLayout/src/flashx/textLayout/conversion/TextFieldHtmlImporter.as
index 34cc5e7..8a5e778 100644
--- a/textLayout/src/flashx/textLayout/conversion/TextFieldHtmlImporter.as
+++ b/textLayout/src/flashx/textLayout/conversion/TextFieldHtmlImporter.as
@@ -829,7 +829,7 @@ package flashx.textLayout.conversion
 			parseChildrenUnderNewActiveFormatWithImpliedParaFormat (importer, xmlToParse, parent, newFormat);
 		}
 		
-		/** Parse the <b> formatting element
+		/** Parse the <s> formatting element
 		 * Calculates the new format to apply to _activeFormat and continues parsing down the hierarchy
 		 * @private
 		 */


[3/5] git commit: [flex-tlf] [refs/heads/FlexUnit4TestsTLF] - Merge branch 'FlexUnit4TestsTLF' into develop

Posted by pi...@apache.org.
Merge branch 'FlexUnit4TestsTLF' into develop


Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/0b579456
Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/0b579456
Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/0b579456

Branch: refs/heads/FlexUnit4TestsTLF
Commit: 0b579456e44aa04488e999c6293e1f004b2ece5e
Parents: e57200c 7961f33
Author: piotrz <pi...@gmail.com>
Authored: Sun Oct 12 23:15:34 2014 +0200
Committer: piotrz <pi...@gmail.com>
Committed: Sun Oct 12 23:15:34 2014 +0200

----------------------------------------------------------------------
 automation_tests/src/AllTestsSuite.as           |   13 +-
 automation_tests/src/MinimalTestsSuite.as       |    4 +-
 .../UnitTest/Tests/BoundsAndAlignmentTest.as    |  278 +--
 automation_tests/src/UnitTest/Tests/BoxTest.as  |   51 +-
 .../src/UnitTest/Tests/ContainerTypeTest.as     |    8 -
 .../src/UnitTest/Tests/CrossContainerTest.as    |  430 ++--
 .../src/UnitTest/Tests/ElementOperationTest.as  | 1192 +++++++++++
 .../src/UnitTest/Tests/ElementOperationTests.as | 1228 -----------
 .../src/UnitTest/Tests/EventOverrideTest.as     |  905 +++------
 .../src/UnitTest/Tests/FactoryImportTest.as     |  250 +--
 .../src/UnitTest/Tests/FloatTest.as             |   84 -
 .../src/UnitTest/Tests/FlowModelTest.as         | 1920 +++++++++---------
 12 files changed, 2845 insertions(+), 3518 deletions(-)
----------------------------------------------------------------------



[4/5] git commit: [flex-tlf] [refs/heads/FlexUnit4TestsTLF] - Merge branch 'FlexUnit4TestsTLF' into develop

Posted by pi...@apache.org.
Merge branch 'FlexUnit4TestsTLF' into develop


Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/3a4075c0
Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/3a4075c0
Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/3a4075c0

Branch: refs/heads/FlexUnit4TestsTLF
Commit: 3a4075c0060b0402c904a7346cd5fea219d2d914
Parents: 0b57945 895152c
Author: piotrz <pi...@gmail.com>
Authored: Sun Oct 12 23:51:51 2014 +0200
Committer: piotrz <pi...@gmail.com>
Committed: Sun Oct 12 23:51:51 2014 +0200

----------------------------------------------------------------------
 automation_core/src/AutomationCoreClasses.as                   | 2 ++
 automation_core/src/UnitTest/ExtendedClasses/VellumTestCase.as | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[2/5] git commit: [flex-tlf] [refs/heads/FlexUnit4TestsTLF] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-tlf into develop

Posted by pi...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-tlf into develop


Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/e57200c5
Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/e57200c5
Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/e57200c5

Branch: refs/heads/FlexUnit4TestsTLF
Commit: e57200c50657232269871ab6268c74ce8ffd38d4
Parents: 6cc1110 cc35353
Author: piotrz <pi...@gmail.com>
Authored: Sun Oct 5 11:02:04 2014 +0200
Committer: piotrz <pi...@gmail.com>
Committed: Sun Oct 5 11:02:04 2014 +0200

----------------------------------------------------------------------
 .../src/flashx/textLayout/conversion/TextFieldHtmlImporter.as      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[5/5] git commit: [flex-tlf] [refs/heads/FlexUnit4TestsTLF] - Merge branch 'FlexUnit4TestsTLF' into develop

Posted by pi...@apache.org.
Merge branch 'FlexUnit4TestsTLF' into develop


Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/620baf26
Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/620baf26
Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/620baf26

Branch: refs/heads/FlexUnit4TestsTLF
Commit: 620baf26855c28308c9f409a4fa2ce046369063d
Parents: 3a4075c 0ca7dea
Author: piotrz <pi...@gmail.com>
Authored: Mon Oct 13 07:46:29 2014 +0200
Committer: piotrz <pi...@gmail.com>
Committed: Mon Oct 13 07:46:29 2014 +0200

----------------------------------------------------------------------
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------