gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,381 Commits 12 Branches 481 Tags 2.4 GiB
9fb69a229f
Commit Graph

90381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
9fb69a229f Merge branch 'fixExport' 2014-03-01 14:27:36 +01:00
Hugues Peccatte
dcfe93a888 Minor PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-28 22:09:48 +01:00
Hugues Peccatte
1b13ecac80 Fix use of a missing variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-28 22:07:52 +01:00
Marc Delisle
1fc31bb57b Merge branch 'QA_4_1' 2014-02-28 15:16:10 -05:00
Marc Delisle
35a61a4052 Merge commit '9b7fccd' 2014-02-28 15:16:04 -05:00
Marc Delisle
d808194e2d Merge commit '5f93f45' 2014-02-28 15:15:31 -05:00
Marc Delisle
46b3419977 Merge commit '431c2ad' 2014-02-28 15:15:19 -05:00
Marc Delisle
93578eb963 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-28 15:14:36 -05:00
Weblate
9b7fccd1c3 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-28 21:11:54 +01:00
Matías Bellone
72d11b7a7c Translated using Weblate (Spanish) 
Currently translated at 100.0% (2749 of 2749)
 2014-02-28 21:11:51 +01:00
Marc Delisle
94cb1e11f8 Merge pull request #976 from sampathLiyanage/bugfixdbsearch 
DB Search bug fix #4299
 2014-02-28 15:11:48 -05:00
Sampath Liyanage
5f93f45c04 test failure fixed 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-03-01 00:15:08 +05:30
Domen
aab02e867e Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-28 19:44:17 +01:00
Marc Delisle
3aad41c407 Merge pull request #977 from Dennis1993/master 
No space between attributes
 2014-02-28 12:56:15 -05:00
Dennis1993
a9ccbe9021 No space between attributes 
Signed-off-by: Marvin Wegener <mw197@web.de>
 2014-02-28 18:45:16 +01:00
Michal Čihař
05d1f0344b Should wait for login page before doing login 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-28 10:44:19 +01:00
Weblate
204728cdfe Merge remote-tracking branch 'origin/master' 2014-02-28 08:52:23 +01:00
Burak Yavuz
51676fa88a Translated using Weblate (Turkish) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-28 08:52:20 +01:00
Michal Čihař
2bacdef4f4 Drop non js behavior of export chooser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-28 08:51:58 +01:00
Michal Čihař
d9eccfa988 Increase timeout for javascript 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-28 08:43:53 +01:00
Sampath Liyanage
431c2ad5d8 DB Search bug fix 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-02-28 01:50:33 +05:30
Burak Yavuz
39eb75c4fd Translated using Weblate (Turkish) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-27 20:08:15 +01:00
Marc Delisle
44b3c01aed Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-02-27 13:00:46 -05:00
Marc Delisle
8a419f4ccf ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-27 13:00:35 -05:00
Weblate
30cc87b2b0 Merge remote-tracking branch 'origin/master' 2014-02-27 18:58:40 +01:00
Burak Yavuz
82ba32aec1 Translated using Weblate (Turkish) 
Currently translated at 99.6% (2743 of 2752)
 2014-02-27 18:58:37 +01:00
Marc Delisle
2ea1965a9a Translated using Weblate (French) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-27 18:58:34 +01:00
Dieter Adriaenssens
75d8b60217 Translated using Weblate (Dutch) 
Currently translated at 99.1% (2728 of 2752)
 2014-02-27 18:58:32 +01:00
Marc Delisle
865f6e4e17 Merge pull request #959 from vpowerrc/bug-#4281 
fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value
 2014-02-27 12:58:29 -05:00
Matías Bellone
49a7930156 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-27 18:13:16 +01:00
Michal Čihař
f60484a86d Do not set not used global variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-27 16:23:43 +01:00
Michal Čihař
5d769e5d18 Merge pull request #964 from nijel/skip-show-database-doc 
Update documentation in regard to --skip-show-database
 2014-02-27 16:22:35 +01:00
Michal Čihař
f122e06efb Merge pull request #963 from nijel/remove-skip-show-database 
Remove control link from PMA_List_Database class
 2014-02-27 16:22:21 +01:00
Panagiotis Papazoglou
76909edc92 Translated using Weblate (Greek) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-27 16:16:11 +01:00
Michal Čihař
6917afbb19 Remove no longer used ignoreUntil parameter of PMA_Advisor::ruleExprEvaluate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-27 15:17:01 +01:00
Michal Čihař
a908df0034 Simplify formatting string in advisor 
We don't need to evaluate whole printf, it's enough to evalue the
parameter.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-27 15:17:01 +01:00
Michal Čihař
ad51d8a42c Merge pull request #973 from WhaleWatching/add_space_for_mark 
Add space after table columns name, to prevent misuse when you want to m...
 2014-02-27 14:34:36 +01:00
Edward Cheng
07de383439 Add space after table columns name, to prevent misuse when you want to mark it. 
Sometimes there's not any space for user to click.


Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-02-27 21:11:45 +08:00
Michal Čihař
b87a38f9c9 Merge pull request #972 from D-storm/master 
Feature Request #1460 Redirect to login page after session has expired
 2014-02-27 13:45:04 +01:00
Chirayu Chiripal
dec30ffd6d Feature Request #1460 Redirect to login page after session has expired 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-02-27 17:45:46 +05:30
Weblate
26868db02f Merge remote-tracking branch 'origin/master' 2014-02-27 12:05:50 +01:00
Kristjan Räts
eb3ccb9c00 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-27 12:05:48 +01:00
Michal Čihař
3f108f0c03 Remove not implemented session test 
I have no clue what should be tested here and we anyway start session in
testsuite bootstrap.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-27 12:04:59 +01:00
Michal Čihař
16d4b0502a Merge remote-tracking branch 'origin/QA_4_1' 2014-02-27 11:42:45 +01:00
Michal Čihař
46e9eda407 Translated using Weblate (Ukrainian) 
Currently translated at 90.0% (2477 of 2752)
 2014-02-27 11:41:09 +01:00
Michal Čihař
f4eef11e89 Translated using Weblate (Spanish) 
Currently translated at 99.6% (2742 of 2752)
 2014-02-27 11:41:04 +01:00
Michal Čihař
b55b93ff23 Translated using Weblate (Slovenian) 
Currently translated at 99.6% (2742 of 2752)
 2014-02-27 11:41:00 +01:00
Michal Čihař
59e21a5a67 Translated using Weblate (Slovak) 
Currently translated at 76.0% (2094 of 2752)
 2014-02-27 11:40:56 +01:00
Michal Čihař
bc016972a1 Translated using Weblate (Lithuanian) 
Currently translated at 55.1% (1517 of 2752)
 2014-02-27 11:40:51 +01:00
Michal Čihař
83660bd5a4 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-27 11:40:46 +01:00