[gatein-pull-requests] [gatein/gatein-portal] d33a56: EXOGTN-1669 [Edit-Inplace] Keep page's parameters ...

Branch: refs/heads/4.0.0 Home: https://github.com/gatein/gatein-portal Commit: d33a5673ab67c7e83e0398ee254c92c0867133f9 https://github.com/gatein/gatein-portal/commit/d33a5673ab67c7e83e0398ee25... Author: phuong_vu <phuong.vu(a)exoplatform.com&gt; Date: 2013-12-06 (Fri, 06 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/layout/RenderingContext.java M portal/web/src/main/java/org/gatein/portal/web/layout/ZoneLayout.java M portal/web/src/main/java/org/gatein/portal/web/package-info.java M portal/web/src/main/java/org/gatein/portal/web/page/Controller.java M portal/web/src/main/java/org/gatein/portal/web/page/PageEditor.java M portal/web/src/main/java/org/gatein/portal/web/tags/window.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/shared.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/site.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_column.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_row_2_columns.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_1_row.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_70_30.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_3_columns.gtmpl M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- EXOGTN-1669 [Edit-Inplace] Keep page's parameters when switching edit mode Commit: d2edbfcd77f4a33e2bce83a2884f7143e83aa797 https://github.com/gatein/gatein-portal/commit/d2edbfcd77f4a33e2bce83a288... Author: phuong_vu <phuong.vu(a)exoplatform.com&gt; Date: 2013-12-08 (Sun, 08 Dec 2013) Changed paths: M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- EXOGTN-1669 refresh page when cancel edit page Commit: 577e9e0e733a78139e01d9f4b4d69d8092faed18 https://github.com/gatein/gatein-portal/commit/577e9e0e733a78139e01d9f4b4... Author: haint <haithanh0809(a)gmail.com&gt; Date: 2013-12-09 (Mon, 09 Dec 2013) Changed paths: M portal/web/src/main/java/org/gatein/portal/web/assets/editor.css M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- Should not allow to interact with App when editing page Commit: b28f294d4cb80c6692b6b4331539e3a5c032c9e3 https://github.com/gatein/gatein-portal/commit/b28f294d4cb80c6692b6b43315... Author: phuong_vu <phuong.vu(a)exoplatform.com&gt; Date: 2013-12-10 (Tue, 10 Dec 2013) Changed paths: M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-model.js Log Message: ----------- EXOGTN-1668 [Edit-Inplace] Improve JS for page's composer Commit: cff92e80d418c568eb6be715a9ed091d042a26af https://github.com/gatein/gatein-portal/commit/cff92e80d418c568eb6be715a9... Author: haint <haithanh0809(a)gmail.com&gt; Date: 2013-12-10 (Tue, 10 Dec 2013) Changed paths: M portal/web/src/main/java/org/gatein/portal/web/assets/editor.css M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js Log Message: ----------- Lost window masklayer after switching layout Commit: db6463e56cdaf04347462856dd98970477fad981 https://github.com/gatein/gatein-portal/commit/db6463e56cdaf04347462856dd... Author: nttuyen <tuyennt(a)exoplatform.com&gt; Date: 2013-12-11 (Wed, 11 Dec 2013) Changed paths: M portal/web/src/main/java/org/gatein/portal/web/page/Controller.java M portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-model.js Log Message: ----------- Edit Inplace: fixbug lost params when rendering new content Commit: 00d112899a357c83e1f37cb297b3c3e3f8523095 https://github.com/gatein/gatein-portal/commit/00d112899a357c83e1f37cb297... Author: Julien Viet <julien(a)julienviet.com&gt; Date: 2013-12-12 (Thu, 12 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/layout/RenderingContext.java M portal/web/src/main/java/org/gatein/portal/web/layout/ZoneLayout.java M portal/web/src/main/java/org/gatein/portal/web/package-info.java M portal/web/src/main/java/org/gatein/portal/web/page/Controller.java M portal/web/src/main/java/org/gatein/portal/web/page/PageEditor.java M portal/web/src/main/java/org/gatein/portal/web/tags/window.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/shared.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/site.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_column.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_row_2_columns.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_1_row.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_70_30.gtmpl M portal/web/src/main/java/org/gatein/portal/web/templates/zone_3_columns.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: ----------- Merge remote-tracking branch 'exo/4.0.0-edit-inline' into 4.0.0 Commit: 8e4f16f08f43ac3819790974502f1cbe10da990d https://github.com/gatein/gatein-portal/commit/8e4f16f08f43ac381979097450... Author: Julien Viet <julien(a)julienviet.com&gt; Date: 2013-12-12 (Thu, 12 Dec 2013) Changed paths: M portal/appzu/src/test/java/org/gatein/portal/appzu/AppZuTestCase.java Log Message: ----------- Disabled dot files tests for now Compare: https://github.com/gatein/gatein-portal/compare/d8e5b2f3c585...8e4f16f08f43