[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5cb429: 4.4.7-dev

Marc Delisle marc at infomarc.info
Sat May 16 13:16:31 CEST 2015


  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5cb4292e6a9fd89eb34df7e1b855e492f53e78be
      https://github.com/phpmyadmin/phpmyadmin/commit/5cb4292e6a9fd89eb34df7e1b855e492f53e78be
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.4.7-dev

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 822c4dfec2b59e77922cec6059b2831d803f0606
      https://github.com/phpmyadmin/phpmyadmin/commit/822c4dfec2b59e77922cec6059b2831d803f0606
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M ChangeLog
    M libraries/config/user_preferences.forms.php

  Log Message:
  -----------
  bug #4876 Settings issues (Favorite tables shown twice in Settings)

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 34c2837894d712ae0148be6aad385d3b3f77995a
      https://github.com/phpmyadmin/phpmyadmin/commit/34c2837894d712ae0148be6aad385d3b3f77995a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  bug #4896 Non-styled error page when following results link

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 470d61abafc0f32293374eeee26696a3c482566c
      https://github.com/phpmyadmin/phpmyadmin/commit/470d61abafc0f32293374eeee26696a3c482566c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/sql.js
    M libraries/DisplayResults.class.php
    M libraries/Util.class.php

  Log Message:
  -----------
  bug #4894 Deleting without confirmation

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: e60278b4146b66dcbdd5c8d9bc9a5de8f7002f4e
      https://github.com/phpmyadmin/phpmyadmin/commit/e60278b4146b66dcbdd5c8d9bc9a5de8f7002f4e
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  Fix failing tests

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 4c5592e6325e76d37b698d6138ace270f4ec5583
      https://github.com/phpmyadmin/phpmyadmin/commit/4c5592e6325e76d37b698d6138ace270f4ec5583
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Fix for PHP < 5.5

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: c8a4ed578b55befbca8e990e8c7bc7ff77510a5c
      https://github.com/phpmyadmin/phpmyadmin/commit/c8a4ed578b55befbca8e990e8c7bc7ff77510a5c
  Author: Nisarg Jhaveri <nisargjhaveri at gmail.com>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Prevent multiple request for SQL autocomplete

Fix Bug#4858

Signed-off-by: Nisarg Jhaveri <nisargjhaveri at gmail.com>


  Commit: b254c928da5fa97ebbea950bea4b8478863ad826
      https://github.com/phpmyadmin/phpmyadmin/commit/b254c928da5fa97ebbea950bea4b8478863ad826
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 4db6481ea347d9409fa9d52f1bebe4b96ee377f6
      https://github.com/phpmyadmin/phpmyadmin/commit/4db6481ea347d9409fa9d52f1bebe4b96ee377f6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M test/libraries/PMA_FormDisplay_tpl_test.php

  Log Message:
  -----------
  Fix failing test

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: b3a18956cfccddc99fdfd568a1602e808e9ab7b5
      https://github.com/phpmyadmin/phpmyadmin/commit/b3a18956cfccddc99fdfd568a1602e808e9ab7b5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M test/libraries/PMA_FormDisplay_tpl_test.php

  Log Message:
  -----------
  Fix failing test

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 4e9c3db67d4f230cd774a583692ae1a69ae6920f
      https://github.com/phpmyadmin/phpmyadmin/commit/4e9c3db67d4f230cd774a583692ae1a69ae6920f
  Author: Nisarg Jhaveri <nisargjhaveri at gmail.com>
  Date:   2015-05-09 (Sat, 09 May 2015)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Fix bug#4897

Signed-off-by: Nisarg Jhaveri <nisargjhaveri at gmail.com>


  Commit: 07dbc73a551a1134143073f628652111856fac36
      https://github.com/phpmyadmin/phpmyadmin/commit/07dbc73a551a1134143073f628652111856fac36
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-09 (Sat, 09 May 2015)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Merge pull request #1666 from nisargjhaveri/issue_4897

Fix bug#4897


  Commit: 683088a4b8bf1abdb7bf84188b6914976dd5e49a
      https://github.com/phpmyadmin/phpmyadmin/commit/683088a4b8bf1abdb7bf84188b6914976dd5e49a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-09 (Sat, 09 May 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 3fed053d687f13ace6d00c3797ff20cddd43d8e6
      https://github.com/phpmyadmin/phpmyadmin/commit/3fed053d687f13ace6d00c3797ff20cddd43d8e6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M ChangeLog
    M js/db_tracking.js
    M js/sql.js
    M js/tbl_structure.js

  Log Message:
  -----------
  bug #4898 JS error after selecting a field and press Enter

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 47b734473e964546c5ac6f5324324f8ebf7fc3d4
      https://github.com/phpmyadmin/phpmyadmin/commit/47b734473e964546c5ac6f5324324f8ebf7fc3d4
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M libraries/common.inc.php

  Log Message:
  -----------
  bug #4512 ForceSSL Redirect Check

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: e484b5aca0138baa66469058434c9530ff92440c
      https://github.com/phpmyadmin/phpmyadmin/commit/e484b5aca0138baa66469058434c9530ff92440c
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M po/et.po

  Log Message:
  -----------
  Translated using Weblate (Estonian)

Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]


  Commit: f3901b7ef77bf98374301fae6b6f85402ab89668
      https://github.com/phpmyadmin/phpmyadmin/commit/f3901b7ef77bf98374301fae6b6f85402ab89668
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M ChangeLog
    M libraries/Config.class.php

  Log Message:
  -----------
  Make PMA_Config::checkHTTP honor proxy settings

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: de83138a89374ca52106d084a162f6bb5df02083
      https://github.com/phpmyadmin/phpmyadmin/commit/de83138a89374ca52106d084a162f6bb5df02083
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M libraries/display_git_revision.lib.php

  Log Message:
  -----------
  Escape html chars in email

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: bdf4612081d96e43cfb5c7b6d0a321c7ef31a339
      https://github.com/phpmyadmin/phpmyadmin/commit/bdf4612081d96e43cfb5c7b6d0a321c7ef31a339
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M libraries/Config.class.php
    M libraries/Util.class.php

  Log Message:
  -----------
  Set User-Agent in Util::configureCurl

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 254fc8faa885981c31615409b9f0a2f2ea0b8baf
      https://github.com/phpmyadmin/phpmyadmin/commit/254fc8faa885981c31615409b9f0a2f2ea0b8baf
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M libraries/display_git_revision.lib.php

  Log Message:
  -----------
  Fix typo

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 1b96621d1b85fde434f3457e3354a371b885a637
      https://github.com/phpmyadmin/phpmyadmin/commit/1b96621d1b85fde434f3457e3354a371b885a637
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M ChangeLog
    M libraries/Header.class.php

  Log Message:
  -----------
  Missing title on link

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 50cf01057f8f9df77c44b1e260dca417ff670026
      https://github.com/phpmyadmin/phpmyadmin/commit/50cf01057f8f9df77c44b1e260dca417ff670026
  Author: drainx <drainx1 at live.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Fix bug on result info display

Reference image from : http://puu.sh/hIn2q/237524ef12.png for a text BLOB field.

Bisect determined 34c2837894d712ae0148be6aad385d3b3f77995a to be the cause.

Signed-off-by: Daniel Rix <Drainx1 at live.com>


  Commit: 6f9f2084d5db8af056ba83a8c7c165276cfab8b8
      https://github.com/phpmyadmin/phpmyadmin/commit/6f9f2084d5db8af056ba83a8c7c165276cfab8b8
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M libraries/common.inc.php

  Log Message:
  -----------
  Merge pull request #1670 from madhuracj/bug4512

bug #4512 ForceSSL Redirect Check


  Commit: 9cb7f30ee8f8f92444df7ae3c70ae04c00adc332
      https://github.com/phpmyadmin/phpmyadmin/commit/9cb7f30ee8f8f92444df7ae3c70ae04c00adc332
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for bug #4512

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 1684a1a56eedabfc0642675728cd5919f9d2eabd
      https://github.com/phpmyadmin/phpmyadmin/commit/1684a1a56eedabfc0642675728cd5919f9d2eabd
  Author: Tom Sommer <tomsommer at users.noreply.github.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M libraries/Config.class.php

  Log Message:
  -----------
  Fix undefined index 'collation_connection'

Make sure $GLOBALS[$collation] is set

Signed-off-by: Tom Sommer <mail at tomsommer.dk>

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 969b46cca52afcf63c6beb3690e3e728444b8689
      https://github.com/phpmyadmin/phpmyadmin/commit/969b46cca52afcf63c6beb3690e3e728444b8689
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 50616659e17840c57f7a2398be3fa8724691c628
      https://github.com/phpmyadmin/phpmyadmin/commit/50616659e17840c57f7a2398be3fa8724691c628
  Author: Tom Sommer <tomsommer at users.noreply.github.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M libraries/error_report.lib.php

  Log Message:
  -----------
  Don't throw errors in case reports.phpmyadmin.net is down

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 2b41e09a48ad6576699d9b3f9e025e9dd56c259d
      https://github.com/phpmyadmin/phpmyadmin/commit/2b41e09a48ad6576699d9b3f9e025e9dd56c259d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 50b2985a3ebdc5df5af299d587acc0940f193fdb
      https://github.com/phpmyadmin/phpmyadmin/commit/50b2985a3ebdc5df5af299d587acc0940f193fdb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-13 (Wed, 13 May 2015)

  Changed paths:
    M ChangeLog
    M libraries/Partition.class.php

  Log Message:
  -----------
  bug Escape database and table names for partition maintenance

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: d6afe6ccf6e20bf3b8631a64df016f5098804033
      https://github.com/phpmyadmin/phpmyadmin/commit/d6afe6ccf6e20bf3b8631a64df016f5098804033
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-13 (Wed, 13 May 2015)

  Changed paths:
    M ChangeLog
    M libraries/url_generating.lib.php
    M setup/frames/form.inc.php
    M setup/frames/index.inc.php
    M setup/frames/menu.inc.php
    M setup/frames/servers.inc.php
    M setup/index.php
    M setup/lib/form_processing.lib.php
    M setup/validate.php

  Log Message:
  -----------
  bug #4899 [security] CSRF vulnerability in setup

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 787c6d6445eb056b6903feeec2133333dcae366e
      https://github.com/phpmyadmin/phpmyadmin/commit/787c6d6445eb056b6903feeec2133333dcae366e
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-13 (Wed, 13 May 2015)

  Changed paths:
    M ChangeLog
    M libraries/Config.class.php

  Log Message:
  -----------
  bug #4900 [security] Vulnerability allowing man-in-the-middle attack

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 061483ac1f1cbf2ced0977a8c63baf038f382ac0
      https://github.com/phpmyadmin/phpmyadmin/commit/061483ac1f1cbf2ced0977a8c63baf038f382ac0
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-13 (Wed, 13 May 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.4.6.1 release date

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 5ca7f19d05a64009fb6434e4cc79ca7428eceaf0
      https://github.com/phpmyadmin/phpmyadmin/commit/5ca7f19d05a64009fb6434e4cc79ca7428eceaf0
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/swekey/swekey.php

  Log Message:
  -----------
  Invalid value for CURLOPT_SSL_VERIFYPEER

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 85f62badead5a1ee6af2fedeb0e565b749280b9a
      https://github.com/phpmyadmin/phpmyadmin/commit/85f62badead5a1ee6af2fedeb0e565b749280b9a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M ChangeLog
    M libraries/Config.class.php
    M libraries/url_generating.lib.php
    M setup/frames/form.inc.php
    M setup/frames/index.inc.php
    M setup/frames/menu.inc.php
    M setup/frames/servers.inc.php
    M setup/index.php
    M setup/lib/form_processing.lib.php
    M setup/validate.php

  Log Message:
  -----------
  Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4


  Commit: 3addba490c4bc823a32c84749c9b628e0d38bff1
      https://github.com/phpmyadmin/phpmyadmin/commit/3addba490c4bc823a32c84749c9b628e0d38bff1
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M setup/lib/form_processing.lib.php
    M test/libraries/PMA_Form_Processing_test.php

  Log Message:
  -----------
  Do not break the urls in the middle. Update tests

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: b5c51cf040582e4e6bf445b9efe86df71e8586b1
      https://github.com/phpmyadmin/phpmyadmin/commit/b5c51cf040582e4e6bf445b9efe86df71e8586b1
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M import_status.php

  Log Message:
  -----------
  bug #4903 & bug #4367 Import status infinite loop

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: ef806b39e592290d32aa4a2cf9e59c37f924d4d2
      https://github.com/phpmyadmin/phpmyadmin/commit/ef806b39e592290d32aa4a2cf9e59c37f924d4d2
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for bug #4367

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 35c7c6019e38e2eab71d3a9cfa93ed18d925faff
      https://github.com/phpmyadmin/phpmyadmin/commit/35c7c6019e38e2eab71d3a9cfa93ed18d925faff
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M ChangeLog
    M js/pmd/designer_page.js

  Log Message:
  -----------
  bug #4902 Designer: Loading does not work

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: eef817da3c4d1face3cf9511db81e94d4d96ae60
      https://github.com/phpmyadmin/phpmyadmin/commit/eef817da3c4d1face3cf9511db81e94d4d96ae60
  Author: Stefano Martinelli <stefano.ste.martinelli at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M po/it.po

  Log Message:
  -----------
  Translated using Weblate (Italian)

Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]


  Commit: 1257f2c7144b70065d01f08c496a5266b57226e3
      https://github.com/phpmyadmin/phpmyadmin/commit/1257f2c7144b70065d01f08c496a5266b57226e3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M ChangeLog
    M setup/config.php

  Log Message:
  -----------
  bug #4904 Setup: Overview > Display does not work

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: a92bea7afedeb0ee6380c606219e52f1a13eba98
      https://github.com/phpmyadmin/phpmyadmin/commit/a92bea7afedeb0ee6380c606219e52f1a13eba98
  Author: Sevdimali İsa <sevdimaliisayev at mail.ru>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Translated using Weblate (Azerbaijani)

Currently translated at 58.1% (1764 of 3035 strings)

[CI skip]


  Commit: f035d48b5d40107268d3b1dee55d8fadf00fe318
      https://github.com/phpmyadmin/phpmyadmin/commit/f035d48b5d40107268d3b1dee55d8fadf00fe318
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M po/cs.po

  Log Message:
  -----------
  Translated using Weblate (Czech)

Currently translated at 96.8% (2940 of 3035 strings)

[CI skip]


  Commit: f78b75130ad899540c800513667d677a17b246eb
      https://github.com/phpmyadmin/phpmyadmin/commit/f78b75130ad899540c800513667d677a17b246eb
  Author: edson garcia <egarcia at tre-ma.jus.br>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.7% (3028 of 3035 strings)

[CI skip]


  Commit: 8fd62789cff9809d502f614c287947a926d8cf37
      https://github.com/phpmyadmin/phpmyadmin/commit/8fd62789cff9809d502f614c287947a926d8cf37
  Author: Weblate <noreply at weblate.org>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M ChangeLog
    M setup/config.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4


  Commit: fdfd9ea89c64880ae47f8572edb3417c12ea5ca3
      https://github.com/phpmyadmin/phpmyadmin/commit/fdfd9ea89c64880ae47f8572edb3417c12ea5ca3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M js/pmd/designer_page.js
    M js/pmd/init.js
    M js/pmd/move.js

  Log Message:
  -----------
  #4906 Designer: pages from all databases

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 23341a3458cc989eb0ae7477d67c3b5890c7f6cc
      https://github.com/phpmyadmin/phpmyadmin/commit/23341a3458cc989eb0ae7477d67c3b5890c7f6cc
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for bug #4906

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 71d2cff966c1412c867b92ee6336fcb3d47b455f
      https://github.com/phpmyadmin/phpmyadmin/commit/71d2cff966c1412c867b92ee6336fcb3d47b455f
  Author: LNDDYL <lnddyl at outlook.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M po/zh_TW.po

  Log Message:
  -----------
  Translated using Weblate (Chinese (Taiwan))

Currently translated at 95.2% (2892 of 3035 strings)

[CI skip]


  Commit: 350f74aa930d51a4cc74ccd8b3d2f4d8de253f94
      https://github.com/phpmyadmin/phpmyadmin/commit/350f74aa930d51a4cc74ccd8b3d2f4d8de253f94
  Author: Weblate <noreply at weblate.org>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M ChangeLog
    M js/pmd/designer_page.js
    M js/pmd/init.js
    M js/pmd/move.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4


  Commit: 279439b08a671e8cfa4ec69890690a09b20ba79a
      https://github.com/phpmyadmin/phpmyadmin/commit/279439b08a671e8cfa4ec69890690a09b20ba79a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M libraries/config/ServerConfigChecks.class.php

  Log Message:
  -----------
  Include token in the error messages

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 3920c52409f9373b2accdd23650daf4e1e32d701
      https://github.com/phpmyadmin/phpmyadmin/commit/3920c52409f9373b2accdd23650daf4e1e32d701
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M po/zh_TW.po

  Log Message:
  -----------
  Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4


  Commit: a62fcf03af4c7f9df2393fbe58ae8653166763fa
      https://github.com/phpmyadmin/phpmyadmin/commit/a62fcf03af4c7f9df2393fbe58ae8653166763fa
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.4.7 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: b3e1c957e9a9e4c113ff4d7275877660b6722779
      https://github.com/phpmyadmin/phpmyadmin/commit/b3e1c957e9a9e4c113ff4d7275877660b6722779
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M import_status.php
    M js/db_tracking.js
    M js/functions.js
    M js/pmd/designer_page.js
    M js/pmd/init.js
    M js/pmd/move.js
    M js/sql.js
    M js/tbl_structure.js
    M libraries/Config.class.php
    M libraries/DisplayResults.class.php
    M libraries/Header.class.php
    M libraries/Partition.class.php
    M libraries/Util.class.php
    M libraries/common.inc.php
    M libraries/config/ServerConfigChecks.class.php
    M libraries/config/user_preferences.forms.php
    M libraries/display_git_revision.lib.php
    M libraries/error_report.lib.php
    M libraries/plugins/auth/swekey/swekey.php
    M po/az.po
    M po/cs.po
    M po/et.po
    M po/it.po
    M po/pt_BR.po
    M po/zh_TW.po
    M setup/config.php
    M setup/lib/form_processing.lib.php
    M test/classes/PMA_DisplayResults_test.php
    M test/libraries/PMA_FormDisplay_tpl_test.php
    M test/libraries/PMA_Form_Processing_test.php

  Log Message:
  -----------
  Merge branch 'MAINT_4_4_7' into STABLE


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/90483661784c...b3e1c957e9a9


More information about the Git mailing list