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

74663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jo Michael
fde69c836a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-11 19:46:31 +02:00
Jo Michael
6a2afedda0 Use PMA_fatalError in PMA_Config::checkConfigSource, allow auto extraction of localized error message 2012-04-11 19:44:38 +02:00
Madhura Jayaratne
bf8dac8ecc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-11 23:08:42 +05:30
Madhura Jayaratne
e118098133 Merge branch 'QA_3_5' 
Conflicts:
	ChangeLog
 2012-04-11 23:05:23 +05:30
Jo Michael
7943106d15 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-11 19:31:03 +02:00
Madhura Jayaratne
605650e11e bug #3516761 [edit] Query error after search 2012-04-11 22:56:56 +05:30
Jo Michael
50c6118068 Fix missing change-password fieldset in user edit dialog, add Loading indicator for user change password 2012-04-11 19:17:01 +02:00
Marc Delisle
9ad2e1079f 3.4.x is no longer the stable version 2012-04-11 12:54:07 -04:00
Madhura Jayaratne
edbff5a091 Translated using Weblate. 2012-04-11 18:24:06 +02:00
Julio Guerra
2ae5ccef12 Translated using Weblate. 2012-04-11 18:24:02 +02:00
Marc Delisle
aef7194b2a Translated using Weblate. 2012-04-11 18:23:17 +02:00
Julio Guerra
b6c5f4222b Translated using Weblate. 2012-04-11 17:58:04 +02:00
Michal Čihař
0f8d9e09cb Merge remote-tracking branch 'origin/master' 2012-04-11 16:20:16 +02:00
Madhura Jayaratne
a3312b3ce4 Translated using Weblate. 2012-04-11 16:19:53 +02:00
Dieter Adriaenssens
3a3da2987e add vim directive for indenting with spaces 2012-04-11 16:18:53 +02:00
Jo Michael
359a36ee6a Fix PMA_Config::checkConfigSource, extend is_readable check for bug #3059806 2012-04-11 16:11:09 +02:00
Jo Michael
42cc92c692 Add class=marked when checking tables having overhead 2012-04-11 15:50:45 +02:00
Jo Michael
c97963f226 'Check/uncheck all' links not working when used twice due to removeProp(checked) 2012-04-11 15:46:01 +02:00
Michal Čihař
bb850fa2d9 Merge remote-tracking branch 'origin/master' 2012-04-11 14:05:38 +02:00
Yuichiro Takahashi
8b88b04234 Translated using Weblate. 2012-04-11 14:05:33 +02:00
Michal Čihař
3f0c9e307f Translated using Weblate. 2012-04-11 14:05:31 +02:00
Michal Čihař
fe70a3c7de Remove parameter $die and use PMA_fatalError instead 
The parameter was used in testsuite only and this case is already
handled by PMA_fatalError.
 2012-04-11 14:04:00 +02:00
Michal Čihař
2814fc28c3 Add missing includes 2012-04-11 14:03:44 +02:00
Michal Čihař
2b2fc6e82b Document $data 2012-04-11 13:53:07 +02:00
Michal Čihař
b7db2b1ce3 Merge branch 'QA_3_5' 2012-04-11 11:08:15 +02:00
Michal Čihař
4d88be919c Merge branch 'QA_3_4' into QA_3_5 2012-04-11 11:08:04 +02:00
Michal Čihař
15e1584c7e Merge branch 'QA_3_3' into QA_3_4 2012-04-11 11:07:50 +02:00
Michal Čihař
e6f5e92a27 Merge branch 'QA_3_2' into QA_3_3 2012-04-11 11:07:36 +02:00
Michal Čihař
be3108b3e0 Merge branch 'QA_3_1' into QA_3_2 2012-04-11 11:07:21 +02:00
Michal Čihař
753e52660f Merge branch 'QA_3_0' into QA_3_1 2012-04-11 11:07:11 +02:00
Michal Čihař
8a7cf503a3 Merge branch 'QA_2_11' into QA_3_0 2012-04-11 11:06:59 +02:00
Michal Čihař
fa27f371f4 Merge branch 'QA_2_10' into QA_2_11 2012-04-11 11:06:45 +02:00
Michal Čihař
b09cad4342 Merge branch 'QA_2_9' into QA_2_10 2012-04-11 11:06:39 +02:00
Michal Čihař
a6c4ea2f7e Merge remote-tracking branches 'origin/MAINT_3_3_0', 'origin/MAINT_3_3_1', 'origin/MAINT_3_3_10', 'origin/MAINT_3_3_2', 'origin/MAINT_3_3_3', 'origin/MAINT_3_3_4', 'origin/MAINT_3_3_5', 'origin/MAINT_3_3_6', 'origin/MAINT_3_3_7', 'origin/MAINT_3_3_8' and 'origin/MAINT_3_3_9' into QA_3_3 2012-04-11 11:05:47 +02:00
Michal Čihař
a1ff927fbf Merge remote-tracking branches 'origin/MAINT_3_2_0', 'origin/MAINT_3_2_2', 'origin/MAINT_3_2_3', 'origin/MAINT_3_2_4' and 'origin/MAINT_3_2_5' into QA_3_2 2012-04-11 11:05:46 +02:00
Michal Čihař
1ff6ab9f9a Merge remote-tracking branches 'origin/MAINT_3_1_0', 'origin/MAINT_3_1_1', 'origin/MAINT_3_1_2', 'origin/MAINT_3_1_3', 'origin/MAINT_3_1_4' and 'origin/MAINT_3_1_5' into QA_3_1 2012-04-11 11:05:46 +02:00
Michal Čihař
d972e71e0a Merge remote-tracking branches 'origin/MAINT_3_0_0' and 'origin/MAINT_3_0_1' into QA_3_0 2012-04-11 11:05:45 +02:00
Michal Čihař
62306d3e6a Merge remote-tracking branches 'origin/MAINT_2_9_0', 'origin/MAINT_2_9_1' and 'origin/MAINT_2_9_2' into QA_2_9 2012-04-11 11:05:45 +02:00
Michal Čihař
828d01d203 Merge remote-tracking branches 'origin/MAINT_2_11_0', 'origin/MAINT_2_11_1', 'origin/MAINT_2_11_10', 'origin/MAINT_2_11_11', 'origin/MAINT_2_11_2', 'origin/MAINT_2_11_3', 'origin/MAINT_2_11_4', 'origin/MAINT_2_11_5', 'origin/MAINT_2_11_6', 'origin/MAINT_2_11_7', 'origin/MAINT_2_11_8' and 'origin/MAINT_2_11_9' into QA_2_11 2012-04-11 11:05:44 +02:00
Michal Čihař
977ec6f8e2 Merge remote-tracking branches 'origin/MAINT_2_10_0', 'origin/MAINT_2_10_2' and 'origin/MAINT_2_10_3' into QA_2_10 2012-04-11 11:05:43 +02:00
Michal Čihař
870292dc88 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-11 08:45:44 +02:00
Michal Čihař
c9d2887771 Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5 2012-04-11 08:43:43 +02:00
Madhura Jayaratne
af02c92c7d Translated using Weblate. 2012-04-11 05:00:53 +02:00
Madhura Jayaratne
5a98417602 Translated using Weblate. 2012-04-11 05:00:27 +02:00
Michal Čihař
7a9db73dbf Merge remote-tracking branch 'origin/master' 2012-04-11 01:05:14 +02:00
Jo Michael
c79f6dfef2 - bug #3059806 Supporting running from CIFS/Samba shares 2012-04-11 01:04:13 +02:00
ProUser
e1e31cd4a9 Translated using Weblate. 2012-04-11 00:48:15 +02:00
Michal Čihař
c3afd91c8f Merge remote-tracking branch 'origin/master' 2012-04-11 00:37:34 +02:00
ProUser
578abe7c5c Translated using Weblate. 2012-04-11 00:37:31 +02:00
Jo Michael
378aae6152 Cleanup 3 identical 'Change password' headings in jQ-UI dialog 2012-04-11 00:36:59 +02:00