24 Nov
2015
24 Nov
'15
6:13 a.m.
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 677ea758ca9be2abfc7c445f56228d5b87196827
https://github.com/phpmyadmin/phpmyadmin/commit/677ea758ca9be2abfc7c445f562…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M libraries/controllers/server/ServerDatabasesController.php
R libraries/display_create_database.lib.php
A templates/server/databases/create.phtml
Log Message:
-----------
Template display_create_database.lib.php
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 0a2b037706f8deb81d8ac432ea4c4c6520e6be05
https://github.com/phpmyadmin/phpmyadmin/commit/0a2b037706f8deb81d8ac432ea4…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
R db_create.php
M js/server_databases.js
M libraries/common.inc.php
M libraries/controllers/server/ServerDatabasesController.php
M templates/server/databases/create.phtml
M test/libraries/core/PMA_checkPageValidity_test.php
Log Message:
-----------
merge db_create.php into ServerDatabasesController
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 8e282a3f6ec7875652e153459e07cdefb7c69ac8
https://github.com/phpmyadmin/phpmyadmin/commit/8e282a3f6ec7875652e153459e0…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
R libraries/build_html_for_db.lib.php
M libraries/controllers/server/ServerDatabasesController.php
M test/classes/controllers/ServerDatabasesControllerTest.php
R test/libraries/PMA_build_html_for_db_test.php
Log Message:
-----------
Merge build_html_for_db.lib.php into ServerDatabasesController
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: ba8859d7df556e5ab51251987669acddf11a2074
https://github.com/phpmyadmin/phpmyadmin/commit/ba8859d7df556e5ab5125198766…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M ChangeLog
M import.php
M js/db_structure.js
M js/functions.js
M js/messages.php
M js/sql.js
M js/tbl_structure.js
M libraries/DisplayResults.php
M libraries/ErrorHandler.php
M libraries/controllers/server/ServerVariablesController.php
M libraries/display_export.lib.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/brx.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/eo.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/ia.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/km.po
M po/kn.po
M po/ko.po
M po/ksh.po
M po/ky.po
M po/li.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/ne.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/vi.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
M scripts/create-release.sh
M tbl_export.php
M templates/database/structure/print_view_data_dictionary_link.phtml
M templates/table/structure/optional_action_links.phtml
M test/classes/controllers/ServerVariablesControllerTest.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'master' into refactor
Conflicts:
db_create.php
Commit: 1c473bf49df5fe6108b6cb3135f441f3c5746aac
https://github.com/phpmyadmin/phpmyadmin/commit/1c473bf49df5fe6108b6cb3135f…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
R db_create.php
M js/server_databases.js
R libraries/build_html_for_db.lib.php
M libraries/common.inc.php
M libraries/controllers/server/ServerDatabasesController.php
R libraries/display_create_database.lib.php
A templates/server/databases/create.phtml
M test/classes/controllers/ServerDatabasesControllerTest.php
R test/libraries/PMA_build_html_for_db_test.php
M test/libraries/core/PMA_checkPageValidity_test.php
Log Message:
-----------
Merge pull request #11689 from madhuracj/refactor
Refactor database related code
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3cf75085d66e...1c473bf49df5