Commit Graph

77147 Commits

Author SHA1 Message Date
Michal Čihař
837d76baf6 Merge pull request #77 from alexukf/plugins-and-OOP
Transformations bugs
2012-07-02 23:46:39 -07:00
J.M
b55019e00c Fix function call not camelCased yet 2012-07-02 23:05:23 +02:00
Alex Marin
64d00c52ae Merge branch 'master' into plugins-and-OOP 2012-07-02 23:02:22 +03:00
Alex Marin
f5989eb628 fix error from merge conflict in transformations 2012-07-02 23:01:03 +03:00
Alex Marin
defb4d6d39 fix missing include in PMA_Tracker class 2012-07-02 22:53:50 +03:00
Marc Delisle
3c301b0d59 Incorrect file reference 2012-07-02 15:28:58 -04:00
Marc Delisle
cf2ed4fd58 Update .po files 2012-07-02 15:26:00 -04:00
Marc Delisle
247a741148 Calling a file that is no longer there 2012-07-02 15:20:22 -04:00
J.M
3449d9f01f Fix html entities for astext export backlink, use jQuery for textSQLDUMP box 2012-07-02 20:51:32 +02:00
Alex Marin
e330544b91 merge master 2012-07-02 20:05:34 +03:00
Alex Marin
3754538e2c Add neutral string for transformations in pma_column_info 2012-07-02 19:37:06 +03:00
Madhura Jayaratne
1d93de6ada Merge branch 'QA_3_5' 2012-07-02 21:54:57 +05:30
Madhura Jayaratne
bc5602d079 bug #3526916 [interface] Search fails with JS error when tooltips disabled 2012-07-02 21:51:13 +05:30
Michal Čihař
4cb00c8eca Fix format string 2012-07-02 09:50:37 +02:00
Michal Čihař
6ea9090499 Merge remote-tracking branch 'origin/master' 2012-07-02 08:48:06 +02:00
Michal Čihař
2d055c8190 Merge remote-tracking branch 'chanaka/master' 2012-07-02 08:46:33 +02:00
Michal Čihař
b2d22a3722 Merge remote-tracking branch 'origin/master' 2012-07-02 08:46:23 +02:00
Abadis Ashiyane
6cbe87d0aa Translated using Weblate. 2012-07-02 08:46:21 +02:00
Michal Čihař
1f79beefba Merge remote-tracking branch 'yasitha/master' 2012-07-02 08:46:01 +02:00
Marc Delisle
76f779acf5 Translated using Weblate. 2012-07-01 23:12:47 +02:00
Yasitha Pandithawatta
55361a7c9d Merge remote-tracking branch 'upstream/master' 2012-07-02 00:48:20 +05:30
Yasitha Pandithawatta
26b7d10002 Test cases for PMA_Footer.class.php 2012-07-02 00:46:32 +05:30
Chanaka Indrajith
9a2900508d Merge remote branch 'upstream/master' 2012-07-01 23:56:04 +05:30
Chanaka Indrajith
b623c59512 Tests for _getOperationLinksForVerticleTable function in PMA_DisplayResults class 2012-07-01 23:51:23 +05:30
Michal Čihař
05331f0cf1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-07-01 19:50:50 +02:00
J.M
7d7fc3537c Open gc-maxlifetime warning PHP docs link in new tab, to ignore CSP 2012-07-01 19:50:20 +02:00
Michal Čihař
d57c6bc815 Merge remote-tracking branch 'origin/master' 2012-07-01 19:49:21 +02:00
ProUser
bffb66c910 Translated using Weblate. 2012-07-01 19:49:21 +02:00
aitzol berasategi
1065739b1a Translated using Weblate. 2012-07-01 19:49:19 +02:00
Michal Čihař
4880a28367 Merge remote-tracking branch 'origin/QA_3_5' 2012-07-01 19:49:01 +02:00
aitzol berasategi
e93e1daef6 Translated using Weblate. 2012-07-01 19:46:33 +02:00
Alex Marin
7557ad027a Translated using Weblate. 2012-07-01 19:46:33 +02:00
aitzol berasategi
e1d18bd2c7 Translated using Weblate. 2012-07-01 19:46:33 +02:00
J.M
c1eeb2f6c4 Open gc-maxlifetime warning PHP docs link in new tab, to ignore CSP 2012-07-01 19:31:37 +02:00
J. M
fd04c77cf3 Translated using Weblate. 2012-07-01 18:22:05 +02:00
ProUser
37e78d92ea Translated using Weblate. 2012-07-01 18:04:14 +02:00
Chanaka Indrajith
30a8228324 Tests for _getClassForDateTimeRelatedFields function in PMA_DisplayResults class 2012-07-01 21:16:41 +05:30
Michal Čihař
ce2fd3405a Merge remote-tracking branch 'origin/master' 2012-07-01 17:27:34 +02:00
J.M
f96c97984e Merge branch 'QA_3_5' 2012-07-01 17:27:19 +02:00
Chanaka Indrajith
3fa728f641 Test for _getResettedClassForInlineEdit function in PMA_DisplayResults class 2012-07-01 20:54:23 +05:30
J.M
96f6627a53 Move changelog entries of commits reverted in MAINT_3_5_2 to 3.5.3 section 2012-07-01 17:18:57 +02:00
J.M
18b8f215c6 Backport commit 4521b28 to fix bug #3527531, die after sending Location header in url.php 2012-07-01 17:17:35 +02:00
J.M
8f0f6da64c - bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done 2012-07-01 17:17:31 +02:00
J.M
468998912a - bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore 2012-07-01 17:17:27 +02:00
Michal Čihař
4b0d431ad7 Merge remote-tracking branch 'origin/master' 2012-07-01 15:39:58 +02:00
aitzol berasategi
7b57ed650f Translated using Weblate. 2012-07-01 15:39:55 +02:00
J.M
9e37ad67c3 Merge branch 'QA_3_5' 2012-07-01 15:37:42 +02:00
J.M
49b5c0e63e Merge branch 'MAINT_3_5_2' into QA_3_5 2012-07-01 15:31:06 +02:00
J.M
c401df21e8 - bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done 2012-07-01 15:29:47 +02:00
Michal Čihař
366b83e97a Merge remote-tracking branch 'yasitha/master' 2012-07-01 11:33:08 +02:00