Commit Graph

85306 Commits

Author SHA1 Message Date
xmujay
6fd638cfcc add "\n", so that the js won't be commented out 2013-07-27 22:40:40 +08:00
xmujay
a2d5e961c7 fix SESSION_KEY 2013-07-27 19:30:31 +08:00
xmujay
3901ef3b64 fix the code style of display_import.lib.php 2013-07-27 19:17:51 +08:00
xmujay
b49988b4b1 1. rename display_import.lib.php to display_import.inc.php
2. split long code to functions
3. move function to display_import.lib.php
4. fix the included file: table, database, server
2013-07-27 19:06:39 +08:00
xmujay
cb7ad6bf3a fix the undefined error: $sql_data['valid_queries'] 2013-07-27 17:44:04 +08:00
xmujay
3f7526499e js is not load correctly 2013-07-26 22:23:44 +08:00
xmujay
5a4749f4e8 fix the js error 2013-07-26 21:52:41 +08:00
xmujay
e8fc1adf6b Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into server_refactor2 2013-07-26 09:45:00 +08:00
Xosé Calvo
fb9b894f72 Translated using Weblate (Galician)
Currently translated at 100.0% (2680.0 of 2680)
2013-07-25 23:17:42 +02:00
Michal Čihař
1d0126be6e Merge pull request #540 from adamgsoc2013/UT_plu_table
add unit test case for PMA_relation_cleanup
2013-07-25 11:58:12 -07:00
Weblate
c006f3dee2 Merge remote-tracking branch 'origin/master' 2013-07-25 20:48:08 +02:00
Xosé Calvo
f939929e46 Translated using Weblate (Galician)
Currently translated at 100.0% (2680 of 2680)
2013-07-25 20:48:03 +02:00
Michal Čihař
b838fde56f Missing format string 2013-07-25 20:47:52 +02:00
Xosé Calvo
416a80c44f Translated using Weblate (Galician)
Currently translated at 94.0% (2520 of 2680)
2013-07-25 19:48:48 +02:00
adamgsoc2013
191ef10f72 fix unneeded spaces 2013-07-26 01:44:54 +08:00
adamgsoc2013
78e9f55b5c Mock DBI 2013-07-26 01:37:03 +08:00
adamgsoc2013
331aa58ec2 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table 2013-07-26 00:07:43 +08:00
Atul Pratap Singh
00dc616b87 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-07-25 21:37:36 +05:30
adamgsoc2013
b7caf4f649 add unit test case for PMA_relation_cleanup 2013-07-26 00:04:32 +08:00
Atul Pratap Singh
4351cabc85 allow tooltip overflow, hide axis overflow explicitly 2013-07-25 21:33:38 +05:30
Weblate
72953da3fd Merge remote-tracking branch 'origin/master' 2013-07-25 17:23:41 +02:00
saurabh chikate
6bc8b9a22b Translated using Weblate (West Flemish)
Currently translated at 0.1% (4 of 2680)
2013-07-25 17:23:38 +02:00
Atul Pratap Singh
c40e29798f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-07-25 20:52:20 +05:30
Atul Pratap Singh
84f6e72fa7 Fix bug#4009, y-axis ticks invisible in Questions chart 2013-07-25 19:54:05 +05:30
Atul Pratap Singh
1c38c7cf19 Format values in Questions/Connections chart 2013-07-25 19:48:47 +05:30
xmujay
7cbc80d749 refactor the js 2013-07-25 21:58:21 +08:00
Weblate
44b7dcaeee Merge remote-tracking branch 'origin/master' 2013-07-25 13:15:26 +02:00
saurabh chikate
5891c27e09 Translated using Weblate (West Flemish)
Currently translated at 0.1% (4 of 2680)
2013-07-25 13:15:23 +02:00
Marc Delisle
539eeed057 Globals generated from POST were not used 2013-07-25 07:13:37 -04:00
Michal Čihař
04d815488d Use current DBI API 2013-07-25 11:13:55 +02:00
xmujay
53a0d5afd1 refactor display_import.lib.php
1. render html at once
2. split js code
2013-07-24 22:52:30 +08:00
Marc Delisle
93c5a23a72 bug #4024 Editing field a record is selected by makes pma load forever 2013-07-24 10:51:14 -04:00
Marc Delisle
e32a429038 Directly use the GET parameters 2013-07-24 07:40:04 -04:00
Michal Čihař
32faada516 Merge pull request #537 from adamgsoc2013/UT_plu_table
add test case for Table*
2013-07-24 00:23:37 -07:00
Marc Delisle
76c1df5ce8 Clarify comments 2013-07-23 15:31:48 -04:00
Marc Delisle
1c2929a57e Merge pull request #538 from scnakandala/gsoc_2013
Refactoring SQL executor
2013-07-23 12:30:01 -07:00
adamgsoc2013
ed36426b88 add test case for Table* 2013-07-24 00:17:08 +08:00
Spun Nakandala
ea842c4f36 removed include sql.php from db_qbe.php 2013-07-23 21:35:18 +05:30
Spun Nakandala
5dc092ba24 replaced include sql.php from tbl_structure.php 2013-07-23 21:25:10 +05:30
Spun Nakandala
69b7c86f50 class redeclaration error corrected 2013-07-23 21:20:18 +05:30
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ř
897449db08 Merge commit '71c26bcec2df4245af2dfe2ab41f167994177f0d' 2013-07-23 11:24:09 +02:00
Michal Čihař
81dba57b6a Better injection of variables into eval'd code 2013-07-23 11:20:56 +02:00
Michal Čihař
86fdba7203 Merge pull request #536 from xmujay/master
UTs for PMA_display_export
2013-07-22 23:53:27 -07:00