webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity
85,394 Commits 12 Branches 481 Tags
71fcb2fe2cf74cdafe804154eba3e713fbfcd2ee
Commit Graph

9783 Commits

Author SHA1 Message Date
xmujay
71fcb2fe2c refactor server_status_queries.php: 1. move functions to lib file 2013-07-29 20:32:45 +08:00
Marc Delisle
0c21130100 Merge pull request #541 from scnakandala/gsoc_2013_2 
Refactoring SQL executor
 2013-07-28 10:03:35 -07:00
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Spun Nakandala
7b77857602 Query results operations not shown in Show PHP Code 2013-07-28 11:33:48 +05:30
Spun Nakandala
5d539b1b61 duplicate messages after without php code clicked corrected 2013-07-28 11:32:07 +05:30
Dieter Adriaenssens
e0c8704f72 [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13 2013-07-28 02:26:26 +02:00
Michal Čihař
6df3c0adb5 Merge pull request #543 from madhuracj/pma_string 
Pma string
 2013-07-27 12:50:24 -07:00
Madhura Jayaratne
a025dc7d2a Move interfaces into files of their own 2013-07-28 00:04:12 +05:30
Madhura Jayaratne
841ae562e3 Do not access $GLOBALS['PMA_String'] from StringNativeType class 2013-07-27 23:52:17 +05:30
Isaac Bennetch
1a41ce1f59 Merge branch 'hideTables' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-hideTables 
Conflicts:
	ChangeLog
 2013-07-27 14:01:35 -04:00
Madhura Jayaratne
bce4e73452 Simplify 2013-07-27 23:29:57 +05:30
Madhura Jayaratne
37233934a4 Use $this to refer to the instance 2013-07-27 23:29:10 +05:30
Madhura Jayaratne
6d2d17e575 Merge branch 'master' into pma_string 2013-07-27 23:08:42 +05:30
Madhura Jayaratne
d103a17c29 These methods are now part of Validator class, hence no PMA_ prefix 2013-07-27 21:26:57 +05:30
Kasun Chathuranga
0cc2cc69a5 Change feature name from 'navigation' to 'navigationhiding' 2013-07-27 21:11:44 +05:30
Madhura Jayaratne
b31a9cd16f Simplify how inline edit link is added. 2013-07-27 20:10:12 +05:30
Madhura Jayaratne
2a28436bdd #4035 Query "inline" link disappears when turning off "Explain SQL" option 2013-07-27 20:03:26 +05:30
Dieter Adriaenssens
ad8aa19097 remove duplicate code, CURLOPT_RETURNTRANSFER is set twice 2013-07-27 14:25:42 +02:00
Marc Delisle
ab7f0a143c Merge branch 'QA_4_0' 2013-07-27 06:33:34 -04:00
Marc Delisle
3fde4efd51 #3578 transformations for text/plain on a BLOB column 2013-07-27 06:32:58 -04:00
Marc Delisle
ea6582984e Return the correct db name 2013-07-27 05:19:24 -04:00
Marc Delisle
5dd6e4de3e Clarify comment 2013-07-26 17:24:22 -04:00
Marc Delisle
4e40875d02 Merge branch 'QA_4_0' 2013-07-26 09:06:15 -04:00
Marc Delisle
4a6b6bda90 bug #3998 Non-permanent SQL history not working 2013-07-26 08:59:04 -04:00
Kasun Chathuranga
04c2e88d67 Change tables name from 'navigation' to 'navigationhiding' 2013-07-25 21:26:23 +05:30
Michal Čihař
04d815488d Use current DBI API 2013-07-25 11:13:55 +02:00
Kasun Chathuranga
1ae59ad063 Merge branch 'hideTables' of github.com:kasunchathuranga/phpmyadmin into hideTables 
Conflicts:
	libraries/navigation/Nodes/Node_Database.class.php
	libraries/relation.lib.php
 2013-07-25 07:08:04 +05:30
Kasun Chathuranga
cb7c597e01 Improve message 2013-07-25 06:55:05 +05:30
Kasun Chathuranga
dd39bdd717 Use 'show' instead of 'unhide' in messages and method comments 2013-07-25 06:52:29 +05:30
Spun Nakandala
69b7c86f50 class redeclaration error corrected 2013-07-23 21:20:18 +05:30
Marc Delisle
1293e9b6e9 [security] Fix self-XSS in schema export, see PMASA-2013-14 2013-07-23 11:05:10 -04:00
Marc Delisle
957a204c5a Fix typos 2013-07-23 07:12:44 -04:00
Michal Čihař
1e109f88b2 Use local variable 2013-07-23 11:44:45 +02:00
Michal Čihař
5401211ac2 Avoid code duplication 2013-07-23 11:44:03 +02:00
Michal Čihař
8a5e39a9f7 Use variable variables instead of eval 2013-07-23 11:43:39 +02:00
Michal Čihař
1d5ca5375e Merge remote-tracking branch 'origin/QA_4_0' 2013-07-23 11:34:50 +02:00
Michal Čihař
2f48cd69eb Fix rule definition (value and check were mixed) 2013-07-23 11:34:33 +02:00
Michal Čihař
9e2260632e Merge remote-tracking branch 'origin/QA_4_0' 2013-07-23 11:24:22 +02:00
Michal Čihař
81dba57b6a Better injection of variables into eval'd code 2013-07-23 11:20:56 +02:00
Michal Čihař
664d560493 Merge pull request #534 from adamgsoc2013/UT_plu_parse 
add test case for parse_analyze.inc.php
 2013-07-22 23:52:53 -07:00
Kasun Chathuranga
0b702a9943 Merge branch 'master' into hideTables 2013-07-23 09:49:43 +05:30
Kasun Chathuranga
a715441a07 Escape navigation tree item names 2013-07-23 09:47:55 +05:30
Kasun Chathuranga
6d14bb1147 Simplify query execution 2013-07-23 09:44:54 +05:30
Kasun Chathuranga
72c775556a Fix typo 2013-07-23 09:29:33 +05:30
adamgsoc2013
5ca23f337d add test case for parse_analyze.inc.php 2013-07-22 22:19:11 +08:00
Marc Delisle
e186cffe2d Clarify code path 2013-07-22 06:03:03 -04:00
Michal Čihař
5030bafb95 Add West Flemish language 2013-07-22 10:38:57 +02:00
Kasun Chathuranga
ab50075e1c Style improvements to the unhide nav items dialog 2013-07-22 09:11:17 +05:30
Kasun Chathuranga
56b5c8e294 Extend navigation tree item hiding to functions. procedures, events and views 2013-07-22 08:18:21 +05:30