[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b43f4c: Expand the navigation and highlight the current da...

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b43f4c7fed71963e499ef7bf81cf24b3cc73cf9b https://github.com/phpmyadmin/phpmyadmin/commit/b43f4c7fed71963e499ef7bf81c… Author: Kasun Chathuranga &lt;chathuranga.jayaneththi(a)gmail.com&gt; Date: 2013-08-30 (Fri, 30 Aug 2013) Changed paths: M js/common.js M js/navigation.js M libraries/navigation/NavigationTree.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/navigation/Nodes/Node_Table_Container.class.php M libraries/navigation/Nodes/Node_View.class.php M libraries/navigation/Nodes/Node_View_Container.class.php M themes/original/css/navigation.css.php M themes/pmahomme/css/navigation.css.php Log Message: ----------- Expand the navigation and highlight the current database or table/view Commit: 6f29a89aec0a10d831117d5c9599656aafdfd144 https://github.com/phpmyadmin/phpmyadmin/commit/6f29a89aec0a10d831117d5c959… Author: Kasun Chathuranga &lt;chathuranga.jayaneththi(a)gmail.com&gt; Date: 2013-08-30 (Fri, 30 Aug 2013) Changed paths: M js/navigation.js Log Message: ----------- Make scrolling work for table/views as well Commit: 9c8267a9a8c7aaf53879fed0b70b996331c8ce44 https://github.com/phpmyadmin/phpmyadmin/commit/9c8267a9a8c7aaf53879fed0b70… Author: Kasun Chathuranga &lt;chathuranga.jayaneththi(a)gmail.com&gt; Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M js/common.js M js/sql.js Log Message: ----------- Properly open and select database when "Use <db>" command is issued Commit: e11573bc546045d63cf4136c8dff1d30fcf06341 https://github.com/phpmyadmin/phpmyadmin/commit/e11573bc546045d63cf4136c8df… Author: Dong-bum Kim &lt;dongbum(a)me.com&gt; Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 74.0% (1931 of 2609) Commit: dc3163974c2be51a75787912f270d9da3d46bcfa https://github.com/phpmyadmin/phpmyadmin/commit/dc3163974c2be51a75787912f27… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M po/ms.po Log Message: ----------- Translated using Weblate (Malay) Currently translated at 15.2% (397 of 2609) Commit: ee1e8f92643aa1b416cd7f4c97594fb359373a5d https://github.com/phpmyadmin/phpmyadmin/commit/ee1e8f92643aa1b416cd7f4c975… Author: shanyan baishui &lt;Siramizu(a)gmail.com&gt; Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Simplified Chinese) Currently translated at 99.0% (2582 of 2609) Commit: b91e9d12cfd505df0785a6d8e6f9b7b7773df984 https://github.com/phpmyadmin/phpmyadmin/commit/b91e9d12cfd505df0785a6d8e6f… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M po/te.po Log Message: ----------- Translated using Weblate (Telugu) Currently translated at 13.2% (345 of 2609) Commit: b1115ee504c71416e2385a6a31ef8828ae8035dc https://github.com/phpmyadmin/phpmyadmin/commit/b1115ee504c71416e2385a6a31e… Author: Weblate &lt;noreply(a)weblate.org&gt; Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M ChangeLog M export.php M libraries/common.inc.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 2ca79320ee5e56525a06de8d3aaeca928d8c2056 https://github.com/phpmyadmin/phpmyadmin/commit/2ca79320ee5e56525a06de8d3aa… Author: Marc Delisle &lt;marc(a)infomarc.info&gt; Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.6-rc2 Commit: 87e63d065150b60d2e9b74a1e37dc01134645501 https://github.com/phpmyadmin/phpmyadmin/commit/87e63d065150b60d2e9b74a1e37… Author: Atul Pratap Singh &lt;atulpratapsingh05(a)gmail.com&gt; Date: 2013-09-01 (Sun, 01 Sep 2013) Changed paths: M js/common.js M js/navigation.js M js/sql.js M libraries/navigation/NavigationTree.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/navigation/Nodes/Node_Table_Container.class.php M libraries/navigation/Nodes/Node_View.class.php M libraries/navigation/Nodes/Node_View_Container.class.php M themes/original/css/navigation.css.php M themes/pmahomme/css/navigation.css.php Log Message: ----------- Merge pull request #659 from kasunchathuranga/navSelect Expand the navigation and highlight the current database or table/view Commit: 9c47057449c9116e0e1b1de8540bd6544a2ddc89 https://github.com/phpmyadmin/phpmyadmin/commit/9c47057449c9116e0e1b1de8540… Author: shanyan baishui &lt;Siramizu(a)gmail.com&gt; Date: 2013-09-01 (Sun, 01 Sep 2013) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Simplified Chinese) Currently translated at 99.0% (2583 of 2609) Commit: 72090405e932335a06e02aa3d2d4954e10d42939 https://github.com/phpmyadmin/phpmyadmin/commit/72090405e932335a06e02aa3d2d… Author: Weblate &lt;noreply(a)weblate.org&gt; Date: 2013-09-01 (Sun, 01 Sep 2013) Changed paths: M js/common.js M js/navigation.js M js/sql.js M libraries/navigation/NavigationTree.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/navigation/Nodes/Node_Table_Container.class.php M libraries/navigation/Nodes/Node_View.class.php M libraries/navigation/Nodes/Node_View_Container.class.php M themes/original/css/navigation.css.php M themes/pmahomme/css/navigation.css.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 1bab8bfeeaf508cbe5fb8ff7ed1b910b7faca3eb https://github.com/phpmyadmin/phpmyadmin/commit/1bab8bfeeaf508cbe5fb8ff7ed1… Author: Marc Delisle &lt;marc(a)infomarc.info&gt; Date: 2013-09-02 (Mon, 02 Sep 2013) Changed paths: M export.php Log Message: ----------- The rendering of "view output as text" should not be affected by the fix for the memory problems in export Commit: f0a0ad5eafee89231792e1590ae8f36233173e74 https://github.com/phpmyadmin/phpmyadmin/commit/f0a0ad5eafee89231792e1590ae… Author: Marc Delisle &lt;marc(a)infomarc.info&gt; Date: 2013-09-02 (Mon, 02 Sep 2013) Log Message: ----------- Merge commit '2ca7932' into QA_4_0 Commit: 57b241a45f3274d05c4483506cc98ff990cc6964 https://github.com/phpmyadmin/phpmyadmin/commit/57b241a45f3274d05c4483506cc… Author: Marc Delisle &lt;marc(a)infomarc.info&gt; Date: 2013-09-02 (Mon, 02 Sep 2013) Changed paths: M export.php Log Message: ----------- Merge branch 'MAINT_4_0_6' into QA_4_0 Commit: 8d70cd4dec3b936dcbe57aa971755b8b6a835bcf https://github.com/phpmyadmin/phpmyadmin/commit/8d70cd4dec3b936dcbe57aa9717… Author: Kasun Chathuranga &lt;chathuranga.jayaneththi(a)gmail.com&gt; Date: 2013-09-03 (Tue, 03 Sep 2013) Changed paths: M export.php M js/common.js M js/navigation.js M js/sql.js M libraries/navigation/NavigationTree.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/navigation/Nodes/Node_Table_Container.class.php M libraries/navigation/Nodes/Node_View.class.php M libraries/navigation/Nodes/Node_View_Container.class.php M themes/original/css/navigation.css.php M themes/pmahomme/css/navigation.css.php Log Message: ----------- Merge branch 'QA_4_0' into merge. Resolved conflicts. Commit: cb364d5458a73b489b1847412aabd216093c1e55 https://github.com/phpmyadmin/phpmyadmin/commit/cb364d5458a73b489b1847412aa… Author: Atul Pratap Singh &lt;atulpratapsingh05(a)gmail.com&gt; Date: 2013-09-03 (Tue, 03 Sep 2013) Changed paths: M js/common.js M js/navigation.js M js/sql.js M libraries/navigation/NavigationTree.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/navigation/Nodes/Node_Table_Container.class.php M libraries/navigation/Nodes/Node_View.class.php M libraries/navigation/Nodes/Node_View_Container.class.php M themes/original/css/navigation.css.php M themes/pmahomme/css/navigation.css.php Log Message: ----------- Merge branch 'merge' of https://github.com/kasunchathuranga/phpmyadmin Conflicts: export.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6772b75d3bdd...cb364d5458a7