[gatein-pull-requests] [gatein/gatein-portal] 4e2fac: Prototype for DnD local files

Branch: refs/heads/4.0.0 Home: https://github.com/gatein/gatein-portal Commit: 4e2facc8271f5d39d9d9c8efd42b7e07c8515a7d https://github.com/gatein/gatein-portal/commit/4e2facc8271f5d39d9d9c8efd4... Author: haint <haithanh0809(a)gmail.com&gt; Date: 2013-11-25 (Mon, 25 Nov 2013) Changed paths: M portal/web/src/main/java/org/gatein/portal/web/page/PageEditor.java M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- Prototype for DnD local files Commit: 1580cf5250f9eb308f323dc5335f0788356d4fbc https://github.com/gatein/gatein-portal/commit/1580cf5250f9eb308f323dc533... Author: nttuyen <tuyennt(a)exoplatform.com&gt; Date: 2013-11-25 (Mon, 25 Nov 2013) Changed paths: M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- fixbug: filter app in composer is not work on firefox Commit: 640e75ea00c8becc50ed00b05115f5dffae72b51 https://github.com/gatein/gatein-portal/commit/640e75ea00c8becc50ed00b051... Author: nttuyen <tuyennt(a)exoplatform.com&gt; Date: 2013-11-25 (Mon, 25 Nov 2013) Changed paths: M portal/web/src/main/java/org/gatein/portal/web/assets/editor.css A portal/web/src/main/resources/org/gatein/portal/web/assets/images/loading.gif M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- Filter application on composer: improve UXP Commit: d417ba0256e447703572ef2acc34d8100bc84733 https://github.com/gatein/gatein-portal/commit/d417ba0256e447703572ef2acc... Author: nttuyen <tuyennt(a)exoplatform.com&gt; Date: 2013-11-28 (Thu, 28 Nov 2013) Changed paths: M portal/web/src/main/java/org/gatein/portal/web/assets/editor.css M portal/web/src/main/java/org/gatein/portal/web/page/PageEditor.java M portal/web/src/main/java/org/gatein/portal/web/templates/site.gtmpl M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-model.js M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- Edit Inplace: Separated tab for each content provider in Composer Commit: 521fafc7e862c4f4870230eab1d97318bd9defa2 https://github.com/gatein/gatein-portal/commit/521fafc7e862c4f4870230eab1... Author: nttuyen <tuyennt(a)exoplatform.com&gt; Date: 2013-12-01 (Sun, 01 Dec 2013) Changed paths: M portal/web/src/main/java/org/gatein/portal/web/assets/editor.css M portal/web/src/main/java/org/gatein/portal/web/page/PageEditor.java M portal/web/src/main/java/org/gatein/portal/web/templates/site.gtmpl M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-model.js M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- Edit Inplace: use Controller.window to render portlet and improve tablayout in composer Commit: 414c21fe33510331d3771fb398dd73acfa22e47e https://github.com/gatein/gatein-portal/commit/414c21fe33510331d3771fb398... Author: Julien Viet <julien(a)julienviet.com&gt; Date: 2013-12-03 (Tue, 03 Dec 2013) Changed paths: M portal/web/src/main/java/org/gatein/portal/web/assets/editor.css M portal/web/src/main/java/org/gatein/portal/web/page/PageEditor.java M portal/web/src/main/java/org/gatein/portal/web/templates/site.gtmpl A portal/web/src/main/resources/org/gatein/portal/web/assets/images/loading.gif M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-model.js M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- Merge remote-tracking branch 'exo/4.0.0-edit-inline' into 4.0.0 Commit: b02c2223dc9a11a979ce08553436d3da3e6fc1f2 https://github.com/gatein/gatein-portal/commit/b02c2223dc9a11a979ce085534... Author: Julien Viet <julien(a)julienviet.com&gt; Date: 2013-12-03 (Tue, 03 Dec 2013) Changed paths: M component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java M component/common/src/test/java/org/exoplatform/commons/chromattic/SynchronizationEventQueue.java M component/common/src/test/java/org/exoplatform/commons/xml/TestXMLDeclarationParser.java M component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java M component/portal/src/test/java/org/exoplatform/portal/mop/management/exportimport/PageImportTaskTest.java M component/portal/src/test/java/org/gatein/portal/impl/mop/ram/TestContext.java M component/portal/src/test/java/org/gatein/portal/impl/mop/ram/TestedContext.java M component/portal/src/test/java/org/gatein/portal/mop/hierarchy/ModelNode.java M component/test/core/src/test/java/org/exoplatform/component/test/KernelRuleClassScopedTestCase.java M component/test/core/src/test/java/org/exoplatform/component/test/KernelRuleTestScopedTestCase.java M portal/web/src/test/java/org/gatein/portal/web/PortletDeploymentTestCase.java M portal/web/src/test/java/org/gatein/portal/web/SiteLayoutTestCase.java M portal/web/src/test/java/org/gatein/portal/web/page/EncoderTestCase.java M portal/web/src/test/java/org/gatein/portal/web/page/PortletPublicRenderParametersTestCase.java M portal/web/src/test/java/org/gatein/portal/web/page/PortletRenderParametersTestCase.java M portal/web/src/test/java/org/gatein/portal/web/page/PortletRenderURLTestCase.java M portal/web/src/test/java/org/gatein/portal/web/page/PortletResourceServingTestCase.java M portal/web/src/test/java/org/gatein/portal/web/page/PortletResourceURLTestCase.java Log Message: ----------- Change usage of junit.framework.Assert to org.junit.Assert Compare: https://github.com/gatein/gatein-portal/compare/77bab690c3fc...b02c2223dc9a