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

84238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Muhammad Kamran
4243b56ad3 Translated using Weblate (Urdu) 
Currently translated at 25.3% (659 of 2603)
 2013-06-13 19:42:12 +02:00
Dadan Setia
6036015aa1 Translated using Weblate (Indonesian) 
Currently translated at 75.6% (1967 of 2603)
 2013-06-13 19:42:09 +02:00
Marc Delisle
18b7f4e4d0 4.0.5-dev 2013-06-13 13:41:49 -04:00
Marc Delisle
821a1373d7 Merge branch 'MAINT_4_0_4' into QA_4_0 2013-06-13 13:40:35 -04:00
Marc Delisle
5778f641b3 4.0.4-rc1 2013-06-13 13:40:16 -04:00
Spun Nakandala
adf26c5223 documentation added for new queryflags (reload, drop_database) 2013-06-13 23:06:32 +05:30
Spun Nakandala
ae9ff0a8be check for drop database transfered to sql parser 2013-06-13 23:00:06 +05:30
Spun Nakandala
653bc9bd2c Checking for reload the navigation transfered to the sql parser 2013-06-13 23:00:04 +05:30
Marc Delisle
eddeb82fb6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-13 12:34:18 -04:00
Marc Delisle
3216740323 No longer need to confirm at the PHP level 2013-06-13 12:34:05 -04:00
Weblate
ebb640350c Merge remote-tracking branch 'origin/master' 2013-06-13 18:22:49 +02:00
Dadan Setia
e0f430856f Translated using Weblate (Indonesian) 
Currently translated at 72.4% (1938 of 2675)
 2013-06-13 18:22:34 +02:00
Marc Delisle
25a3a03e0c Merge pull request #415 from scnakandala/gsoc_2013 
Refactoring SQL executor
 2013-06-13 09:20:43 -07:00
Spun Nakandala
01a12cd253 error corrected 2013-06-13 20:28:29 +05:30
adamgsoc2013
a2e21be0b7 using HTML tag when testing Text_Plain_Formatted 2013-06-13 22:54:20 +08:00
Spun Nakandala
a9fd9aae52 bookmark.lib.php corrected to use the new variable names in $_POST['bkm_fields'][..] 2013-06-13 19:35:10 +05:30
adamgsoc2013
40356e9831 add test case for some import class 2013-06-13 21:34:35 +08:00
adamgsoc2013
3cea36f8b0 modify the test cases to better ones 2013-06-13 21:09:33 +08:00
Marc Delisle
17536941ec Improve function name 2013-06-13 08:31:05 -04:00
Marc Delisle
abaca78516 Merge pull request #421 from xmujay/0609_monitor 
refactor server_status_monitor.php 1. split long functions 2. add server_status_monitor.lib.php
 2013-06-13 05:23:55 -07:00
Weblate
b1e8e9c233 Merge remote-tracking branch 'origin/master' 2013-06-13 13:09:14 +02:00
Muhammad Kamran
8fbf5eac29 Translated using Weblate (Urdu) 
Currently translated at 24.2% (646 of 2673)
 2013-06-13 13:08:55 +02:00
Michal Čihař
e34445c69b Merge pull request #422 from psi-4ward/searchClause_hotkey 
Added accesskey="q" to searchClause input field to quickly get focus
 2013-06-13 04:03:48 -07:00
Christoph Wiechert
e6e5873534 Added accesskey="q" to searchClause input field to quickly focus it per hotkey 2013-06-13 12:47:09 +02:00
adamgsoc2013
188bb24f41 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_transform2 2013-06-13 18:15:40 +08:00
xmujay
6acdec1aef rename the function to a meaningful name 2013-06-13 14:49:25 +08:00
Spun Nakandala
3fabd7728f $_POST['fields'][...] variables renamed such that they better reflect their intended purpose 2013-06-13 11:31:29 +05:30
xmujay
438c84178f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0609_monitor 2013-06-13 10:30:01 +08:00