Commit Graph

82172 Commits

Author SHA1 Message Date
Jonadabe PT
6415c03d67 Translated using Weblate (Portuguese)
Currently translated at 50.4% (1313 of 2605)
2013-04-18 11:12:19 +02:00
Michal Čihař
8fdd99aceb Merge remote-tracking branch 'origin/QA_3_5' into QA_4_0 2013-04-16 14:48:16 +02:00
zz zz
70081a7d19 Translated using Weblate (Simplified Chinese)
Currently translated at 100.0% (2561 of 2562)
2013-04-16 14:47:49 +02:00
Rodrigo Souza
1b423ccade Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2562 of 2562)
2013-04-16 14:47:49 +02:00
Yungu Kim
daeb455ec3 Translated using Weblate (Korean)
Currently translated at 58.0% (1485 of 2562)
2013-04-16 14:47:47 +02:00
Michal Čihař
395e3de6ba Remove extra ; 2013-04-16 11:54:13 +02:00
Marc Delisle
3731b1376f Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 2013-04-15 16:33:09 -04:00
Marc Delisle
f105e8fcba 4.0.0-rc2 2013-04-15 16:32:21 -04:00
Weblate
c3cee3b184 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-15 22:27:56 +02:00
Rodrigo Souza
814607df9a Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-15 22:27:54 +02:00
J.M
dfdee264c3 Fix bug #3876 [import] PHP 5.2 - unexpected T_PAAMAYIM_NEKUDOTAYIM 2013-04-15 16:25:43 -04:00
Weblate
cc8b95e896 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-15 15:09:49 +02:00
Yungu Kim
e16ff8ce97 Translated using Weblate (Korean)
Currently translated at 57.0% (1485 of 2605)
2013-04-15 15:09:47 +02:00
Michal Čihař
f1299ad665 Remove extra ; from code 2013-04-15 15:09:32 +02:00
Madhura Jayaratne
f2c0c17c5f Merge pull request #253 from kasunchathuranga/Bug3875
Fix bug 3875 Lost location hash and token on table add field
2013-04-15 00:30:46 -07:00
Kasun Chathuranga
c4cb007570 Fix bug 3875 Lost location hash and token on table add field 2013-04-15 08:26:32 +05:30
Yungu Kim
3f3bf84556 Translated using Weblate (Korean)
Currently translated at 56.9% (1457 of 2562)
2013-04-15 00:22:04 +02:00
Rodrigo Souza
c9193d3c10 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2562 of 2562)
2013-04-14 21:22:05 +02:00
Madhura Jayaratne
2ce7be7798 HTTPS will not see OpenStreetMaps due to CSP. So do not show the checkbox also 2013-04-14 23:38:30 +05:30
Madhura Jayaratne
818167ad03 Merge pull request #247 from madhuracj/CSP
Allow loading map tiles when HTTPS is not used
2013-04-14 11:04:22 -07:00
Marc Delisle
0dbc20d735 Fix merge conflict 2013-04-14 13:01:55 -04:00
J.M
1e1354faca Fix spacing in table operations, Alter table order box 2013-04-14 15:46:35 +02:00
Weblate
bed36d8711 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-14 15:41:49 +02:00
zz zz
d392c6ff26 Translated using Weblate (Simplified Chinese)
Currently translated at 99.7% (2598 of 2605)
2013-04-14 15:41:47 +02:00
J.M
f1513b2678 Fix bug #3873 Can't copy table to target database if table exists there 2013-04-14 15:40:29 +02:00
Weblate
a352413772 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-14 14:46:38 +02:00
Julio Guerra
534fd02231 Translated using Weblate (Galician)
Currently translated at 99.3% (2588 of 2605)
2013-04-14 14:46:36 +02:00
J.M
050d6d31aa Fix bug #3874 [export] No preselected option when exporting table 2013-04-14 14:46:00 +02:00
Ahmad Zulhilmi Idris
01403a1ba6 Translated using Weblate (Malay)
Currently translated at 15.8% (406 of 2562)
2013-04-14 12:22:04 +02:00
Kasun Chathuranga
1a459f3575 Fix incorrect listing of records from to count 2013-04-13 23:19:49 +05:30
Madhura Jayaratne
637be71f0c Allow loading map tiles when HTTPS is not used 2013-04-13 17:23:35 +05:30
Weblate
bb025f887d Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-13 13:44:55 +02:00
Rodrigo Souza
0873c69e16 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-13 13:44:53 +02:00
Ahmad Zulhilmi Idris
5fc4188b64 Translated using Weblate (Malay)
Currently translated at 15.2% (396 of 2605)
2013-04-13 13:44:52 +02:00
Yungu Kim
6de2c5490e Translated using Weblate (Korean)
Currently translated at 55.5% (1447 of 2605)
2013-04-13 13:44:50 +02:00
Madhura Jayaratne
14feb9ede5 Remove Osmarender layer as it is no longer maintained 2013-04-13 17:14:05 +05:30
Dong-bum Kim
cdca054e42 Translated using Weblate (Korean)
Currently translated at 53.5% (1393 of 2605)
2013-04-12 22:35:28 +02:00
Dong-bum Kim
e221e51f17 Translated using Weblate (Korean)
Currently translated at 55.2% (1414 of 2562)
2013-04-12 22:34:55 +02:00
Marc Delisle
a51b3ea9b9 Fix broken test 2013-04-11 20:13:22 -04:00
Weblate
3869a3c765 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-12 01:53:12 +02:00
Rodrigo Souza
faa6e8c992 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-12 01:53:10 +02:00
Marc Delisle
6a39a4445a bug #3871 Check referential integrity broken across databases 2013-04-11 19:50:48 -04:00
Weblate
caa487f852 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-11 08:40:54 +02:00
Rodrigo Souza
b6d98e2564 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-11 08:40:48 +02:00
Ahmad Zulhilmi Idris
8830deaefd Translated using Weblate (Malay)
Currently translated at 13.8% (359 of 2605)
2013-04-11 08:40:46 +02:00
Michal Čihař
1a5793ca0a Merge pull request #238 from kasunchathuranga/Bug3860
Fix bug #3860 Displayed git revision info is not set
2013-04-10 23:40:38 -07:00
Kasun Chathuranga
57e751ff96 Add comments describing the changes 2013-04-11 06:50:16 +05:30
Kasun Chathuranga
224100dd8a Add ChangeLog entry for the bug fix 2013-04-11 00:15:35 +05:30
Kasun Chathuranga
2876b7014e Fix bug #3860 Displayed git revision info is not set 2013-04-10 23:59:33 +05:30
Michal Čihař
3600a5e701 Revert "Count real number of shown databases"
This reverts commit bb317b2fc1.

This forces fetching of all databases again, but we need complete count
(see bug #3870).
2013-04-10 12:23:27 +02:00