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

61 Commits

Author SHA1 Message Date
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Madhura Jayaratne
f06e8ee9fc Merge branch 'QA_3_4' 
Conflicts:
	libraries/schema/Pdf_Relation_Schema.class.php
	libraries/schema/User_Schema.class.php
 2011-10-08 14:26:48 +05:30
Madhura Jayaratne
329c9cac68 Avoid warnings on undefined variables 2011-10-08 14:15:17 +05:30
Rouslan Placella
ef2e103adb Merge branch 'sprites' 2011-09-30 19:51:05 +01:00
Marc Delisle
963f478fdd Fix merge conflicts 2011-09-29 07:12:57 -04:00
Marc Delisle
86138fa914 Merge branch 'QA_3_4' 2011-09-29 07:06:48 -04:00
Marc Delisle
acbbd8fc56 bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken 2011-09-29 06:41:06 -04:00
Marc Delisle
86722781eb A table has been dropped from outside phpMyAdmin 2011-09-29 06:19:03 -04:00
Marc Delisle
789ed0d3d1 A table has been dropped from outside phpMyAdmin 2011-09-29 06:08:30 -04:00
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Madhura Jayaratne
08ec08059a Coding style improvements 2011-08-27 22:57:08 +05:30
Dieter Adriaenssens
e82d3c7136 require/include are statements not functions; no parentheses are required 2011-08-21 23:36:10 +02:00
Michal Čihař
f0babc56a3 Fix indentation 2011-08-19 09:11:06 +02:00
Michal Čihař
dd046f10b3 Fix typo 2011-08-19 09:11:01 +02:00
Michal Čihař
88ef580bd5 Use PMA_DBI_get_columns instead of custom query 2011-08-19 09:09:12 +02:00
Michal Čihař
ab166dd849 Remove some unused vars 2011-08-19 09:06:46 +02:00
Piotr Przybylski
3782a6c89b Remove JS function: getElement 2011-08-16 00:34:44 +02:00
Piotr Przybylski
824fac0da5 Import missing variable into method's scope 2011-08-16 00:09:04 +02:00
Piotr Przybylski
fd44145183 Add missing PMA_sqlAddSlashes 2011-08-16 00:07:57 +02:00
Piotr Przybylski
73485871c7 PMA_backquote is not needed here 2011-08-16 00:05:51 +02:00
Michal Čihař
b3939c021a Remove not needed global $query_default_option 2011-08-15 11:41:49 +02:00
Michal Čihař
b0a108473e Remove not needed param from PMA_REL_create_page 2011-08-15 11:36:13 +02:00
Michal Čihař
bbccd32c81 Improve coding style 2011-08-15 11:33:00 +02:00
Michal Čihař
8f618e6f01 Convert more occurences of inline autosubmit code to external js 2011-08-08 13:29:20 +02:00
Marc Delisle
7e197b695e Fix merge conflicts 2011-07-23 08:25:49 -04:00
Michal Čihař
9730a6b3d7 Merge commit '97b1375605f241481a953e2c78eb42d43f84fa9d' 
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
 2011-07-21 15:51:05 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Herman van Rink
3ae58f0cd6 [security] Fixed local file inclusion vulnerability and code execution, see PMASA-2011-11 2011-07-08 21:43:38 +02:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
ae8935acf3 Remove some useless doctags 2011-06-22 08:58:18 +02:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Marc Delisle
e6211f0c2f Other replacements for easier reading 2011-05-09 12:57:28 -04:00
Marc Delisle
b34b104a30 Improve function naming and remove vulgar term 2011-01-12 08:53:06 -05:00
Marc Delisle
cc9f99d303 Typo "choosen" -> "chosen" 2011-01-12 08:40:54 -05:00
Adnan
f88189366d fixed: bugID = 3112614 2010-12-09 16:53:38 +05:00
Marc Delisle
8c7d339e04 These are not translatable 2010-09-21 08:04:25 -04:00
Michal Čihař
d214406478 Add label for easier selection. 2010-09-16 16:20:43 +02:00
Michal Čihař
728034d7ea bug #1669459 [interface] Do not automatically mark PDF schema rows to delete 2010-09-16 16:18:23 +02:00
Michal Čihař
0431042bd0 Drop $Id$ expansion, nobody complained so far it not working. 2010-09-07 15:00:44 +02:00
Marc Delisle
b9609f086d move outer variables inside function 2010-08-30 10:18:02 -04:00
Marc Delisle
7ca0657ff0 remove author names as per our policy 2010-08-29 08:54:12 -04:00
Marc Delisle
56381c086f adapted patch #3050492 to new code 2010-08-28 08:57:27 -04:00
Marc Delisle
35c4fc35ee put back lost feature: changing paper size or orientation changes the scratchboard (todo: improve the interface to show that these are not only related to the Display dialog) 2010-08-28 08:45:29 -04:00
Michal Čihař
5a51858352 [relations] Dropped WYSIWYG-PDF configuration variable. 2010-08-23 11:05:12 +02:00
Michal Čihař
8a011f77b8 Better name for schema export script. 2010-08-23 10:55:57 +02:00
Michal Čihař
f84659efcb Better file name for schema edit page. 2010-08-23 10:55:19 +02:00
Michal Čihař
1c20d31e65 No upper case in box title. 2010-08-23 10:52:46 +02:00