gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,266 Commits 12 Branches 481 Tags 2.4 GiB
beda4577c7
Commit Graph

84266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
beda4577c7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-16 22:26:13 +05:30
Madhura Jayaratne
00284d7437 Temporarily revert 0f4e573b1e, until further investigations on test failures 2013-06-16 22:23:55 +05:30
Weblate
0e99869184 Merge remote-tracking branch 'origin/master' 2013-06-16 14:12:35 +02:00
Ádám Papp-Kuster
e82d5505be Translated using Weblate (Hungarian) 
Currently translated at 75.1% (2007 of 2673)
 2013-06-16 14:12:31 +02:00
Marc Delisle
32c8ac600f Fix typo 2013-06-16 08:12:17 -04:00
Marc Delisle
ffaa1d2116 Fix typos 2013-06-16 08:11:16 -04:00
Marc Delisle
b39aeb1f89 Remove author name 2013-06-16 08:10:16 -04:00
Marc Delisle
c4883127c7 This file should not end in .lib.php 2013-06-16 08:08:07 -04:00
Marc Delisle
e3e16d181d Code has to be executed for each iteration of the loop 2013-06-16 08:04:56 -04:00
Weblate
c06f54551c Merge remote-tracking branch 'origin/master' 2013-06-16 13:55:03 +02:00
Ádám Papp-Kuster
c057952360 Translated using Weblate (Hungarian) 
Currently translated at 74.7% (1997 of 2673)
 2013-06-16 13:54:59 +02:00
Marc Delisle
27f5ec3b57 Merge pull request #428 from scnakandala/gsoc_2013 
Refactoring SQL executor
 2013-06-16 04:54:54 -07:00
Marc Delisle
d31ba0cb02 Merge branch 'QA_4_0' 2013-06-16 07:42:07 -04:00
Marc Delisle
7fb505533e Merge commit 'e3f0dcc' 2013-06-16 07:41:58 -04:00
Marc Delisle
178f83f915 bug #3984 Cannot insert in this table (PHP < 5.4) 2013-06-16 07:37:34 -04:00
Weblate
b8ab2d4bfe Merge remote-tracking branch 'origin/master' 2013-06-16 12:42:22 +02:00
Bilal Ćatić
deb0c8d4e9 Translated using Weblate (Bosnian) 
Currently translated at 17.7% (472 of 2673)
 2013-06-16 12:42:17 +02:00
Marc Delisle
9adbe80c48 Directly use the POST parameter 2013-06-16 06:42:02 -04:00
Spun Nakandala
ac2dcec785 changed such that $first_reserved_word is checked for the reserved word SHOW 2013-06-15 22:04:32 +05:30
Spun Nakandala
c11d079fc9 changed getTableHtmlForMultipleQueries() to use parse_analyze.lib.php 2013-06-15 21:11:40 +05:30
Spun Nakandala
00a3354499 changed to look the $first_reserved_word rather than any $upper_data 2013-06-15 20:55:56 +05:30
Weblate
536f8736d3 Merge remote-tracking branch 'origin/master' 2013-06-15 13:18:20 +02:00
Domen
680a60e4ed Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2673 of 2673)
 2013-06-15 13:18:17 +02:00
Tae-rok Hwang
1127000345 Translated using Weblate (Korean) 
Currently translated at 67.3% (1800 of 2675)
 2013-06-15 13:18:13 +02:00
Marc Delisle
49cd5516f6 Directly use the POST parameter 2013-06-15 07:17:56 -04:00
Spun Nakandala
7cecc2f23d code related to analyzing the sql query transferred to the sql analyzer 2013-06-15 14:50:31 +05:30
Domen
cb1ee1ec9e Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2673 of 2673)
 2013-06-14 22:10:10 +02:00
Marc Delisle
eff82ef97c Fix merge conflict 2013-06-14 14:56:47 -04:00
Marc Delisle
e3f0dcc423 Merge pull request #424 from kasunchathuranga/Bug3970 
Fix bug 3970 - Pressing enter in the filter field reloads page
 2013-06-14 11:53:04 -07:00
Marc Delisle
e6f6efae28 Merge commit '9ce33ef' 2013-06-14 14:30:17 -04:00
Marc Delisle
90862a0f4d Fix merge conflict 2013-06-14 14:29:39 -04:00
Marc Delisle
7492498492 Merge commit '0717e36' 2013-06-14 14:26:19 -04:00
Kasun Chathuranga
61df52ccdd Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into Bug3970 
Conflicts:
	ChangeLog
 2013-06-14 23:56:13 +05:30
Weblate
9ce33efe49 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-06-14 20:24:05 +02:00
Aputsiaq Niels Janussen
4d7a77b8df Translated using Weblate (Danish) 
Currently translated at 100.0% (2603 of 2603)
 2013-06-14 20:24:02 +02:00
Marc Delisle
ce102b9763 Merge pull request #427 from kasunchathuranga/Bug3977 
Fix bug 3977 - Not detected configuration storage
 2013-06-14 11:23:51 -07:00
Kasun Chathuranga
bee8d2f00d Fix bug 3970 - Pressing enter in the filter field reloads page 2013-06-14 23:51:13 +05:30
Kasun Chathuranga
c6d568d4f3 Fix bug 3977 - Not detected configuration storage 2013-06-14 23:30:42 +05:30
Marc Delisle
7121660ba9 Use POST variables directly 2013-06-14 09:24:50 -04:00
Michal Čihař
a3ed2b3db1 Merge pull request #426 from adamgsoc2013/UT_pluginss 
add test case for some import class
 2013-06-14 00:29:55 -07:00
Michal Čihař
c602e34ceb Merge pull request #420 from adamgsoc2013/UT_transform2 
add test case for Text_Plain_$type classes
 2013-06-13 23:54:23 -07:00
Marc Delisle
f4f710a3e2 - Fix typo 
- Frames are gone!
 2013-06-13 17:10:54 -04:00
Marc Delisle
c4e5808178 Merge pull request #423 from scnakandala/gsoc_2013 
Refactoring SQL executor
 2013-06-13 14:09:11 -07:00
Spun Nakandala
6f8152857b error corrected 2013-06-14 02:02:15 +05:30
Marc Delisle
09ed55ba42 Missing ChangeLog entry in master 2013-06-13 15:58:32 -04:00
Aputsiaq Niels Janussen
7d70a2eb0b Translated using Weblate (Danish) 
Currently translated at 100.0% (2673 of 2673)
 2013-06-13 20:03:02 +02:00
Aputsiaq Niels Janussen
0717e36017 Translated using Weblate (Danish) 
Currently translated at 100.0% (2603 of 2603)
 2013-06-13 20:02:38 +02:00
Marc Delisle
14bfb4cead Fix merge conflict 2013-06-13 13:42:39 -04:00
Weblate
96f0c2c52f Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-06-13 19:42:16 +02:00
Marc Delisle
b59a884e8b Merge branch 'QA_4_0' 2013-06-13 13:42:12 -04:00