Skip to content
This repository was archived by the owner on Mar 14, 2020. It is now read-only.

Integration 20120828 #263

Closed
zhizhangchen wants to merge 52 commits into from
Closed

Integration 20120828 #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
900adda
[ADM] Fix bug: ID auto numbering occurring in reverse.
Aug 24, 2012
ad496c5
[Widgets] Added event properties to widgets.
Aug 17, 2012
43e43ed
[ADM] Added force argument for generateUniqueProperty()
Aug 22, 2012
423c81b
[General] Implemented event handler feature.
Jul 19, 2012
129925f
[General] Create new one for no project case when tab changing
DonnaWuDongxia Aug 27, 2012
1173c44
[Widgets] Force ButtonGroup in Footer horizontal
zhizhangchen Aug 27, 2012
2731add
[Widgets] Add list widgets
Jul 31, 2012
9dec291
[Widgets] Allow subtype to be treated as base type in type list checking
zhizhangchen Aug 1, 2012
17d387d
[ADM] Support child type morphing
zhizhangchen Aug 1, 2012
a477f4b
[ADM] Add max and min limit of cardinality
zhizhangchen Aug 1, 2012
268ea3a
[Widgets] Extend zones more gracefully
zhizhangchen Aug 3, 2012
1aada2e
[Widgets] Enable using function as a zone's "allow" field
zhizhangchen Aug 6, 2012
ed3f783
[Widgets] Implement list widgets using generic item and button
Jul 31, 2012
7293aaa
[Widgets] Implement ordered list as a property of ListBase
zhizhangchen Aug 7, 2012
932292c
[Widgets] Change name of SimpleSplitList to ButtonSplitList
zhizhangchen Aug 7, 2012
031e5cb
[Widgets] Introduce default htmlSelector
zhizhangchen Aug 7, 2012
d9b43c7
[Widgets] Extract text property to BCommonProperties
zhizhangchen Aug 7, 2012
e53c273
[Widgets] Collapse split list button into SplitListItem
zhizhangchen Aug 7, 2012
eb1a208
[Widgets] Collapse list button into ListItem
Aug 8, 2012
c79083f
[Widgets] Introduce multiple inheritance
zhizhangchen Aug 8, 2012
ac4f62f
[Widgets] Use multiple inheritance to implement split list widgets
zhizhangchen Aug 8, 2012
fa9ccea
[Widgets] Remove unused svg files and display labels
zhizhangchen Aug 9, 2012
5cc4870
[Widgets] Enable count bubble on all list types
zhizhangchen Aug 21, 2012
ea722c1
[FileIO] Support themes in root directory of sandbox when exporting
DonnaWuDongxia Aug 21, 2012
73aeba8
[General] Add inSandbox flag for uploadable widget
DonnaWuDongxia Aug 21, 2012
f281313
[Layout View] Revert css changes in 8ee0558e
zhizhangchen Aug 22, 2012
0c82072
[Property View] Added hover effect to delete button.
Aug 27, 2012
0f0b49a
[Tree View] Fix bug: When moving a selected node, outline view loses …
zhizhangchen Aug 28, 2012
6ef873a
[ADM] Use moveNode to insert child if old parent is not null
zhizhangchen Aug 24, 2012
61d9b5f
[Layout View] Use a new algorithm for sorting
zhizhangchen Aug 24, 2012
1b8d6b4
[Layout View] Fix focus styling problem
zhizhangchen Aug 27, 2012
301bdca
[Widgets] Change iconsrc property to icon
zhizhangchen Aug 27, 2012
23ede69
[Property View] Remain focus when press tab key
maxyu Aug 28, 2012
5fac276
[Property View] Highlight changed property
maxyu Aug 21, 2012
ce58ed0
[Project] support add minified version of the theme
xuzhang Aug 23, 2012
03286a4
[Project] Add a confirm Dialog to verify whether replace theme file
xuzhang Aug 27, 2012
70bc16a
[General] add the third party file to extract zip file
xuzhang Aug 23, 2012
1d619f9
[FileIO] Add zip type as acceptable uploaded file types
xuzhang Aug 23, 2012
04fa1e6
[Project] refactor uploadTheme function to supprt zip file
xuzhang Aug 24, 2012
da3bd90
Merge remote branch 'maxyu/highlight' into integration-20120828
zhizhangchen Aug 28, 2012
fe4df8f
Merge remote branch 'maxyu/focus2' into integration-20120828
zhizhangchen Aug 28, 2012
c816451
Merge remote branch 'DonnaWuDongxia/deleteProject' into integration-2…
zhizhangchen Aug 28, 2012
c1b4f93
Merge branch 'outline-view-lost-selection-when-moving-node' into inte…
zhizhangchen Aug 28, 2012
0e272dd
Merge remote branch 'xuqingkuang/deleteButtonHover' into integration-…
zhizhangchen Aug 28, 2012
e8d0239
Merge branch 'forbid-vertical-buttongroup-in-footer' into integration…
zhizhangchen Aug 28, 2012
9523d79
Merge remote branch 'xuqingkuang/fixIDReverse' into integration-20120828
zhizhangchen Aug 28, 2012
a099e43
Merge remote branch 'origin/list-widgets-generic-multi-inheritance' i…
zhizhangchen Aug 28, 2012
cf1b3bf
Merge remote branch 'xuqingkuang/eventHandlerInADM' into integration-…
zhizhangchen Aug 28, 2012
cd09dd4
[Preperty View] Fix bug: using illegal values results in silent failure
zeroooing Aug 28, 2012
1e4587b
Merge remote branch 'smallertomato/PropertyView' into integration-201…
zhizhangchen Aug 28, 2012
3f1857b
[Property View] Fix bug: Grid uses two types of form widget for interger
zeroooing Aug 28, 2012
5d77acd
Merge remote branch 'smallertomato/GridView' into integration-20120828
zhizhangchen Aug 28, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ Haverbeke
Intel src/js/codeview-mode.js APLV2 N/A
Arnaud
Renevier lib/zipfile.js Modified BSD[17]
Arnaud
Renevier lib/deflate.js MIT/X11 [21]

Unreleased/Unpackaged Files (build/debug/development)
=====================================================
Expand Down Expand Up @@ -114,3 +116,4 @@ Notes:
[18] http://www.bramstein.com/projects/jlayout/
[19] http://www.bramstein.com/projects/jsizes/
[20] http://code.google.com/chrome/extensions/crx.html
[21] https://github.com/arenevier/zipfile/blob/master/external/deflate.js
1 change: 1 addition & 0 deletions README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ src/css/web-ui-fw-theme.css MIT Intel
src/css/web-ui-fw-widgets.css MIT Intel
lib/jszip.js MIT or GPLv3 Stuart Knightley[5]
lib/zipfile.js Modified BSD Arnaud Renervier[6]
lib/deflate.js MIT/X11 Arnaud Renervier[6]
lib/CodeMirror-2.21/LICENSE BSD-like Marijn Haverbeke
lib/CodeMirror-2.21/lib/codemirror.css BSD-like Marijn Haverbeke
lib/CodeMirror-2.21/lib/codemirror.js BSD-like Marijn Haverbeke
Expand Down
3 changes: 2 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<body class="vbox fullsize">
<script src="lib/jquery-1.6.4.min.js"></script>
<script src="lib/jquery-ui-1.8.16.custom.min.js"></script>
<script src="src/js/jquery-workarounds.js"></script>
<script src="src/js/msg-box.js"></script>
<script src="src/js/widgets.js"></script>
<script src="src/js/adm.js"></script>
Expand All @@ -34,7 +35,6 @@
<script src="src/js/projects.js"></script>
<script src="src/js/serialize.js"></script>
<!-- New stuff from here ... -->
<script src="src/js/jquery-workarounds.js"></script>
<script src="src/js/jquery-plugins.js"></script>
<script src="src/js/views/base.js"></script>
<script src="src/js/views/tree.js"></script>
Expand All @@ -52,6 +52,7 @@
<!-- ... to here -->
<script src="lib/beautify.js"></script>
<script src="lib/beautify-html.js"></script>
<script src="lib/deflate.js"></script>
<script src="lib/jszip.js"></script>
<script src="lib/zipfile.js"></script>
<script src="lib/CodeMirror-2.21/lib/codemirror.js"></script>
Expand Down
Loading