gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,045 Commits 12 Branches 481 Tags 2.4 GiB
a693506f64
Commit Graph

81045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dieter Adriaenssens
a693506f64 Translated using Weblate (Dutch) 
Currently translated at 98.5% (2563 of 2602)
 2013-01-16 13:54:22 +01:00
Madhura Jayaratne
6121c1a7cf Merge branch 'QA_3_5' 
Conflicts:
	libraries/header_http.inc.php
	po/ko.po
 2013-01-16 06:20:32 +05:30
Madhura Jayaratne
49c24c4dd2 Merge pull request #133 from lem9/QA_3_5 
Fix "Uncaught EvalError" on Chrome
 2013-01-15 16:43:55 -08:00
Dieter Adriaenssens
ed3a0fe7e7 wrap long lines, fix coding style 2013-01-15 21:13:35 +01:00
Dieter Adriaenssens
9d845c1582 fix coding style 2013-01-15 20:54:14 +01:00
Dieter Adriaenssens
95068b4983 improve coding style 2013-01-15 20:42:18 +01:00
Dieter Adriaenssens
df4c535d06 improve coding style 2013-01-15 20:36:14 +01:00
Dieter Adriaenssens
be2c09f36c improve coding style 2013-01-15 20:15:50 +01:00
Dieter Adriaenssens
d7f02a4598 wrap long lines 2013-01-15 20:03:39 +01:00
Dieter Adriaenssens
ead7b1a95d use include_once when including a file conditionally 2013-01-15 19:59:21 +01:00
Dieter Adriaenssens
f07573e28a improve coding style 2013-01-15 19:54:37 +01:00
Dieter Adriaenssens
e382d0ad82 improve coding style 2013-01-15 19:47:06 +01:00
Weblate
0d5633d0d9 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-01-15 19:05:23 +01:00
Dong-bum Kim
d15ec227a5 Translated using Weblate (Korean) 
Currently translated at 41.5% (1064 of 2562)
 2013-01-15 19:05:17 +01:00
Marc Delisle
86ebd0130d I don't understand this test (which now fails) 2013-01-15 13:04:28 -05:00
Marc Delisle
0fb7b5907d Fix merge conflicts 2013-01-15 12:50:14 -05:00
Marc Delisle
6314225f41 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2013-01-15 12:42:40 -05:00
Marc Delisle
373a7a025e bug #3599362 [core] Double-escaped error message 2013-01-15 12:42:04 -05:00
Dieter Adriaenssens
86dfd2506c wrap long lines 2013-01-15 14:42:07 +01:00
Dieter Adriaenssens
c709dc9191 improve coding style : correct syntax with if-then-else statements 2013-01-15 14:42:07 +01:00
Weblate
2f7ef7a83d Merge remote-tracking branch 'origin/master' 2013-01-15 14:32:29 +01:00
Dong-bum Kim
431ced3a25 Translated using Weblate (Korean) 
Currently translated at 39.0% (1014 of 2602)
 2013-01-15 14:32:26 +01:00
Dieter Adriaenssens
42dc425c0b wrap long lines 2013-01-15 14:31:56 +01:00
Dieter Adriaenssens
b1431bae58 improve coding style : correct syntax with if-then-else statements 2013-01-15 14:29:16 +01:00
Dieter Adriaenssens
a33515a155 use require when including a file unconditionally 2013-01-15 14:24:48 +01:00
Dieter Adriaenssens
f696d91690 don't use tabs for indenting 2013-01-15 14:22:45 +01:00
Weblate
55ebbeeae4 Merge remote-tracking branch 'origin/master' 2013-01-15 09:29:35 +01:00
ProUser
84c35b75fb Translated using Weblate (Swedish) 
Currently translated at 99.5% (2588 of 2602)
 2013-01-15 09:29:16 +01:00
Michal Čihař
b586d8164a Merge remote-tracking branch 'weblate/master' 2013-01-15 09:25:23 +01:00
Pham Andrei
9433426417 Translated using Weblate (Romanian) 
Currently translated at 55.5% (1444 of 2602)
 2013-01-15 09:16:43 +01:00
Michal Čihař
b59d6dee04 Translated using Weblate (Czech) 
Currently translated at 100.0% (2602 of 2602)
 2013-01-15 09:15:57 +01:00
Michal Čihař
077a93b0e2 Merge remote-tracking branch 'origin/QA_3_5' 
Conflicts:
	js/tbl_chart.js
 2013-01-15 09:14:17 +01:00
Michal Čihař
7ddc71c033 Fix possibly wrong commas 2013-01-15 09:13:24 +01:00
Michal Čihař
7463acbe9f Merge remote-tracking branch 'origin/QA_3_5' 2013-01-15 09:12:48 +01:00
Michal Čihař
b23372a336 Escape HTML in titles of table charts 
Conflicts:
	js/tbl_chart.js
 2013-01-15 09:12:37 +01:00
Michal Čihař
b489fdffb6 Escape HTML in chart title 2013-01-15 09:11:43 +01:00
Michal Čihař
7e968cf30e Escape HTML in titles of table charts 2013-01-15 09:11:07 +01:00
Weblate
ae2a59f02d Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-01-15 09:10:00 +01:00
ProUser
fb0fb6c756 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2562 of 2562)
 2013-01-15 09:09:51 +01:00
Pham Andrei
90ed3865ea Translated using Weblate (Romanian) 
Currently translated at 60.2% (1543 of 2562)
 2013-01-15 09:09:48 +01:00
Michal Čihař
75ab209aaf Translated using Weblate (Czech) 
Currently translated at 100.0% (2562 of 2562)
 2013-01-15 09:09:45 +01:00
Michal Čihař
d876574e61 Whitespace cleanup 2013-01-15 09:08:39 +01:00
Michal Čihař
d30aaaee73 Escape HTML in chart title 2013-01-15 09:08:32 +01:00
Marc Delisle
e94be49ee9 Fix "Uncaught EvalError" on Chrome 2013-01-14 08:20:54 -05:00
Robert Readman
8063d2270e Translated using Weblate (English (United Kingdom)) 
Currently translated at 100.0% (2602 of 2602)
 2013-01-14 10:50:11 +01:00
Victor Volkov
8a130c58ff Translated using Weblate (Russian) 
Currently translated at 100.0% (2602 of 2602)
 2013-01-13 21:07:28 +01:00
Madhura Jayaratne
053d6c2ce0 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-01-12 19:22:01 +05:30
Madhura Jayaratne
a6333e40f4 Merge branch 'QA_3_5' 2013-01-12 19:21:10 +05:30
Weblate
761cf904ac Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-01-12 14:50:59 +01:00
Dong-bum Kim
662757a867 Translated using Weblate (Korean) 
Currently translated at 40.6% (1040 of 2562)
 2013-01-12 14:50:54 +01:00