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

11961 Commits

Author SHA1 Message Date
Isaac Bennetch
175c1a786a Merge pull request #1276 from D-storm/FR-637 
RFE-637: Custom field handlers (input transformations)
 2014-07-12 09:45:35 -04:00
Marc Delisle
a9296005c1 Improve variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-12 07:25:47 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Marc Delisle
a26a1dc987 Merge commit 'e2ed16d' 2014-07-11 15:53:15 -04:00
Marc Delisle
e2ed16d04e Also show the Drop link in the routines list (because it's difficult to detect all privileges possibilities 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 15:52:00 -04:00
Marc Delisle
f473e99efa Merge branch 'QA_4_2' 2014-07-11 15:46:21 -04:00
Marc Delisle
ce72213095 bug #4489 Incorrect detection of privileges for routine creation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 15:45:31 -04:00
Marc Delisle
f20ac45096 Ensure variable is a string 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 07:28:52 -04:00
Marc Delisle
f8eb1f9798 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 07:17:06 -04:00
Marc Delisle
6898ac0016 Initialize variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 07:13:12 -04:00
Marc Delisle
52d1485feb Merge branch 'QA_4_2' 2014-07-10 11:54:11 -04:00
Marc Delisle
decb08c4d8 Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-10 11:31:29 -04:00
Marc Delisle
7511aa22a4 Cannot find String datatypes when using a non-English language 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-10 07:53:36 -04:00
Marc Delisle
68d7c1bb41 Remove line breaks and improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-10 06:43:35 -04:00
Michal ฤŒihaล™
6de1c0ff5d Merge pull request #1280 from ashutoshdhundhara/rfe_1445_improve 
Function says that it returns HTML.
 2014-07-09 20:30:30 +02:00
Ashutosh Dhundhara
622bab8f06 Function says that it returns HTML. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-07-09 23:00:20 +05:30
Michal ฤŒihaล™
326460b6bb Better name for edit action 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2014-07-09 15:24:20 +02:00
Marc Delisle
76a01df396 Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-09 08:11:47 -04:00
Dhananjay Nakrani
dcd7e45a41 Ignore php errors whenever '@' is used. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-07-09 12:05:50 +05:30
Atul Pratap Singh
7731971f9e Merge branch 'QA_4_2' 2014-07-08 20:34:08 +05:30
Atul Pratap Singh
2e76e83408 Fix bug 4483/4440: selflink was disappearing in certain cases 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-08 20:05:46 +05:30
Michal ฤŒihaล™
7089858ab0 Allow to use system phpseclib 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2014-07-08 16:29:54 +02:00
Aputsiaq Niels Janussen
e0f1d2e03a Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-08 09:38:03 -04:00
Marc Delisle
52718ec208 Merge branch 'QA_4_2' 2014-07-07 18:01:20 -04:00
Marc Delisle
eb468f4786 bug #4481 mult_submits.inc.php Undefined variable Error 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-07 18:00:47 -04:00
Marc Delisle
5aee521030 Merge branch 'QA_4_2' 2014-07-07 06:36:11 -04:00
Marc Delisle
ca9ad6015a Undefined variable when grid editing a foreign key column 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-07 06:35:30 -04:00
Marc Delisle
bcb7dec3fd Merge commit '0314678' 2014-07-05 09:41:17 -04:00
Cezary H. Noweta
0314678985 bug #4478 Server validation does not work while in setup/mysqli 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-05 09:28:06 -04:00
Marc Delisle
e4f96d7c8d Name of keys should be translatable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-04 10:34:48 -04:00
Marc Delisle
943c99d1f0 Improve translatability 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-04 08:42:31 -04:00
Marc Delisle
fc7ee2089b Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-03 20:10:08 -04:00
Ann + J.M
f5a9a60382 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-03 20:27:39 +02:00
Marc Delisle
ac6174e6b8 Use ellipsis character 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-03 07:41:44 -04:00
Marc Delisle
a4829eaeed Improve messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-03 07:37:33 -04:00
Marc Delisle
23eabae0f6 Merge pull request #1269 from smita786/gsoc_automated_normalizaion 
Automated Normalization: Enforce primary key instead unque index in 1NF
 2014-07-03 07:28:07 -04:00
Smita Kumari
b3efca6f38 Enforce primary key instead unque index in 1NF 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-07-03 16:52:31 +05:30
Ann + J.M
64fddc4c6e Fix PHPDoc param types for PMA_executeQueryAndSendQueryResponse 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-02 21:28:39 +02:00
Marc Delisle
fb17840088 Add hint about drag and drop for import 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-02 08:16:38 -04:00
Marc Delisle
49e5aaf67f Merge commit '162d762824dfc5df04a55a7023f23f8870fad19a' 2014-07-02 06:41:19 -04:00
minhaz
162d762824 Drag n drop import, feature request 1522 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-02 06:38:45 -04:00
Atul Pratap Singh
a2fbf798eb Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-07-02 14:15:14 +05:30
Atul Pratap Singh
ab1d28fb79 Merge commit '2819506' 2014-07-02 14:08:13 +05:30
Madhura Jayaratne
6575e6ef6d Merge pull request #1267 from kb-yashodha/refactoring 
Remove old relational schema edit/export page and related code
 2014-07-02 14:05:27 +05:30
Marc Delisle
f47548e18f Use ellipsis character 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-01 16:21:22 -04:00
Atul Pratap Singh
2819506bb0 Have single-sort url besides multi-sort for each column and make single-sort default on click 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-01 23:32:05 +05:30
Bimal Yashodha
adf0d2e4b7 Remove old relational schema edit/export page and related code 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-01 17:51:45 +05:30
Madhura Jayaratne
b092ad5b57 Merge pull request #1263 from kb-yashodha/ut 
Unit tests
 2014-07-01 17:17:42 +05:30
Bimal Yashodha
22748080ac Remove extra space 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-01 15:12:54 +05:30
Madhura Jayaratne
6f065ac6b6 Merge pull request #1262 from kb-yashodha/export 
Export schema from designer
 2014-07-01 14:44:14 +05:30