Commit Graph

74841 Commits

Author SHA1 Message Date
Michal Čihař
f2aab0260b Check whether file exists before trying to read it
.git/objects/* do not have to exist at all if object data is present in
pack
2012-04-16 14:30:58 +02:00
Michal Čihař
d296851924 Whitespace cleanup 2012-04-16 14:30:45 +02:00
Michal Čihař
0c790c3a07 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-16 14:20:38 +02:00
Michal Čihař
288618d078 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-16 14:17:44 +02:00
Madhura Jayaratne
d298d5a209 Translated using Weblate. 2012-04-16 14:17:40 +02:00
Victor Volkov
dba3895e6a Translated using Weblate. 2012-04-16 14:17:39 +02:00
JCJesus Lima
aacdd53627 Translated using Weblate. 2012-04-16 14:17:38 +02:00
Robin Pepermans
cec3494515 Translated using Weblate. 2012-04-16 14:17:37 +02:00
Julio Guerra
a2aea58c98 Translated using Weblate. 2012-04-16 14:17:37 +02:00
Timo Moisio
549811d871 Translated using Weblate. 2012-04-16 14:17:36 +02:00
Robin Pepermans
dba47ed202 Translated using Weblate. 2012-04-16 14:17:34 +02:00
Michal Čihař
f7b91e6c96 Disable version check only for IE as it does not support CSP 2012-04-16 14:17:12 +02:00
Jan Pecek
fafedaf575 Improve X-Content-Security-Policy header to work in FF, Chrome and Opera; but loading version.js script is still disabled in main.php (due to https), BugID: 3426500 2012-04-16 14:17:12 +02:00
Michal Čihař
edf29f0102 Merge remote-tracking branch 'origin/master' 2012-04-16 14:15:42 +02:00
Michal Čihař
c55477e97a Disable version check only for IE as it does not support CSP 2012-04-16 14:15:26 +02:00
Michal Čihař
b639773497 Merge remote-tracking branch 'origin/master' 2012-04-16 14:11:54 +02:00
Michal Čihař
30197b8fc3 Merge pull request #34 from honzap/csp_3426500
Improve X-Content-Security-Policy header (BugID: 3426500)
2012-04-16 05:11:47 -07:00
Michal Čihař
6bf92d827a Merge remote-tracking branch 'origin/master' 2012-04-16 14:10:29 +02:00
Michal Čihař
4d213ad403 Merge pull request #36 from hiddenpearls/patch-2
PMA-Designer script is broken in current master branch. It is because of...
2012-04-16 05:10:20 -07:00
Muhammad Adnan
76491f641e PMA-Designer script is broken in current master branch. It is because of
if (! defined('PHPMYADMIN')) {
    exit;
}

So, it should be after libraries/common.inc.php or because it is defined in common.inc.php
2012-04-16 17:45:26 +06:00
Michal Čihař
6ebaca430a Merge remote-tracking branch 'origin/master' 2012-04-16 01:57:22 +02:00
Marc Delisle
049a222648 Remove LightTabs configuration directive 2012-04-15 19:57:06 -04:00
Michal Čihař
cadec3b33f Merge remote-tracking branch 'origin/master' 2012-04-16 01:28:03 +02:00
Robin Pepermans
fa79c97f21 Translated using Weblate. 2012-04-16 01:27:59 +02:00
Marc Delisle
32345e888e Since the change of some tt tags to code, the list of privileges was no longer updated 2012-04-15 19:27:46 -04:00
Michal Čihař
dd960f7d18 Merge remote-tracking branch 'origin/master' 2012-04-16 01:11:30 +02:00
Madhura Jayaratne
3146a6de29 Translated using Weblate. 2012-04-16 01:11:17 +02:00
JCJesus Lima
a9486d9d70 Translated using Weblate. 2012-04-16 01:11:15 +02:00
Robin Pepermans
6841088c17 Translated using Weblate. 2012-04-16 01:11:13 +02:00
Julio Guerra
a8875672a7 Translated using Weblate. 2012-04-16 01:11:12 +02:00
Robin Pepermans
e8e7f0e933 Translated using Weblate. 2012-04-16 01:11:03 +02:00
Marc Delisle
fbc23f9d14 Missing transformation of a POST variable into a global 2012-04-15 19:10:11 -04:00
Jan Pecek
1b36253203 Improve X-Content-Security-Policy header to work in FF, Chrome and Opera; but loading version.js script is still disabled in main.php (due to https), BugID: 3426500 2012-04-15 19:57:39 +02:00
M. F
472401216d Translated using Weblate. 2012-04-15 19:19:45 +02:00
M. F
f288e9ce0e Translated using Weblate. 2012-04-15 19:19:44 +02:00
Julio Guerra
1c0c73f531 Translated using Weblate. 2012-04-15 16:56:32 +02:00
Julio Guerra
d124ed4cfb Translated using Weblate. 2012-04-15 16:56:06 +02:00
Michal Čihař
f83fc81acd Merge remote-tracking branch 'origin/master' 2012-04-15 16:28:19 +02:00
Madhura Jayaratne
cc116f1d2d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-15 19:56:23 +05:30
Michal Čihař
9aa4be5cd2 Merge remote-tracking branch 'origin/master' 2012-04-15 15:57:18 +02:00
Dieter Adriaenssens
9e26163f12 Merge pull request #33 from niveuseverto/fix-show_git_commit
Pull request #29 broke phpmyadmin to me...
2012-04-15 06:57:12 -07:00
Alexander Filippov
ff455cc96a fixed error: Parse error: syntax error, unexpected '[' in ./libraries/display_git_revision.lib.php on line 56 2012-04-15 12:40:14 +00:00
Michal Čihař
b3c991a9f1 Merge remote-tracking branch 'origin/master' 2012-04-15 12:47:42 +02:00
Marc Delisle
f93d1e665b Merge pull request #29 from mynetx/show_git_commit
Show Git revision details in right main.php column
2012-04-15 03:47:35 -07:00
Madhura Jayaratne
4b61ab20df Parent element having class="choice" should be made visible 2012-04-15 15:27:45 +05:30
Michal Čihař
de9c78b662 Merge remote-tracking branch 'origin/master' 2012-04-15 06:11:29 +02:00
Jo Michael
569aed795c Drop view confirm properly, don't show truncate action for views 2012-04-15 06:11:11 +02:00
Michal Čihař
a840509492 Merge remote-tracking branch 'origin/master' 2012-04-15 05:41:19 +02:00
Jo Michael
05699a7ac4 Add Codemirror to tbl_replace (SQL box after inserting rows) 2012-04-15 05:40:39 +02:00
Michal Čihař
3c37670f0a Merge remote-tracking branch 'origin/master' 2012-04-15 02:13:08 +02:00