Commit Graph

87327 Commits

Author SHA1 Message Date
Michal Čihař
52be2f7fc9 Simplify file name validation
We don't want to expose possible hidden files as well (starting with .
on unix).
2013-10-03 15:54:50 +02:00
Michal Čihař
0ad8714cb1 Properly detect variable presence 2013-10-03 15:50:37 +02:00
Michal Čihař
39dd5f9e4f Do not load common.inc for js/get_scripts.js.php
No functionality is being used there and the token protection only
causes troubles.
2013-10-03 15:39:59 +02:00
Michal Čihař
080098affd Update TCPDF to 6.0.037
6.0.037 (2013-09-30)
	- Method getAllSpotColors() was added to return all spot colors.
	- Method colorRegistrationBar() was extended to automatically print all spot colors and support individual spot colors.
	- The method registrationMarkCMYK() was added to print a registration mark for CMYK colors.
	- A bug related to page groups was fixed.
	- Gradient() method now supports CMYK equivalents of spot colors.
	- Example n. 56 was updated.
2013-10-03 15:27:39 +02:00
Marc Delisle
6aa99438d0 Fix typo 2013-10-03 05:52:51 -04:00
Marc Delisle
c747cc65a9 Merge pull request #727 from Chanaka/master
Fixed some warnings in table browse page
2013-10-03 02:49:37 -07:00
Madhura Jayaratne
c3244215eb Drizzle compatibility - Correctly load values for the foreign tables dropdown 2013-10-03 11:41:29 +05:30
Madhura Jayaratne
b38c32d950 Covert to upper case for comparison 2013-10-03 07:46:13 +05:30
Chanaka Indrajith
932100c2cb Merge remote branch 'upstream/master' 2013-10-03 00:06:01 +05:30
Chanaka Indrajith
6a2b56f35c Fixed warning in browse table, after perform table maintenance action 2013-10-03 00:04:52 +05:30
Madhura Jayaratne
327d1a5d89 Drizzle compatibility 2013-10-02 23:34:32 +05:30
Madhura Jayaratne
632982b1dc SHOW OPEN TABLES is not supported in Drizzle 2013-10-02 22:46:32 +05:30
Madhura Jayaratne
2aeac560b3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-10-02 22:29:38 +05:30
Madhura Jayaratne
91d91828fe Generate correct TableIndexesSql for Drizzle 2013-10-02 22:28:04 +05:30
Domen
d524bf3104 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2744 of 2744)
2013-10-02 18:22:38 +02:00
Michal Čihař
00ed062864 No need to ignore non minified files 2013-10-02 14:12:21 +02:00
Michal Čihař
785c33261a We no longer minify the code 2013-10-02 14:12:01 +02:00
Michal Čihař
bbedf41180 Wrap long line 2013-10-02 13:56:23 +02:00
Michal Čihař
7090dc46ef Remove commented out code
That's why we have version control...
2013-10-02 13:56:23 +02:00
Michal Čihař
90baeb5c26 Coding style: wrap long lines 2013-10-02 13:56:23 +02:00
Michal Čihař
3d067c50df Simplify condition
Negative value will not match length of a string anyway.
2013-10-02 13:56:23 +02:00
Michal Čihař
c8993b624c Extract memory limit parsing code 2013-10-02 13:56:23 +02:00
Michal Čihař
b02000cee8 Do not try to parse memory limit if empty 2013-10-02 13:56:23 +02:00
Weblate
af0b7a3d37 Merge remote-tracking branch 'origin/master' 2013-10-02 13:37:38 +02:00
Manuel Dalla Lana
15ff074b1f Translated using Weblate (Italian)
Currently translated at 87.2% (2393 of 2744)
2013-10-02 13:37:34 +02:00
Giovanni Sora
c1ec4b657b Translated using Weblate (Interlingua)
Currently translated at 26.1% (715 of 2744)
2013-10-02 13:37:31 +02:00
Michal Čihař
44eac82d0e Document some parameters 2013-10-02 13:37:22 +02:00
Michal Čihař
778369595c Simplify test method name, no need to repeat class name 2013-10-02 13:37:21 +02:00
Weblate
3e9ad721f9 Merge remote-tracking branch 'origin/master' 2013-10-02 12:16:13 +02:00
Giovanni Sora
4c10266c71 Translated using Weblate (Interlingua)
Currently translated at 25.6% (702 of 2744)
2013-10-02 12:16:09 +02:00
Marc Delisle
3c49b201e9 Fix merge conflict 2013-10-02 06:15:39 -04:00
Marc Delisle
c91e9b1b4f Merge branch 'QA_4_0' 2013-10-02 06:14:47 -04:00
Marc Delisle
385e3274be 4.0.9-dev 2013-10-02 06:14:02 -04:00
Weblate
a2235b67c5 Merge remote-tracking branch 'origin/master' 2013-10-02 12:07:29 +02:00
Giovanni Sora
c2e7f03a14 Translated using Weblate (Interlingua)
Currently translated at 25.2% (691 of 2744)
2013-10-02 12:07:25 +02:00
Michal Čihař
50deebcbdf Coding style: Bad line breaking before logical operators 2013-10-02 12:07:15 +02:00
Michal Čihař
0040765b4e Coding style: Declare before used 2013-10-02 12:07:15 +02:00
Michal Čihař
51bb5ffc31 Coding style: Declare before used and add function comments 2013-10-02 12:07:14 +02:00
Weblate
5671039ba2 Merge remote-tracking branch 'origin/master' 2013-10-02 11:46:47 +02:00
Michal Čihař
c3a7aa28b4 Translated using Weblate (Czech)
Currently translated at 99.4% (2728 of 2744)
2013-10-02 11:46:42 +02:00
Michal Čihař
4f5a9e40a2 Coding style: line breaking before + 2013-10-02 11:45:46 +02:00
Michal Čihař
424e2ee75b Coding style: use type safe comparing for blank values 2013-10-02 11:45:46 +02:00
Michal Čihař
bf4b0c8162 Coding style: spaces around operator 2013-10-02 11:45:45 +02:00
Michal Čihař
58d7005a42 Coding style: wrap long lines 2013-10-02 11:45:45 +02:00
Michal Čihař
0ad8a147c5 Coding style: wrap long line 2013-10-02 11:45:45 +02:00
Michal Čihař
9985f1ceb6 Add missing comment 2013-10-02 11:45:45 +02:00
Weblate
093c171af4 Merge remote-tracking branch 'origin/master' 2013-10-02 10:12:30 +02:00
jef suris
7c1eebce9d Translated using Weblate (Greek)
Currently translated at 100.0% (2744 of 2744)
2013-10-02 10:12:26 +02:00
Michal Čihař
8d8b363221 Merge branch 'license-fixes' of git://github.com/bkuhn/phpmyadmin 2013-10-02 10:11:50 +02:00
Kristjan Räts
6e0b5e4e1b Translated using Weblate (Estonian)
Currently translated at 100.0% (2744 of 2744)
2013-10-02 09:42:58 +02:00