Commit Graph

74724 Commits

Author SHA1 Message Date
Jo Michael
7ce27bb3d5 Show Git revision details in right main.php column (hover SHA1 to read commit message) 2012-04-14 00:02:06 +02:00
Jo Michael
e662600415 Calculate table action more_opts maximum width correctly 2012-04-13 19:34:10 +02:00
Madhura Jayaratne
ba21546008 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-13 22:33:43 +05:30
Madhura Jayaratne
6b2a502de7 Merge branch 'QA_3_5' 2012-04-13 22:32:19 +05:30
Marc Delisle
7e00134398 Merge pull request #26 from mynetx/codemirror_enable
Allow disabling CodeMirror
2012-04-13 09:41:23 -07:00
Madhura Jayaratne
ea800101cb Fix Checkstyle Warnings - Type: BraceOnSameLine 2012-04-13 21:50:26 +05:30
Madhura Jayaratne
fa9aaea8c0 Coding style improvements 2012-04-13 20:57:17 +05:30
Madhura Jayaratne
3af218eb76 Make some messages translatable 2012-04-13 19:56:47 +05:30
Michal Čihař
dac767f3c4 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-13 10:07:23 +02:00
Madhura Jayaratne
2707c6c463 Translated using Weblate. 2012-04-13 10:06:35 +02:00
Jo Michael
8744f8cf66 + rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false 2012-04-13 01:43:32 +02:00
Michal Čihař
1fc4e7cafd Merge remote-tracking branch 'origin/master' 2012-04-12 23:40:33 +02:00
Madhura Jayaratne
d43c1de210 Translated using Weblate. 2012-04-12 23:40:28 +02:00
Marc Delisle
6557b71b88 ChangeLog entry
Protect script contents with CDATA, see
https://developer.mozilla.org/En/Properly_Using_CSS_and_JavaScript_in_XHTML_Documents
2012-04-12 17:38:59 -04:00
Atul Pratap Singh
5ab6e746b8 Patch #3517040 Login screen appears under the page 2012-04-12 17:31:54 -04:00
Michal Čihař
f7de1a212b Merge remote-tracking branch 'origin/QA_3_5' 2012-04-12 16:08:29 +02:00
Madhura Jayaratne
9dc092c4a6 Translated using Weblate. 2012-04-12 16:07:54 +02:00
Julio Guerra
a3df522316 Translated using Weblate. 2012-04-12 16:07:53 +02:00
Madhura Jayaratne
2dedc5ae0d Translated using Weblate. 2012-04-12 16:07:42 +02:00
Julio Guerra
59f2b77364 Translated using Weblate. 2012-04-12 16:07:41 +02:00
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