flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject [19/35] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' into feature/fontawesome
Date Tue, 10 Jan 2017 08:25:10 GMT
Merge branch 'develop' into feature/fontawesome

# Conflicts:
#	frameworks/build.xml


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

Branch: refs/heads/develop
Commit: 4818e6d830738af1c32b5b44923c587f1e92f496
Parents: 7999699 b7a833d
Author: piotrz <piotrz@apache.org>
Authored: Thu Jan 5 11:29:18 2017 +0100
Committer: piotrz <piotrz@apache.org>
Committed: Thu Jan 5 11:29:18 2017 +0100

----------------------------------------------------------------------
 .../main/resources/archetype-resources/pom.xml  |  57 ++++++-
 .../pom.xml                                     |  36 ++++
 .../main/resources/META-INF/maven/archetype.xml |  27 +++
 .../archetype-resources/.mvn/extensions.xml     |  30 ++++
 .../main/resources/archetype-resources/pom.xml  | 141 ++++++++++++++++
 .../archetype-resources/src/main/flex/App.mxml  |  30 ++++
 .../pom.xml                                     |  42 +++++
 .../main/resources/META-INF/maven/archetype.xml |  27 +++
 .../archetype-resources/.mvn/extensions.xml     |  30 ++++
 .../main/resources/archetype-resources/pom.xml  |  84 ++++++++++
 .../archetype-resources/src/main/flex/App.mxml  |  30 ++++
 archetypes/pom.xml                              |   2 +
 examples/express/DataBindingExample/README.txt  |  53 ++++++
 examples/express/DataBindingExample/build.xml   |  46 ++++++
 examples/express/DataBindingExample/pom.xml     |  75 +++++++++
 .../src/main/flex/DataBindingExample.mxml       |  51 ++++++
 .../src/main/flex/MyInitialView.mxml            | 132 +++++++++++++++
 .../src/main/flex/StockDataJSONItemConverter.as |  40 +++++
 .../src/main/flex/controllers/MyController.as   |  92 +++++++++++
 .../src/main/flex/models/MyModel.as             | 125 ++++++++++++++
 examples/flexjs/DataGridExample/build.xml       |  12 ++
 .../flexjs/MDLExample/src/main/flex/Lists.mxml  |   2 +-
 .../MDLExample/src/main/flex/MainFooter.mxml    |  44 +++++
 .../src/main/flex/MainNavigation.mxml           |   9 +-
 .../flexjs/MDLExample/src/main/flex/Tabs.mxml   | 108 +++++++++---
 .../CustomTabBarPanelItemRenderer.mxml          |  36 ++++
 .../FooterMiniLinkListItemRenderer.mxml         |  32 ++++
 .../src/main/flex/models/FooterModel.as         |  40 +++++
 .../src/main/flex/models/TabsModel.as           |  49 ++++++
 .../MDLExample/src/main/flex/vos/TabVO.as       |  34 ++++
 .../src/main/resources/mdl-styles.css           |  15 ++
 frameworks/build.xml                            |   6 +
 .../Express/src/main/flex/ExpressClasses.as     |   1 +
 .../flex/org/apache/flex/express/TextInput.as   | 117 +++++++++++++
 .../Express/src/main/resources/defaults.css     |   8 +
 .../src/main/resources/express-manifest.xml     |   1 +
 .../DataItemRendererFactoryForArrayData.as      |  14 +-
 .../src/main/flex/MDLClasses.as                 |   4 +-
 .../org/apache/flex/mdl/FooterBottomSection.as  | 108 ++++++++++++
 .../org/apache/flex/mdl/FooterLeftSection.as    |   3 +-
 .../flex/org/apache/flex/mdl/FooterLinkList.as  | 108 ++++++++++++
 .../main/flex/org/apache/flex/mdl/FooterLogo.as |  99 +++++++++++
 .../org/apache/flex/mdl/FooterRightSection.as   |   3 +-
 .../org/apache/flex/mdl/FooterTopSection.as     | 108 ++++++++++++
 .../src/main/flex/org/apache/flex/mdl/TabBar.as |  72 +++++++-
 .../src/main/flex/org/apache/flex/mdl/Tabs.as   |  67 +++++++-
 .../TabsItemRendererFactoryForArrayData.as      | 164 +++++++++++++++++++
 .../apache/flex/mdl/beads/models/ITabModel.as   |  39 +++++
 .../apache/flex/mdl/beads/models/TabModel.as    |  42 +++++
 .../apache/flex/mdl/beads/views/TabBarView.as   |  28 ++++
 .../org/apache/flex/mdl/beads/views/TabsView.as |  28 ++++
 .../mdl/itemRenderers/FooterLinkItemRenderer.as | 124 ++++++++++++++
 .../TabBarButtonLayoutItemRenderer.as           |  46 ++++++
 .../TabBarButtonTabsItemRenderer.as             |  46 ++++++
 .../itemRenderers/TabBarLayoutItemRenderer.as   |  56 +++++++
 .../itemRenderers/TabBarPanelItemRenderer.as    |  56 +++++++
 .../flex/mdl/supportClasses/IFooterSection.as   |  28 ++++
 .../flex/mdl/supportClasses/ITabItemRenderer.as |  31 ++++
 .../TabBarButtonItemRendererBase.as             | 108 ++++++++++++
 .../mdl/supportClasses/TabItemRendererBase.as   |  87 ++++++++++
 .../src/main/resources/defaults.css             |  25 +++
 .../src/main/resources/mdl-manifest.xml         |  23 ++-
 62 files changed, 3126 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4818e6d8/frameworks/build.xml
----------------------------------------------------------------------
diff --cc frameworks/build.xml
index 638ccb1,1b4154c..97066c2
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@@ -98,7 -98,7 +98,8 @@@
          <antcall target="Storage"/>
          <antcall target="XML"/>
  		<antcall target="MaterialDesignLite"/>
 +		<antcall target="FontAwesome"/>
+ 		<antcall target="Express"/>
      </target>
      
      <target name="fonts">


Mime
View raw message