Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 56e9ede5223219cef2187ced385924ef2e0ae21d
https://github.com/phpmyadmin/phpmyadmin/commit/56e9ede5223219cef2187ced385…
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M libraries/DisplayResults.class.php
Log Message:
-----------
fix unescaped parameter, see PMASA-2013-8 for details
Commit: ff27a2c5e0c706f401b7ee8677cbd46568a4eca2
https://github.com/phpmyadmin/phpmyadmin/commit/ff27a2c5e0c706f401b7ee8677c…
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M libraries/DisplayResults.class.php
Log Message:
-----------
add total as parameter to message
Commit: 2005c4b7c15afa61a41e1087464fe12645f535e1
https://github.com/phpmyadmin/phpmyadmin/commit/2005c4b7c15afa61a41e1087464…
Author: J.M <me(a)mynetx.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M ChangeLog
M server_status.php
Log Message:
-----------
[security] Fix stored XSS in Server status monitor, see PMASA-2013-9
Commit: d096a0fc46ef4708f3f4a440a8aba40163e3b72a
https://github.com/phpmyadmin/phpmyadmin/commit/d096a0fc46ef4708f3f4a440a8a…
Author: J.M <me(a)mynetx.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M ChangeLog
M libraries/navigation/NavigationHeader.class.php
Log Message:
-----------
[security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9
Commit: e0d8568ac681073b09f10ad1c4d801df36290036
https://github.com/phpmyadmin/phpmyadmin/commit/e0d8568ac681073b09f10ad1c4d…
Author: J.M <me(a)mynetx.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M ChangeLog
M libraries/config/validate.lib.php
Log Message:
-----------
[security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9
Commit: 0fea53b7b82134ce0e1979a71b7ce080b5b6ff9a
https://github.com/phpmyadmin/phpmyadmin/commit/0fea53b7b82134ce0e1979a71b7…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/Error.class.php
M libraries/Error_Handler.class.php
M libraries/common.inc.php
Log Message:
-----------
[security] Avoid full path disclosure from some libraries script, see
PMASA-2013-12
Move the PHPMYADMIN constant definition earlier
Commit: 45d3f4326cad32b09b8d3a07382faf1eeda30dba
https://github.com/phpmyadmin/phpmyadmin/commit/45d3f4326cad32b09b8d3a07382…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/Config.class.php
M libraries/List_Database.class.php
M libraries/PMA.php
M libraries/RecentTable.class.php
M libraries/bookmark.lib.php
Log Message:
-----------
Fix merge conflicts
Commit: 8e4fe7c57a976f2ce9a6931687f4697d519111ec
https://github.com/phpmyadmin/phpmyadmin/commit/8e4fe7c57a976f2ce9a6931687f…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/common.inc.php
Log Message:
-----------
[security] Avoid full path disclosure from libraries/common.inc.php, see PMASA-2013-12
Commit: 90d968b447729405ee8b6cc5bb406b832ec3c99f
https://github.com/phpmyadmin/phpmyadmin/commit/90d968b447729405ee8b6cc5bb4…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/config.default.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
Log Message:
-----------
Fix merge conflicts
Commit: 7992beb8e42f2a4a3dab275b119d1ebd58e3b164
https://github.com/phpmyadmin/phpmyadmin/commit/7992beb8e42f2a4a3dab275b119…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/common.inc.php
Log Message:
-----------
Move protection statement at beginning of script
Commit: 7bfe445f9919716460e006faf7aa226279944e23
https://github.com/phpmyadmin/phpmyadmin/commit/7bfe445f9919716460e006faf7a…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/engines/bdb.lib.php
M libraries/engines/berkeleydb.lib.php
M libraries/engines/binlog.lib.php
M libraries/engines/innobase.lib.php
M libraries/engines/innodb.lib.php
M libraries/engines/memory.lib.php
M libraries/engines/merge.lib.php
M libraries/engines/mrg_myisam.lib.php
M libraries/engines/myisam.lib.php
M libraries/engines/ndbcluster.lib.php
M libraries/engines/pbxt.lib.php
Log Message:
-----------
Fix merge conflicts
Commit: 142e465c80a1fb3d71e214d29c566c15a416518d
https://github.com/phpmyadmin/phpmyadmin/commit/142e465c80a1fb3d71e214d29c5…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/pmd_common.php
M libraries/schema/Pdf_Relation_Schema.class.php
Log Message:
-----------
[security] Avoid full path disclosure from some libraries scripts, see PMASA-2013-12
Commit: f7065ee2a828368f4037dbaba5aeb69803094eea
https://github.com/phpmyadmin/phpmyadmin/commit/f7065ee2a828368f4037dbaba5a…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
R libraries/.htaccess
Log Message:
-----------
Delete .htaccess which does not work on all web servers
Commit: 14292721367bafa8778b436063e0fb893364e709
https://github.com/phpmyadmin/phpmyadmin/commit/14292721367bafa8778b436063e…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
R setup/frames/.htaccess
R setup/lib/.htaccess
Log Message:
-----------
Remove other .htaccess for directories which are not at risk
Commit: 257bd7349c312a05bde28732d8b8a72d0191cdad
https://github.com/phpmyadmin/phpmyadmin/commit/257bd7349c312a05bde28732d8b…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry for full path disclosure fixes
Commit: 974d0dedeea7c79ac4533e614d9c0c3abd97e8f9
https://github.com/phpmyadmin/phpmyadmin/commit/974d0dedeea7c79ac4533e614d9…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M ChangeLog
M pmd_pdf.php
Log Message:
-----------
[security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15
Commit: 8ef025ef3d05c164654fee7001517626cf604bb1
https://github.com/phpmyadmin/phpmyadmin/commit/8ef025ef3d05c164654fee70015…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M ChangeLog
M schema_export.php
Log Message:
-----------
[security] Fix control user SQL injection in schema_export.php, see PMASA-2015
Commit: 1293e9b6e9eb7a831c5738f346ea44dee6d1bf0f
https://github.com/phpmyadmin/phpmyadmin/commit/1293e9b6e9eb7a831c5738f346e…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M ChangeLog
M libraries/schema/Export_Relation_Schema.class.php
Log Message:
-----------
[security] Fix self-XSS in schema export, see PMASA-2013-14
Commit: b9c814ed6d59733c54965e01e90ffd5d3348fd2c
https://github.com/phpmyadmin/phpmyadmin/commit/b9c814ed6d59733c54965e01e90…
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M ChangeLog
M version_check.php
Log Message:
-----------
[security] Fix unencoded json object, see PMASA-2013-11
Commit: e0c8704f725c56c87b644676ded94dba695de39f
https://github.com/phpmyadmin/phpmyadmin/commit/e0c8704f725c56c87b644676ded…
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M ChangeLog
M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
Log Message:
-----------
[security] Fix stored XSS in link transformation plugin, see PMASA-2013-13
Commit: 836529be425c5a309549ef440ee4d3bd6b30ca29
https://github.com/phpmyadmin/phpmyadmin/commit/836529be425c5a309549ef440ee…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M ChangeLog
R libraries/.htaccess
M libraries/Config.class.php
M libraries/DisplayResults.class.php
M libraries/Error.class.php
M libraries/Error_Handler.class.php
M libraries/List_Database.class.php
M libraries/PMA.php
M libraries/RecentTable.class.php
M libraries/bookmark.lib.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config/validate.lib.php
M libraries/engines/bdb.lib.php
M libraries/engines/berkeleydb.lib.php
M libraries/engines/binlog.lib.php
M libraries/engines/innobase.lib.php
M libraries/engines/innodb.lib.php
M libraries/engines/memory.lib.php
M libraries/engines/merge.lib.php
M libraries/engines/mrg_myisam.lib.php
M libraries/engines/myisam.lib.php
M libraries/engines/ndbcluster.lib.php
M libraries/engines/pbxt.lib.php
M libraries/navigation/NavigationHeader.class.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
M libraries/pmd_common.php
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/Pdf_Relation_Schema.class.php
M pmd_pdf.php
M schema_export.php
M server_status.php
R setup/frames/.htaccess
R setup/lib/.htaccess
M version_check.php
Log Message:
-----------
Fix merge conflicts
Commit: 269d0c89fe0c652389295785ed9a9dc282c7616e
https://github.com/phpmyadmin/phpmyadmin/commit/269d0c89fe0c652389295785ed9…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M ChangeLog
R libraries/.htaccess
M libraries/Config.class.php
M libraries/DisplayResults.class.php
M libraries/Error.class.php
M libraries/Error_Handler.class.php
M libraries/List_Database.class.php
M libraries/PMA.php
M libraries/RecentTable.class.php
M libraries/bookmark.lib.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config/Validator.class.php
M libraries/engines/bdb.lib.php
M libraries/engines/berkeleydb.lib.php
M libraries/engines/binlog.lib.php
M libraries/engines/innobase.lib.php
M libraries/engines/innodb.lib.php
M libraries/engines/memory.lib.php
M libraries/engines/merge.lib.php
M libraries/engines/mrg_myisam.lib.php
M libraries/engines/myisam.lib.php
M libraries/engines/ndbcluster.lib.php
M libraries/engines/pbxt.lib.php
M libraries/navigation/NavigationHeader.class.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
M libraries/pmd_common.php
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/Pdf_Relation_Schema.class.php
M libraries/server_status.lib.php
M pmd_pdf.php
M schema_export.php
M server_status.php
R setup/frames/.htaccess
R setup/lib/.htaccess
Log Message:
-----------
Fix merge conflicts
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6df3c0adb58c...269d0c89fe0c
Branch: refs/heads/QA_4_0
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 56e9ede5223219cef2187ced385924ef2e0ae21d
https://github.com/phpmyadmin/phpmyadmin/commit/56e9ede5223219cef2187ced385…
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M libraries/DisplayResults.class.php
Log Message:
-----------
fix unescaped parameter, see PMASA-2013-8 for details
Commit: ff27a2c5e0c706f401b7ee8677cbd46568a4eca2
https://github.com/phpmyadmin/phpmyadmin/commit/ff27a2c5e0c706f401b7ee8677c…
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M libraries/DisplayResults.class.php
Log Message:
-----------
add total as parameter to message
Commit: 2005c4b7c15afa61a41e1087464fe12645f535e1
https://github.com/phpmyadmin/phpmyadmin/commit/2005c4b7c15afa61a41e1087464…
Author: J.M <me(a)mynetx.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M ChangeLog
M server_status.php
Log Message:
-----------
[security] Fix stored XSS in Server status monitor, see PMASA-2013-9
Commit: d096a0fc46ef4708f3f4a440a8aba40163e3b72a
https://github.com/phpmyadmin/phpmyadmin/commit/d096a0fc46ef4708f3f4a440a8a…
Author: J.M <me(a)mynetx.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M ChangeLog
M libraries/navigation/NavigationHeader.class.php
Log Message:
-----------
[security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9
Commit: e0d8568ac681073b09f10ad1c4d801df36290036
https://github.com/phpmyadmin/phpmyadmin/commit/e0d8568ac681073b09f10ad1c4d…
Author: J.M <me(a)mynetx.net>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M ChangeLog
M libraries/config/validate.lib.php
Log Message:
-----------
[security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9
Commit: 0fea53b7b82134ce0e1979a71b7ce080b5b6ff9a
https://github.com/phpmyadmin/phpmyadmin/commit/0fea53b7b82134ce0e1979a71b7…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/Error.class.php
M libraries/Error_Handler.class.php
M libraries/common.inc.php
Log Message:
-----------
[security] Avoid full path disclosure from some libraries script, see
PMASA-2013-12
Move the PHPMYADMIN constant definition earlier
Commit: 45d3f4326cad32b09b8d3a07382faf1eeda30dba
https://github.com/phpmyadmin/phpmyadmin/commit/45d3f4326cad32b09b8d3a07382…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/Config.class.php
M libraries/List_Database.class.php
M libraries/PMA.php
M libraries/RecentTable.class.php
M libraries/bookmark.lib.php
Log Message:
-----------
Fix merge conflicts
Commit: 8e4fe7c57a976f2ce9a6931687f4697d519111ec
https://github.com/phpmyadmin/phpmyadmin/commit/8e4fe7c57a976f2ce9a6931687f…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/common.inc.php
Log Message:
-----------
[security] Avoid full path disclosure from libraries/common.inc.php, see PMASA-2013-12
Commit: 90d968b447729405ee8b6cc5bb406b832ec3c99f
https://github.com/phpmyadmin/phpmyadmin/commit/90d968b447729405ee8b6cc5bb4…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/config.default.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
Log Message:
-----------
Fix merge conflicts
Commit: 7992beb8e42f2a4a3dab275b119d1ebd58e3b164
https://github.com/phpmyadmin/phpmyadmin/commit/7992beb8e42f2a4a3dab275b119…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/common.inc.php
Log Message:
-----------
Move protection statement at beginning of script
Commit: 7bfe445f9919716460e006faf7aa226279944e23
https://github.com/phpmyadmin/phpmyadmin/commit/7bfe445f9919716460e006faf7a…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/engines/bdb.lib.php
M libraries/engines/berkeleydb.lib.php
M libraries/engines/binlog.lib.php
M libraries/engines/innobase.lib.php
M libraries/engines/innodb.lib.php
M libraries/engines/memory.lib.php
M libraries/engines/merge.lib.php
M libraries/engines/mrg_myisam.lib.php
M libraries/engines/myisam.lib.php
M libraries/engines/ndbcluster.lib.php
M libraries/engines/pbxt.lib.php
Log Message:
-----------
Fix merge conflicts
Commit: 142e465c80a1fb3d71e214d29c566c15a416518d
https://github.com/phpmyadmin/phpmyadmin/commit/142e465c80a1fb3d71e214d29c5…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M libraries/pmd_common.php
M libraries/schema/Pdf_Relation_Schema.class.php
Log Message:
-----------
[security] Avoid full path disclosure from some libraries scripts, see PMASA-2013-12
Commit: f7065ee2a828368f4037dbaba5aeb69803094eea
https://github.com/phpmyadmin/phpmyadmin/commit/f7065ee2a828368f4037dbaba5a…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
R libraries/.htaccess
Log Message:
-----------
Delete .htaccess which does not work on all web servers
Commit: 14292721367bafa8778b436063e0fb893364e709
https://github.com/phpmyadmin/phpmyadmin/commit/14292721367bafa8778b436063e…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
R setup/frames/.htaccess
R setup/lib/.htaccess
Log Message:
-----------
Remove other .htaccess for directories which are not at risk
Commit: 257bd7349c312a05bde28732d8b8a72d0191cdad
https://github.com/phpmyadmin/phpmyadmin/commit/257bd7349c312a05bde28732d8b…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry for full path disclosure fixes
Commit: 974d0dedeea7c79ac4533e614d9c0c3abd97e8f9
https://github.com/phpmyadmin/phpmyadmin/commit/974d0dedeea7c79ac4533e614d9…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M ChangeLog
M pmd_pdf.php
Log Message:
-----------
[security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15
Commit: 8ef025ef3d05c164654fee7001517626cf604bb1
https://github.com/phpmyadmin/phpmyadmin/commit/8ef025ef3d05c164654fee70015…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M ChangeLog
M schema_export.php
Log Message:
-----------
[security] Fix control user SQL injection in schema_export.php, see PMASA-2015
Commit: 1293e9b6e9eb7a831c5738f346ea44dee6d1bf0f
https://github.com/phpmyadmin/phpmyadmin/commit/1293e9b6e9eb7a831c5738f346e…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M ChangeLog
M libraries/schema/Export_Relation_Schema.class.php
Log Message:
-----------
[security] Fix self-XSS in schema export, see PMASA-2013-14
Commit: b9c814ed6d59733c54965e01e90ffd5d3348fd2c
https://github.com/phpmyadmin/phpmyadmin/commit/b9c814ed6d59733c54965e01e90…
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M ChangeLog
M version_check.php
Log Message:
-----------
[security] Fix unencoded json object, see PMASA-2013-11
Commit: e0c8704f725c56c87b644676ded94dba695de39f
https://github.com/phpmyadmin/phpmyadmin/commit/e0c8704f725c56c87b644676ded…
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M ChangeLog
M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
Log Message:
-----------
[security] Fix stored XSS in link transformation plugin, see PMASA-2013-13
Commit: 836529be425c5a309549ef440ee4d3bd6b30ca29
https://github.com/phpmyadmin/phpmyadmin/commit/836529be425c5a309549ef440ee…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M ChangeLog
R libraries/.htaccess
M libraries/Config.class.php
M libraries/DisplayResults.class.php
M libraries/Error.class.php
M libraries/Error_Handler.class.php
M libraries/List_Database.class.php
M libraries/PMA.php
M libraries/RecentTable.class.php
M libraries/bookmark.lib.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config/validate.lib.php
M libraries/engines/bdb.lib.php
M libraries/engines/berkeleydb.lib.php
M libraries/engines/binlog.lib.php
M libraries/engines/innobase.lib.php
M libraries/engines/innodb.lib.php
M libraries/engines/memory.lib.php
M libraries/engines/merge.lib.php
M libraries/engines/mrg_myisam.lib.php
M libraries/engines/myisam.lib.php
M libraries/engines/ndbcluster.lib.php
M libraries/engines/pbxt.lib.php
M libraries/navigation/NavigationHeader.class.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
M libraries/pmd_common.php
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/Pdf_Relation_Schema.class.php
M pmd_pdf.php
M schema_export.php
M server_status.php
R setup/frames/.htaccess
R setup/lib/.htaccess
M version_check.php
Log Message:
-----------
Fix merge conflicts
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bf79ce910161...836529be425c
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e5519859fb11c1dfcc0de6d9fc1156f77fdec2ed
https://github.com/phpmyadmin/phpmyadmin/commit/e5519859fb11c1dfcc0de6d9fc1…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M browse_foreigners.php
M libraries/DisplayResults.class.php
A libraries/String.class.php
M libraries/StringCType.class.php
M libraries/StringMB.class.php
M libraries/StringNative.class.php
M libraries/StringNativeType.class.php
M libraries/Util.class.php
M libraries/common.inc.php
M libraries/operations.lib.php
M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
M libraries/relation.lib.php
M libraries/server_bin_log.lib.php
M libraries/sqlparser.lib.php
A libraries/string.inc.php
R libraries/string.lib.php
R test/libraries/PMA_STR_sub_test.php
M test/libraries/PMA_string_test.php
Log Message:
-----------
Make all string function accessible via $GLOBALS['PMA_String']
Commit: 6d2d17e575675028090062c0c99e4893ea75fa44
https://github.com/phpmyadmin/phpmyadmin/commit/6d2d17e575675028090062c0c99…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M ChangeLog
M db_export.php
M db_qbe.php
M export.php
M import_status.php
M js/chart.js
M js/rte.js
M js/server_status_monitor.js
M js/sql.js
M js/tbl_zoom_plot_jqplot.js
M libraries/Advisor.class.php
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/Util.class.php
M libraries/advisory_rules.txt
M libraries/config.default.php
M libraries/config.values.php
M libraries/core.lib.php
A libraries/display_export.inc.php
M libraries/display_export.lib.php
M libraries/import.lib.php
M libraries/mult_submits.inc.php
M libraries/operations.lib.php
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
M libraries/plugins/auth/AuthenticationSignon.class.php
M libraries/plugins/export/ExportSql.class.php
M libraries/relation.lib.php
M libraries/schema/User_Schema.class.php
M libraries/select_lang.lib.php
M libraries/sql.lib.php
M libraries/sqlparser.lib.php
M libraries/sysinfo.lib.php
M phpunit.xml.dist
M pmd_display_field.php
M po/ckb.po
M po/gl.po
M po/hr.po
M po/pt.po
M po/pt_BR.po
M po/sv.po
A po/vls.po
M schema_export.php
M server_export.php
M server_plugins.php
M sql.php
M tbl_export.php
M tbl_row_action.php
M tbl_select.php
M tbl_structure.php
M test/bootstrap-dist.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
A test/classes/plugin/PMA_PluginManager_test.php
A test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
A test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
A test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
A test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
M test/classes/plugin/import/ImportOds_test.php
M test/classes/plugin/transformations/Image_JPEG_Inline_test.php
M test/classes/plugin/transformations/Image_Link_test.php
M test/classes/plugin/transformations/Image_PNG_Inline_test.php
M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
M test/classes/plugin/transformations/Text_Plain_Download_test.php
M test/classes/plugin/transformations/Text_Plain_External_test.php
M test/classes/plugin/transformations/Text_Plain_Formatted_test.php
M test/classes/plugin/transformations/Text_Plain_Hex_test.php
M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
M test/classes/plugin/transformations/Text_Plain_Link_test.php
A test/classes/properties/PMA_PorpertyItem_test.php
A test/classes/properties/options/PMA_OptionsPropertyGroup_test.php
A test/classes/properties/options/PMA_OptionsPropertyItem_test.php
A test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php
A test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
A test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
A test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
A test/classes/properties/options/items/PMA_PropertyItems_test.php
A test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
A test/classes/properties/plugins/PMA_ImportPluginProperties_test.php
A test/classes/properties/plugins/PMA_PluginPorpertyItem_test.php
M test/classes/schema/Dia_Relation_Schema_test.php
M test/classes/schema/Eps_Relation_Schema_test.php
M test/classes/schema/Pdf_Relation_Schema_test.php
M test/classes/schema/Svg_Relation_Schema_test.php
M test/libraries/PMA_FormDisplay_tpl_test.php
A test/libraries/PMA_SQL_parse_analyze_test.php
M test/libraries/PMA_SQL_parser_test.php
A test/libraries/PMA_display_export_test.php
M test/libraries/PMA_mysql_charsets_test.php
A test/libraries/PMA_relation_cleanup_test.php
M test/libraries/PMA_relation_test.php
A test/libraries/PMA_server_status_test.php
M test/libraries/PMA_user_preferences_test.php
M themes/.gitignore
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'master' into pma_string
Commit: 37233934a4442f1a912a9463d5143b30e3601e95
https://github.com/phpmyadmin/phpmyadmin/commit/37233934a4442f1a912a9463d51…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/StringNativeType.class.php
Log Message:
-----------
Use $this to refer to the instance
Commit: bce4e73452a425c9e3f1143893a1f790c39e6932
https://github.com/phpmyadmin/phpmyadmin/commit/bce4e73452a425c9e3f1143893a…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/StringNativeType.class.php
Log Message:
-----------
Simplify
Commit: 841ae562e33d66e9f982cfd5540c184a1a317aeb
https://github.com/phpmyadmin/phpmyadmin/commit/841ae562e33d66e9f982cfd5540…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/String.class.php
A libraries/StringAbstractType.class.php
M libraries/StringCType.class.php
M libraries/StringNativeType.class.php
Log Message:
-----------
Do not access $GLOBALS['PMA_String'] from StringNativeType class
Commit: a025dc7d2a72e4d410f5d25874db30dd32256bc5
https://github.com/phpmyadmin/phpmyadmin/commit/a025dc7d2a72e4d410f5d25874d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/String.class.php
M libraries/StringAbstractType.class.php
A libraries/StringByte.int.php
M libraries/StringCType.class.php
M libraries/StringMB.class.php
M libraries/StringNative.class.php
M libraries/StringNativeType.class.php
A libraries/StringType.int.php
Log Message:
-----------
Move interfaces into files of their own
Commit: dcfeeafe3b176e4b36165de8c3b43046bfdc751e
https://github.com/phpmyadmin/phpmyadmin/commit/dcfeeafe3b176e4b36165de8c3b…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M test/libraries/PMA_StringCType_test.php
M test/libraries/PMA_StringMB_test.php
M test/libraries/PMA_StringNativeType_test.php
M test/libraries/PMA_StringNative_test.php
Log Message:
-----------
Update test cases
Commit: 09f1e0cb97bfa5fa196b66dc7f5919a086d6658e
https://github.com/phpmyadmin/phpmyadmin/commit/09f1e0cb97bfa5fa196b66dc7f5…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M test/libraries/PMA_StringMB_test.php
Log Message:
-----------
Fix typo
Commit: 6df3c0adb58c632e6cfd092f11199beb8e8311c4
https://github.com/phpmyadmin/phpmyadmin/commit/6df3c0adb58c632e6cfd092f111…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M browse_foreigners.php
M libraries/DisplayResults.class.php
A libraries/String.class.php
A libraries/StringAbstractType.class.php
A libraries/StringByte.int.php
M libraries/StringCType.class.php
M libraries/StringMB.class.php
M libraries/StringNative.class.php
M libraries/StringNativeType.class.php
A libraries/StringType.int.php
M libraries/Util.class.php
M libraries/common.inc.php
M libraries/operations.lib.php
M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
M libraries/relation.lib.php
M libraries/server_bin_log.lib.php
M libraries/sqlparser.lib.php
A libraries/string.inc.php
R libraries/string.lib.php
R test/libraries/PMA_STR_sub_test.php
M test/libraries/PMA_StringCType_test.php
M test/libraries/PMA_StringMB_test.php
M test/libraries/PMA_StringNativeType_test.php
M test/libraries/PMA_StringNative_test.php
M test/libraries/PMA_string_test.php
Log Message:
-----------
Merge pull request #543 from madhuracj/pma_string
Pma string
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/627ed59770db...6df3c0adb58c