Marc Delisle
|
a647d05f01
|
Merge branch 'QA_3_5'
|
2012-04-09 14:42:10 -04:00 |
|
Mark Badolato
|
080cecbc9d
|
bug #3516183 [display] Missing image extension
|
2012-04-09 14:41:47 -04:00 |
|
Michal Čihař
|
4b117ee2fa
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-04-09 19:55:30 +02:00 |
|
Michal Čihař
|
4604fe1e88
|
Fix format string
|
2012-04-09 19:52:38 +02:00 |
|
Michal Čihař
|
dd26e34e5b
|
Update po files
|
2012-04-09 19:52:06 +02:00 |
|
Michal Čihař
|
13b12866a1
|
Merge branch 'MAINT_3_5_0' into QA_3_5
|
2012-04-09 19:47:39 +02:00 |
|
Michal Čihař
|
71c6b6ad9b
|
Changes for 3.5.0
|
2012-04-09 19:47:25 +02:00 |
|
Michal Čihař
|
70010631e1
|
Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0
|
2012-04-09 19:44:50 +02:00 |
|
Matías Bellone
|
7b8ccdd369
|
Translated using Weblate.
|
2012-04-09 19:43:03 +02:00 |
|
Bartosz Feński
|
f8df065a32
|
Translated using Weblate.
|
2012-04-09 19:43:03 +02:00 |
|
Yuichiro Takahashi
|
b796cedb0e
|
Translated using Weblate.
|
2012-04-09 19:43:02 +02:00 |
|
Matías Bellone
|
f5f58825a3
|
Translated using Weblate.
|
2012-04-09 19:39:28 +02:00 |
|
Bartosz Feński
|
b61eb6b7e8
|
Translated using Weblate.
|
2012-04-09 19:39:27 +02:00 |
|
Yuichiro Takahashi
|
76c1b63fe5
|
Translated using Weblate.
|
2012-04-09 19:39:27 +02:00 |
|
Michal Čihař
|
de9d6328b8
|
Merge remote-tracking branch 'origin/master'
|
2012-04-09 16:39:03 +02:00 |
|
Matías Bellone
|
fa39a394da
|
Translated using Weblate.
|
2012-04-09 16:38:59 +02:00 |
|
Burak Yavuz
|
e0dcf5fc4b
|
Translated using Weblate.
|
2012-04-09 16:38:50 +02:00 |
|
Jo Michael
|
dcec810564
|
Merge branch 'QA_3_5'
|
2012-04-09 16:36:06 +02:00 |
|
Jo Michael
|
01b6b8f613
|
- bug #3516037 [auth] JS includes missing in auth config error page
|
2012-04-09 16:25:26 +02:00 |
|
Matías Bellone
|
0f390b2695
|
Translated using Weblate.
|
2012-04-09 15:57:49 +02:00 |
|
Marc Delisle
|
e84cb68d13
|
Translated using Weblate.
|
2012-04-09 15:34:37 +02:00 |
|
Michal Čihař
|
534330ea0c
|
Merge remote-tracking branch 'origin/master'
|
2012-04-09 15:09:19 +02:00 |
|
Marc Delisle
|
dd5aae9a67
|
jQuery UI is already included from common.inc.php
|
2012-04-09 09:09:07 -04:00 |
|
Michal Čihař
|
ff68c6ae36
|
Merge remote-tracking branch 'origin/master'
|
2012-04-09 14:45:54 +02:00 |
|
Marc Delisle
|
f2c88c3afc
|
Refresh .po files
|
2012-04-09 08:45:22 -04:00 |
|
Michal Čihař
|
b3023493bc
|
Merge remote-tracking branch 'origin/master'
|
2012-04-09 14:44:45 +02:00 |
|
Marc Delisle
|
c1347364b8
|
PHP 5.4 compatibility for scripts/update-po
|
2012-04-09 08:44:23 -04:00 |
|
Michal Čihař
|
c1f3ce8c5d
|
Merge remote-tracking branch 'origin/master'
|
2012-04-09 14:23:41 +02:00 |
|
Marc Delisle
|
50587ef616
|
Merge pull request #22 from Gemorroj/master
minor fixes in export, corrected title and chart with special html characters
|
2012-04-09 05:23:29 -07:00 |
|
Michal Čihař
|
4c2a751738
|
Merge remote-tracking branch 'origin/master'
|
2012-04-09 14:21:52 +02:00 |
|
Bartosz Feński
|
630d932994
|
Translated using Weblate.
|
2012-04-09 14:21:48 +02:00 |
|
Yuichiro Takahashi
|
5c4c3de291
|
Translated using Weblate.
|
2012-04-09 14:21:47 +02:00 |
|
Vian Zhao
|
30bfc391e9
|
Translated using Weblate.
|
2012-04-09 14:21:45 +02:00 |
|
Marc Delisle
|
a3edbfc1b1
|
Add parameter to strDoYouReally message for better translatability
Include jquery.sprintf.js everywhere
|
2012-04-09 08:20:45 -04:00 |
|
Gemorroj
|
d8d25826a0
|
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Conflicts:
js/export.js
|
2012-04-09 15:07:20 +03:00 |
|
Madhura Jayaratne
|
f676e089a9
|
Translated using Weblate.
|
2012-04-09 05:01:03 +02:00 |
|
Victor Volkov
|
3e78018efe
|
Translated using Weblate.
|
2012-04-09 05:01:03 +02:00 |
|
Jo Michael
|
5ec75afdec
|
Translated using Weblate.
|
2012-04-09 05:01:02 +02:00 |
|
Madhura Jayaratne
|
c356d3c02c
|
Translated using Weblate.
|
2012-04-09 05:00:26 +02:00 |
|
Victor Volkov
|
74a17dcd0d
|
Translated using Weblate.
|
2012-04-09 05:00:25 +02:00 |
|
Jo Michael
|
e6d5aa6ffc
|
Translated using Weblate.
|
2012-04-09 05:00:24 +02:00 |
|
Michal Čihař
|
1b05f5a05a
|
Merge remote-tracking branch 'origin/master'
|
2012-04-09 00:19:53 +02:00 |
|
Jo Michael
|
3f545e316a
|
Fix DoYouReally confirm dialogs
|
2012-04-09 00:19:33 +02:00 |
|
Jo Michael
|
104ec11200
|
No additional spaces in "(query took ...)" message
|
2012-04-08 23:03:58 +02:00 |
|
Michal Čihař
|
aff93e24f9
|
Merge remote-tracking branch 'origin/master'
|
2012-04-08 21:09:51 +02:00 |
|
Madhura Jayaratne
|
f689613042
|
Translated using Weblate.
|
2012-04-08 21:09:47 +02:00 |
|
Victor Volkov
|
d025d81757
|
Translated using Weblate.
|
2012-04-08 21:09:47 +02:00 |
|
Jo Michael
|
caf5826ec5
|
Translated using Weblate.
|
2012-04-08 21:09:45 +02:00 |
|
Jo Michael
|
4521b28517
|
Use pma-bbcode for trigger_error messages
|
2012-04-08 21:09:31 +02:00 |
|
Jo Michael
|
ea65b806ab
|
Fix show_config_errors.php
|
2012-04-08 21:08:47 +02:00 |
|
