Commit Graph

83752 Commits

Author SHA1 Message Date
Anachak Udrach
b5a881cf7f Translated using Weblate (Thai)
Currently translated at 33.5% (893 of 2666)
2013-05-28 09:32:50 +02:00
Marc Delisle
20249123ca Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-05-27 12:53:00 -04:00
Marc Delisle
70c25451e2 Use CodeMirror to highlight in the processes list 2013-05-27 12:52:27 -04:00
Weblate
53ff85c3af Merge remote-tracking branch 'origin/master' 2013-05-27 18:37:54 +02:00
Pl P
d530f8a449 Translated using Weblate (Bulgarian)
Currently translated at 72.7% (1939 of 2666)
2013-05-27 18:37:39 +02:00
Marc Delisle
c9eb61b18e Use CodeMirror to highlight the SQL transformation 2013-05-27 12:37:17 -04:00
Madhura Jayaratne
cbf54a54a0 Here we need specific type of nodes rather than of Node type 2013-05-27 18:22:17 +05:30
Madhura Jayaratne
4b1fd35a6e Changing globals seem to cause problems 2013-05-27 18:15:38 +05:30
Madhura Jayaratne
1066429e36 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-05-27 18:10:41 +05:30
Madhura Jayaratne
5503a6d0b1 Test for getComment() method 2013-05-27 18:09:59 +05:30
Madhura Jayaratne
c42da7cf17 Use more specific method comment 2013-05-27 18:09:11 +05:30
Madhura Jayaratne
28eeb7e3a7 No need to manually backup and restore globals; PHPUnit does it for us 2013-05-27 17:51:25 +05:30
Marc Delisle
aec24af7e0 Translated using Weblate (French)
Currently translated at 100.0% (2666 of 2666)
2013-05-27 14:16:39 +02:00
Marc Delisle
302d38ad9d Fix typo 2013-05-27 07:59:10 -04:00
Madhura Jayaratne
50ecd45602 Fix class doc comments 2013-05-27 17:04:02 +05:30
Madhura Jayaratne
52db58fd30 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-05-27 16:16:39 +05:30
Madhura Jayaratne
16212da2c0 retRow is undefined rather than null 2013-05-27 14:26:36 +05:30
Madhura Jayaratne
25ad701a32 Fix indentation 2013-05-27 14:17:15 +05:30
Weblate
0df620d00b Merge remote-tracking branch 'origin/master' 2013-05-27 10:26:16 +02:00
Panagiotis Papazoglou
6476c13db3 Translated using Weblate (Greek)
Currently translated at 100.0% (2666 of 2666)
2013-05-27 10:25:53 +02:00
Madhura Jayaratne
7c7ed868ce Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-05-27 13:54:11 +05:30
Madhura Jayaratne
218092f92e Reverting "Move drizzle related code to PMA_DBI_Drizzle class" part of 17b3df142 2013-05-27 13:51:13 +05:30
Weblate
c6413e461a Merge remote-tracking branch 'origin/master' 2013-05-27 08:38:09 +02:00
Pl P
46c6a3feb5 Translated using Weblate (Bulgarian)
Currently translated at 72.7% (1938 of 2666)
2013-05-27 08:37:47 +02:00
Madhura Jayaratne
17b3df1422 Move drizzle related code to PMA_DBI_Drizzle class. Make sure the method signature of the implementation matches that of the interface. 2013-05-27 12:02:50 +05:30
Madhura Jayaratne
4bde8d3724 Use 'self' inside the class to refer to the class 2013-05-27 09:40:14 +05:30
Weblate
8a28fc8dcd Merge remote-tracking branch 'origin/master' 2013-05-26 23:20:58 +02:00
Michal Čihař
a6cd6ad202 Translated using Weblate (Czech)
Currently translated at 100.0% (2666 of 2666)
2013-05-26 23:20:31 +02:00
Marc Delisle
e193524a28 Merge pull request #401 from madhuracj/OOP_DBI
OOPing the database interface
2013-05-26 14:19:51 -07:00
Madhura Jayaratne
8eb8c995d4 Couple of renamings that got missed 2013-05-26 21:54:04 +05:30
Madhura Jayaratne
2baf473ad7 Merge branch 'master' into OOP_DBI
Conflicts:
	libraries/database_interface.lib.php
2013-05-26 21:43:33 +05:30
Madhura Jayaratne
0dab7f2463 Separate DatabaseInterface class and creation of an instance of it 2013-05-26 21:28:42 +05:30
Madhura Jayaratne
1ddad55fb5 Fix indentation 2013-05-26 21:18:04 +05:30
Madhura Jayaratne
3dd99512f0 These constants are better as a part of DatabaseInterface class 2013-05-26 21:15:24 +05:30
Marc Delisle
b8e4f346a5 Clarify function name 2013-05-26 11:34:43 -04:00
Marc Delisle
fc851a2222 Use CodeMirror highlight for routines execution 2013-05-26 11:25:01 -04:00
Marc Delisle
b2a8343670 Rename function reference 2013-05-26 11:14:23 -04:00
Madhura Jayaratne
4e09cb513b Make related functions and integral part of DatabaseInterface class 2013-05-26 20:42:23 +05:30
Weblate
aa762fce8e Merge remote-tracking branch 'origin/master' 2013-05-26 15:59:46 +02:00
Matías Bellone
649af762f2 Translated using Weblate (Spanish)
Currently translated at 100.0% (2666 of 2666)
2013-05-26 15:59:29 +02:00
Domen
31a495c72d Translated using Weblate (Slovenian)
Currently translated at 100.0% (2666 of 2666)
2013-05-26 15:59:10 +02:00
Lucius Castellanos
0f9b92e2ea Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2666 of 2666)
2013-05-26 15:58:46 +02:00
Marc Delisle
d2ed981a06 Merge branch 'QA_4_0' 2013-05-26 09:54:24 -04:00
Marc Delisle
1ffe27bcf6 Merge commit '914ab71' 2013-05-26 09:54:14 -04:00
Marc Delisle
1fd1a41541 Add unset() statement to help for future refactoring 2013-05-26 09:52:34 -04:00
Marc Delisle
4f197ef7af Code cleanup 2013-05-26 09:37:42 -04:00
Marc Delisle
efbe487468 Fix typos 2013-05-26 09:36:17 -04:00
Chanaka Indrajith
df37fd140f Fixed bug 3912 2013-05-26 16:07:00 +05:30
Madhura Jayaratne
50b0eed668 isSuperuser() is also a part of DatabaseInterface class 2013-05-26 09:18:11 +05:30
Madhura Jayaratne
5c9941ab6a Some more missing renamings 2013-05-26 07:31:17 +05:30