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

71532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan Pecek
fafedaf575 Improve X-Content-Security-Policy header to work in FF, Chrome and Opera; but loading version.js script is still disabled in main.php (due to https), BugID: 3426500 2012-04-16 14:17:12 +02:00
Jo Michael
b718db9c05 Fixed too much top margin of table structure more-actions when loading page in small window 2012-04-14 19:26:23 +02:00
Marc Delisle
8b31dd3991 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-14 07:38:28 -04:00
Marc Delisle
ea17cef342 Fix merge conflicts 2012-04-14 07:38:03 -04:00
Marc Delisle
7738ec98e8 Merge branch 'QA_3_4' into MAINT_3_5_0 2012-04-14 07:36:52 -04:00
Marc Delisle
3345d64a6f 3.4.11 release 2012-04-14 07:35:22 -04:00
Jo Michael
92f8d794c7 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-04-13 19:24:22 +02:00
Jo Michael
b2aee016c4 Calculate table action more_opts maximum width correctly 2012-04-13 19:23:51 +02:00
Madhura Jayaratne
3af218eb76 Make some messages translatable 2012-04-13 19:56:47 +05:30
Madhura Jayaratne
2707c6c463 Translated using Weblate. 2012-04-13 10:06:35 +02:00
Madhura Jayaratne
2dedc5ae0d Translated using Weblate. 2012-04-12 16:07:42 +02:00
Julio Guerra
59f2b77364 Translated using Weblate. 2012-04-12 16:07:41 +02:00
Michal Čihař
161c30959a Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-12 10:17:04 +02:00
Jo Michael
84c7688784 Fix broken grid editing in table browse mode 2012-04-12 03:33:49 +02:00
Michal Čihař
65f70fb8c0 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-12 02:35:16 +02:00
Julio Guerra
1653133a70 Translated using Weblate. 2012-04-12 02:34:50 +02:00
Jo Michael
cf831935cb - bug #3516817 [interface] "More" actions in table structure 2012-04-12 02:34:31 +02:00
Julio Guerra
e697970c5c Translated using Weblate. 2012-04-12 01:15:27 +02:00
Michal Čihař
313acb84d3 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-11 23:35:55 +02:00
Madhura Jayaratne
c181e1f478 Translated using Weblate. 2012-04-11 23:35:46 +02:00
Marc Delisle
b84bcb1370 Translated using Weblate. 2012-04-11 23:35:44 +02:00
Jo Michael
d628eab1e9 - bug #3517021 [interface] Header links except 'More' hide after closing dialog 2012-04-11 23:25:17 +02:00
Madhura Jayaratne
6ba52cac1b bug #3516405 [display] Chart title is getting wrong within chart export 2012-04-11 23:47:07 +05:30
Michal Čihař
57e516d2fd Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-11 19:30:38 +02:00
Madhura Jayaratne
8be2afa33c Translated using Weblate. 2012-04-11 19:30:24 +02:00
Michal Čihař
efde708748 Translated using Weblate. 2012-04-11 19:30:17 +02:00
Madhura Jayaratne
605650e11e bug #3516761 [edit] Query error after search 2012-04-11 22:56:56 +05:30
Marc Delisle
591d1518fe 3.4.11-rc1 2012-04-11 12:34:31 -04:00
Julio Guerra
4dc81c2f26 Translated using Weblate. 2012-04-11 18:32:16 +02:00
Julio Guerra
53e61583a7 Translated using Weblate. 2012-04-11 17:58:32 +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ř
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ř
f32520e3cf Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-10 16:18:07 +02:00
jaideejung007
734dd9ba45 Translated using Weblate. 2012-04-10 16:18:03 +02:00