gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,559 Commits 12 Branches 481 Tags 2.4 GiB
4effdfd026
Commit Graph

12049 Commits

Author SHA1 Message Date
Marc Delisle
c1645e73e2 Improve messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-06 08:00:46 -04:00
Marc Delisle
c904b40ba0 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-06 07:53:57 -04:00
Marc Delisle
d097f0c476 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-05 17:34:32 -04:00
Madhura Jayaratne
3aa4118395 Remove trailing white spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-05 23:28:03 +05:30
Madhura Jayaratne
16e1c6242c Merge pull request #1315 from kb-yashodha/refactoring 
Refactoring
 2014-08-05 23:12:02 +05:30
Marc Delisle
30f5dcad0b Merge pull request #1310 from smita786/gsoc_automated_normalizaion 
Gsoc automated normalizaion: 3NF for review
 2014-08-05 10:11:16 -04:00
Smita Kumari
d766b1459a 3NF complete 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-05 17:05:31 +05:30
Marc Delisle
4bf4c8c33c Merge pull request #1314 from ashutoshdhundhara/rfe_1491 
RFE#1491: Support InnoDB for database Query by example.
 2014-08-05 07:26:40 -04:00
Madhura Jayaratne
0b441e664f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-05 07:31:08 +05:30
Madhura Jayaratne
b810b85c92 Show the current status with the icon and change it on hover to show the expected behavior 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-05 07:15:59 +05:30
Bimal Yashodha
ec54531491 Merge branch 'master' into refactoring 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-05 01:05:56 +05:30
Bimal Yashodha
97d5310f5e Refactor designer HTML into PHP functions 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-05 00:54:34 +05:30
Ashutosh Dhundhara
b3583d4cba RFE#1491: Support InnoDB for database Query by example. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

FAQ entry should remain.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-04 23:55:53 +05:30
Marc Delisle
c9a95531b8 Merge pull request #1313 from ashutoshdhundhara/internal_relations 
Improve 'LEFT JOIN' generation for internal relations.
 2014-08-04 07:36:27 -04:00
Ashutosh Dhundhara
057a5cbf97 Improve 'LEFT JOIN' generation for internal relations. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-04 03:53:37 +05:30
Marc Delisle
1f52d901ef Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-03 18:19:49 -04:00
Chirayu Chiripal
11ae13f177 Improve validation on insert page 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-08-04 02:19:25 +05:30
Madhura Jayaratne
e9cf1ecbe9 Use link and unlink to avoid confusion. Bind .on event to document not to be affected by navigation reload. Update title as functionality changes. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-03 19:18:11 +05:30
Marc Delisle
f0e1dd8406 Merge pull request #1104 from madhuracj/nav 
Add 'collapse all' and 'link with main panel' buttons to navigation
 2014-08-03 07:37:00 -04:00
Marc Delisle
b2c0747e1c Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-02 10:07:31 -04:00
Marc Delisle
8b1c680ac3 Fix code execution path warnings 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-02 10:01:07 -04:00
Marc Delisle
515d2590da Remove outdated comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-02 09:50:24 -04:00
Marc Delisle
7aca215e5b Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-02 09:45:58 -04:00
Marc Delisle
852e008ca5 Merge pull request #1308 from ashutoshdhundhara/rfe_919 
RFE#919 Improvement.
 2014-08-01 14:28:35 -04:00
Ashutosh Dhundhara
d8ec2af158 Allow foreign key creation with empty columns. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 23:02:43 +05:30
Marc Delisle
c4a1c83d4e Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-01 12:52:47 -04:00
Marc Delisle
bc80a03aa8 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-01 12:51:55 -04:00
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Marc Delisle
1703705c7a Fix execution path notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-29 12:03:52 -04:00
Edward Cheng
54000aa117 [Console]Second commit 
Console changes:
+ Ajax global callback
+ Support disable Codemirror
+ Global AJAX callback
+ XSS issues slove
+ JSON response bug fix
+ Selection query Explain and Profiling
+ Translation improvement
+ Bookmark creation and deletion
+ Codemirror wrong font-size under Firefox
+ Options card input elements value bug
+ Etc

Removal:
- Rollback query execution support

Other changes:
+ Unify query history behavior

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-07-29 19:20:38 +08:00
Isaac Bennetch
f1f337bb0c Merge pull request #1302 from D-storm/FR-1426 
RFE-1426: Navigation state lost on reload + Bugfix-4439
 2014-07-28 16:34:44 -04:00
chanaka
237b00cc00 Fixed some codesniffer errors 
Signed-off-by: chanaka <chanaka@oneit.com.au>
 2014-07-28 21:49:11 +05:30
chanaka
29d81b3506 Fixed codesniffer error in documentation 
Signed-off-by: chanaka <chanaka@oneit.com.au>
 2014-07-28 19:34:26 +05:30
Madhura Jayaratne
dfe8dc283a Add 'collapse all' and 'link with main panel' buttons to navigation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-07-28 09:58:24 +05:30
Marc Delisle
5c2581ee25 Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-26 22:11:15 -04:00
Marc Delisle
aeda34196e Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-26 21:46:10 -04:00
Marc Delisle
6211602e16 Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-26 13:03:24 -04:00
Marc Delisle
bf13970aec Unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-26 11:32:16 -04:00
Marc Delisle
df5f002268 Avoid execution path notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-26 09:47:19 -04:00
Chirayu Chiripal
4522900ef0 RFE-1426: Navigation state lost on reload + Bugfix-4439 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-26 12:06:31 +05:30
Madhura Jayaratne
a34b6fea5a Merge pull request #1283 from kb-yashodha/indexdb 
IndexDB for designer - Use the designer without configuring tables
 2014-07-26 10:08:32 +05:30
Marc Delisle
75d12daa09 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-25 17:46:05 -04:00
Marc Delisle
8bfda09b8f Merge pull request #1301 from D-storm/tests 
improve test cases of server_privileges.lib.php
 2014-07-25 17:42:39 -04:00
Marc Delisle
7c9931d1e7 Merge pull request #1298 from D-storm/update 
update transformation path in getInfo method
 2014-07-25 17:40:16 -04:00
Chirayu Chiripal
1d65c1d2f2 improve test cases of server_privileges.lib.php 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-26 02:06:00 +05:30
Bimal Yashodha
39d4fc1023 Check whether the db is not system schema 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-25 15:36:48 +05:30
Tim Siebels
d9cbf2664c Fix default port to null for hhvm 
HHVM doesn't allow false to be passed as port to mysqli_real_connect.
It only allows a nullable integer until ZendParamMode is finished.

See facebook/hhvm#1817

Signed-off-by: Tim Siebels <tim_siebels_aurich@yahoo.de>
 2014-07-24 17:54:21 +02:00
Chirayu Chiripal
871ad6d8ab update transformation path in getInfo method 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-24 14:14:03 +05:30
Michal Čihař
f060e5905d Fixed path to transformation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-07-24 07:27:05 +02:00
Marc Delisle
e2b38097ba Merge branch 'QA_4_2' 2014-07-23 08:37:10 -07:00