Commit Graph

74704 Commits

Author SHA1 Message Date
Robert Readman
243ec3e798 Translated using Weblate. 2012-04-12 15:12:41 +02:00
Michal Čihař
9996628f21 Merge remote-tracking branch 'origin/master' 2012-04-12 11:00:16 +02:00
Madhura Jayaratne
cc4e0c7390 Translated using Weblate. 2012-04-12 11:00:11 +02:00
Michal Čihař
32987703f7 Merge pull request #25 from nijel/master
Dropping ErrorIconic/MainPageIconic
2012-04-12 02:00:05 -07:00
Michal Čihař
66f03df9ce Merge remote-tracking branch 'origin/QA_3_5' 2012-04-12 10:18:02 +02:00
Michal Čihař
2922eaecd2 Merge remote-tracking branch 'origin/master' 2012-04-12 10:17:20 +02:00
Marc Delisle
77b80d9ad3 Translated using Weblate. 2012-04-12 10:17:17 +02:00
Julio Guerra
edbf5114f8 Translated using Weblate. 2012-04-12 10:17:16 +02:00
Michal Čihař
161c30959a Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-12 10:17:04 +02:00
Jo Michael
107a71c352 Merge branch 'QA_3_5' 2012-04-12 03:34:41 +02:00
Jo Michael
84c7688784 Fix broken grid editing in table browse mode 2012-04-12 03:33:49 +02:00
Jo Michael
01fa220241 Merge branch 'QA_3_5'
Conflicts:
	js/functions.js
	tbl_structure.php
2012-04-12 03:01:37 +02:00
Michal Čihař
65f70fb8c0 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-12 02:35:16 +02:00
Julio Guerra
1653133a70 Translated using Weblate. 2012-04-12 02:34:50 +02:00
Jo Michael
cf831935cb - bug #3516817 [interface] "More" actions in table structure 2012-04-12 02:34:31 +02:00
Julio Guerra
e697970c5c Translated using Weblate. 2012-04-12 01:15:27 +02:00
Julio Guerra
e3a97d654b Translated using Weblate. 2012-04-12 01:14:11 +02:00
Michal Čihař
313acb84d3 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-11 23:35:55 +02:00
Madhura Jayaratne
c181e1f478 Translated using Weblate. 2012-04-11 23:35:46 +02:00
Marc Delisle
b84bcb1370 Translated using Weblate. 2012-04-11 23:35:44 +02:00
Jo Michael
d628eab1e9 - bug #3517021 [interface] Header links except 'More' hide after closing dialog 2012-04-11 23:25:17 +02:00
Marc Delisle
21153122d1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-11 17:15:25 -04:00
Marc Delisle
3ad498649a Refactoring challenge, part 2 2012-04-11 17:14:35 -04:00
Marc Delisle
9683539295 Attributes must be enclosed with double-quotes 2012-04-11 16:53:00 -04:00
Rouslan Placella
0ebf022426 Refactoring challenge 2012-04-11 16:50:10 -04:00
Michal Čihař
9a719312fd Merge remote-tracking branch 'origin/master' 2012-04-11 22:40:48 +02:00
Madhura Jayaratne
df18a06180 Translated using Weblate. 2012-04-11 22:40:35 +02:00
Jo Michael
01e8418470 - bug #3516341 [export] Open Document Text, Word and Texy! Text show table structure twice,
- bug [export] Texy! Text: Columns containing Pipe Character don't export properly,
+ [export] Show triggers in Open Document Text, Word and Texy! Text
2012-04-11 22:40:11 +02:00
Jo Michael
95ffa2a25b Fix PHP notice about undefined index sql_truncate in SQL export 2012-04-11 22:40:10 +02:00
Jo Michael
f682970a12 Add label tag for language selector 2012-04-11 22:40:10 +02:00
Yasitha Pandithawatta
a7c99578c4 Patch #3502814 part 2 2012-04-11 15:15:47 -04:00
Madhura Jayaratne
54d8dacf76 Merge branch 'QA_3_5'
Conflicts:
	js/tbl_chart.js
2012-04-11 23:53:19 +05:30
Madhura Jayaratne
6ba52cac1b bug #3516405 [display] Chart title is getting wrong within chart export 2012-04-11 23:47:07 +05:30
Jo Michael
fde69c836a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-11 19:46:31 +02:00
Jo Michael
6a2afedda0 Use PMA_fatalError in PMA_Config::checkConfigSource, allow auto extraction of localized error message 2012-04-11 19:44:38 +02:00
Madhura Jayaratne
bf8dac8ecc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-11 23:08:42 +05:30
Madhura Jayaratne
e118098133 Merge branch 'QA_3_5'
Conflicts:
	ChangeLog
2012-04-11 23:05:23 +05:30
Jo Michael
7943106d15 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-11 19:31:03 +02:00
Michal Čihař
57e516d2fd Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-11 19:30:38 +02:00
Madhura Jayaratne
8be2afa33c Translated using Weblate. 2012-04-11 19:30:24 +02:00
Michal Čihař
efde708748 Translated using Weblate. 2012-04-11 19:30:17 +02:00
Madhura Jayaratne
605650e11e bug #3516761 [edit] Query error after search 2012-04-11 22:56:56 +05:30
Jo Michael
50c6118068 Fix missing change-password fieldset in user edit dialog, add Loading indicator for user change password 2012-04-11 19:17:01 +02:00
Marc Delisle
9ad2e1079f 3.4.x is no longer the stable version 2012-04-11 12:54:07 -04:00
Julio Guerra
4dc81c2f26 Translated using Weblate. 2012-04-11 18:32:16 +02:00
Julio Guerra
67254b505d Translated using Weblate. 2012-04-11 18:31:42 +02:00
Madhura Jayaratne
edbff5a091 Translated using Weblate. 2012-04-11 18:24:06 +02:00
Julio Guerra
2ae5ccef12 Translated using Weblate. 2012-04-11 18:24:02 +02:00
Marc Delisle
aef7194b2a Translated using Weblate. 2012-04-11 18:23:17 +02:00
Julio Guerra
53e61583a7 Translated using Weblate. 2012-04-11 17:58:32 +02:00