Commit Graph

82021 Commits

Author SHA1 Message Date
Michal Čihař
8bc109f170 Translated using Weblate (Czech)
Currently translated at 100.0% (2606 of 2606)
2013-04-02 17:14:50 +02:00
Michal Čihař
5510e16f78 Drop unused code 2013-04-02 16:56:25 +02:00
Michal Čihař
9190e7a1cb Improve credits formatting 2013-04-02 16:53:52 +02:00
Michal Čihař
85f060d288 Add script to get some translator stats 2013-04-02 16:48:33 +02:00
Michal Čihař
9e28b2fe21 Include translator credits (bug #3843) 2013-04-02 16:48:33 +02:00
Weblate
822e90c6de Merge remote-tracking branch 'origin/master' 2013-04-02 16:41:10 +02:00
zz zz
187aae4b55 Translated using Weblate (Simplified Chinese)
Currently translated at 97.3% (2536 of 2606)
2013-04-02 16:41:02 +02:00
Marc Delisle
89698a9a93 Fix merge conflicts 2013-04-02 10:38:13 -04:00
Marc Delisle
60df4749c1 Merge branch 'QA_3_5' 2013-04-02 10:32:45 -04:00
Marc Delisle
66a66ff5fc Merge pull request #225 from kasunchathuranga/Bug3800
Fix bug #3800 Incorrect keyhandler behaviour #2
2013-04-02 07:29:03 -07:00
Kasun Chathuranga
eaa503cd5d Fix bug #3800 Incorrect keyhandler behaviour #2 2013-04-02 06:37:42 +05:30
Weblate
0d2ef03eab Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-04-01 22:57:35 +02:00
Burak Yavuz
cbbb8b40e1 Translated using Weblate (Turkish)
Currently translated at 100.0% (2562 of 2562)
2013-04-01 22:57:31 +02:00
Dieter Adriaenssens
b6ae26a7a9 improve coding style : echo does not need parenthesis 2013-04-01 22:56:43 +02:00
Dieter Adriaenssens
8c9d7c8009 fix typo 2013-04-01 22:53:41 +02:00
Dieter Adriaenssens
d83d4eb683 Merge branch 'QA_3_5'
Conflicts:
	ChangeLog
	tbl_gis_visualization.php
2013-04-01 22:50:40 +02:00
Dieter Adriaenssens
7e9ac67cbb add Changelog item for XSS found by Janek Vind, fixed in commit 79089c9bc0 2013-04-01 22:35:37 +02:00
Dieter Adriaenssens
79089c9bc0 fix XSS reported by Janek Vind 2013-04-01 22:29:21 +02:00
Marc Delisle
58a8e37de4 Comment about the best place to include CodeMirror 2013-04-01 07:44:03 -04:00
Marc Delisle
f29d9bccbf Merge pull request #223 from kasunchathuranga/Bug3835
Fix bug #3835 Disabling CodeMirror in GUI settings does not actually dis...
2013-04-01 04:37:14 -07:00
Weblate
08e5a81805 Merge remote-tracking branch 'origin/master' 2013-04-01 13:06:04 +02:00
Burak Yavuz
eb874c3851 Translated using Weblate (Turkish)
Currently translated at 100.0% (2606 of 2606)
2013-04-01 13:05:56 +02:00
Marc Delisle
29b297f41f Fix bug "#3853 Blowfish implementation might be broken" by replacing the
library with phpseclib

I could not make PMA_blowfish_test.php work with the new library.
2013-04-01 07:04:25 -04:00
Marc Delisle
7b7abce116 Clarify the logic 2013-04-01 06:44:42 -04:00
Kasun Chathuranga
71e96e7590 Fix bug #3835 Disabling CodeMirror in GUI settings does not actually disable it 2013-03-31 16:30:48 +05:30
Weblate
f412fa7a02 Merge remote-tracking branch 'origin/master' 2013-03-30 14:46:04 +01:00
Hamlet Muradyan
6d74f50426 Translated using Weblate (Armenian)
Currently translated at 4.3% (112 of 2606)
2013-03-30 14:45:59 +01:00
Chanaka Indrajith
4c59ac5dd9 Merge pull request #218 from phpfaber/master
Fix favicon disappearing in Firefox when setting location.hash
2013-03-30 06:45:52 -07:00
PHP Faber
ed11f037d8 Renamed function to fit camel case methods naming. 2013-03-30 12:44:02 +02:00
Marc Delisle
a746469e97 Unnecessary loop 2013-03-30 06:10:59 -04:00
Aputsiaq Niels Janussen
1e5d225bba Translated using Weblate (Danish)
Currently translated at 100.0% (2606 of 2606)
2013-03-30 01:34:29 +01:00
Marc Delisle
118c0e2195 English improvement 2013-03-29 13:18:49 -04:00
Marc Delisle
79ebabd607 English improvement 2013-03-29 13:18:12 -04:00
Marc Delisle
321c96269c English improvement 2013-03-29 13:17:49 -04:00
Marc Delisle
a64455da57 English improvement 2013-03-29 13:17:11 -04:00
Marc Delisle
9c0d1a20af English improvement 2013-03-29 13:15:55 -04:00
Marc Delisle
d0a7dd7b3a English improvement 2013-03-29 13:14:00 -04:00
Marc Delisle
857631f92f Fix merge conflict 2013-03-29 10:42:07 -04:00
Marc Delisle
71d5dab030 Merge branch 'QA_3_5' 2013-03-29 10:41:34 -04:00
Marc Delisle
93070c081c Use HTML5 DOCTYPE 2013-03-29 10:41:05 -04:00
Marc Delisle
7f16f91b3b Fix merge conflicts 2013-03-29 08:18:12 -04:00
Marc Delisle
e7257bbce1 Merge branch 'QA_3_5' 2013-03-29 08:17:19 -04:00
Marc Delisle
b6d2403339 ChangeLog entry for bug #3705 Attempt to open trigger for edit gives NULL 2013-03-29 08:15:30 -04:00
Weblate
398d1415cd Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-03-29 13:06:28 +01:00
Yungu Kim
1a0480dbe8 Translated using Weblate (Korean)
Currently translated at 51.4% (1318 of 2562)
2013-03-29 13:06:25 +01:00
Xavier Navarro
ca59b5965d Translated using Weblate (Catalan)
Currently translated at 100.0% (2562 of 2562)
2013-03-29 13:06:22 +01:00
Rouslan Placella
b177571c24 Merge branch 'QA_3_5'
Conflicts:
	po/ca.po
	po/ms.po
	po/nb.po
2013-03-29 12:05:01 +00:00
Nikolay Ermolovich
45af9e1869 Update rte_triggers.lib.php
Editing a trigger with special characters
2013-03-29 12:03:59 +00:00
Marc Delisle
808b66ec95 Merge pull request #222 from hisamith/missing_error_message_add_existing_column_3857
Fixed #3857 Missing error message when adding an existing column
2013-03-29 04:41:36 -07:00
Samith Dassanayake
f838877819 Fixed #3857 Missing error message when adding an existing column 2013-03-29 16:45:12 +05:30