Commit Graph

77177 Commits

Author SHA1 Message Date
Michal Čihař
08bcd417a1 Merge remote-tracking branch 'origin/master' 2012-07-03 10:39:25 +02:00
Ashiyane Digital Security Team
07ad99b000 Translated using Weblate. 2012-07-03 10:39:23 +02:00
Michal Čihař
adec3f29db Define needed globals for test 2012-07-03 10:39:01 +02:00
Michal Čihař
d996f9f42a Merge remote-tracking branch 'chanaka/master' 2012-07-03 09:26:19 +02:00
Michal Čihař
e7e3164c0e Update po files 2012-07-03 09:20:19 +02:00
Michal Čihař
108d22bc8e Merge remote-tracking branch 'weblate/master' 2012-07-03 09:19:32 +02:00
Ashiyane Digital Security Team
dea82fc87d Translated using Weblate. 2012-07-03 09:18:52 +02:00
Michal Čihař
6f13e5faf7 Fix format strings 2012-07-03 09:18:30 +02:00
Michal Čihař
b4a8627bad Merge remote-tracking branch 'weblate/master'
Conflicts:
	po/en_GB.po
	po/eu.po
	po/fa.po
2012-07-03 09:17:12 +02:00
Ashiyane Digital Security Team
f857b92768 Translated using Weblate. 2012-07-03 09:07:03 +02:00
Ashiyane Digital Security Team
f775b0d3e0 Translated using Weblate. 2012-07-03 08:46:47 +02:00
Michal Čihař
837d76baf6 Merge pull request #77 from alexukf/plugins-and-OOP
Transformations bugs
2012-07-02 23:46:39 -07:00
Ashiyane Digital Security Team
ff11fdd8bc Translated using Weblate. 2012-07-02 23:05:46 +02: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
Ashiyane Digital Security Team
46a2d62791 Translated using Weblate. 2012-07-02 21:29:10 +02:00
Marc Delisle
3c301b0d59 Incorrect file reference 2012-07-02 15:28:58 -04:00
Ashiyane Digital Security Team
ebefd85b6b Translated using Weblate. 2012-07-02 21:26:57 +02:00
Marc Delisle
cf2ed4fd58 Update .po files 2012-07-02 15:26:00 -04:00
Michal Čihař
5982c4f562 Merge remote-tracking branch 'origin/master' 2012-07-02 21:20:41 +02:00
Ashiyane Digital Security Team
7586fe459a Translated using Weblate. 2012-07-02 21:20:40 +02:00
Marc Delisle
247a741148 Calling a file that is no longer there 2012-07-02 15:20:22 -04:00
Michal Čihař
b12c4112d9 Merge remote-tracking branch 'origin/master' 2012-07-02 20:52:19 +02:00
Ashiyane Digital Security Team
79c1e16271 Translated using Weblate. 2012-07-02 20:52:18 +02:00
J.M
3449d9f01f Fix html entities for astext export backlink, use jQuery for textSQLDUMP box 2012-07-02 20:51:32 +02:00
Chanaka Indrajith
e6d7ada958 Merge remote branch 'upstream/master' 2012-07-02 22:54:18 +05:30
Chanaka Indrajith
3b1fccd00e Test for _getCheckboxForMultiRowSubmissions function in PMA_DisplayResults class 2012-07-02 22:50:00 +05:30
Alex Marin
e330544b91 merge master 2012-07-02 20:05:34 +03:00
Chanaka Indrajith
dc47467812 Test for _getSortParams function in PMA_DisplayResults class 2012-07-02 22:09:50 +05:30
Alex Marin
3754538e2c Add neutral string for transformations in pma_column_info 2012-07-02 19:37:06 +03:00
Michal Čihař
9591b0a454 Merge remote-tracking branch 'origin/master' 2012-07-02 18:29:26 +02:00
Ashiyane Digital Security Team
ed2d817dcd Translated using Weblate. 2012-07-02 18:29:24 +02:00
aitzol berasategi
a3d2b6521a Translated using Weblate. 2012-07-02 18:29:22 +02:00
Chanaka Indrajith
56d641e992 Test for _getOffsets function in PMA_DisplayResults class 2012-07-02 21:55:23 +05:30
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
Chanaka Indrajith
fcd2189af0 Test for _getCheckBoxesForMultipleRowOperations function in PMA_DisplayResults class 2012-07-02 21:42:44 +05:30
Robert Readman
f25f7ca2cd Translated using Weblate. 2012-07-02 11:22:02 +02:00
Ashiyane Digital Security Team
be0ac30ef9 Translated using Weblate. 2012-07-02 11:08:50 +02:00
Michal Čihař
62e078f399 Merge remote-tracking branch 'origin/master' 2012-07-02 09:51:16 +02:00
Ashiyane Digital Security Team
af010f052e Translated using Weblate. 2012-07-02 09:51:15 +02:00
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