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

3550 Commits

Author SHA1 Message Date
Madhura Jayaratne
b8a0dbd150 Use !== for js comparisons 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-05 23:31:52 +05:30
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
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
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
bc14e8e24a Avoid empty block notices 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-03 08:01:32 -04:00
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
Madhura Jayaratne
8316de1040 Change icon with sprites 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-03 16:21:19 +05:30
Marc Delisle
41f2ecf87b Merge pull request #1307 from ashutoshdhundhara/rfe_919 
RFE#919: Multiple-column foreign key relation.
 2014-08-01 12:49:22 -04:00
Marc Delisle
6d7171ba07 Fix variable scope 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-01 10:49:34 -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
cf7775ceca Fix variables scope 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-01 08:30:19 -04:00
Chirayu Chiripal
e9127e5350 fix navigation token mismatch error after relogin 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-31 02:15:20 +05:30
Marc Delisle
caee49655f PMA_tooltip was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-30 13:39:12 -04:00
Marc Delisle
ebb3ebea76 Merge branch 'QA_4_2' 2014-07-30 10:42:00 -04:00
Marc Delisle
b3f2c433fc bug #4500 mysql_doc_template is not defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-30 10:40:47 -04:00
Marc Delisle
4f48517a41 Merge branch 'QA_4_2' 2014-07-29 09:23:52 -04:00
Marc Delisle
f079e79590 bug #4499 Uncaught TypeError: Cannot call method 'substr' of undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-29 09:22:00 -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
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
D-storm
5af334e15a fix js error: undefined dataTransfer.files in IE9 
Signed-off-by: D-storm <chirayu.chiripal@gmail.com>
 2014-07-27 23:22:50 +05:30
Chirayu Chiripal
e6d0ea8bc6 firefox detecting images in page as files on drag 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-26 19:44:14 +05:30
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
f41666c0ac Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-25 15:38:46 -04:00
minhaz
7d2cfdf573 #Feature:1522 enhancement 
- User can close the upload status box, after uploading an invalid extension file, as suggested by D-Storm
 - minimize/maximise changed from -/- to -/+

Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-07-26 00:36:18 +05:30
Chirayu Chiripal
e7087eb698 check dragged element is file or not 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-25 15:46:06 +05:30
Bimal Yashodha
28571419a1 Escape HTML 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-25 14:44:41 +05:30
Bimal Yashodha
72adfea9bb Make callbacks non mandatory 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-25 14:30:58 +05:30
Bimal Yashodha
e03e19b470 Fix issues highlighted 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-25 14:30:35 +05:30
minhaz
6330df4175 #BUG4496 -- part 2, propagation bug fixed 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-07-25 14:28:27 +05:30
minhaz
c78b05eeab #BUG:4496 -- part 2 fix 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-07-25 02:25:29 +05:30
Bimal Yashodha
be1cd209f5 Merge branch 'master' into indexdb 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-23 15:27:26 +05:30
Bimal Yashodha
7520cdf802 Remove trailing white spaces 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-23 14:53:17 +05:30
Bimal Yashodha
7ec0f098db Use designer without configuring tables 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-23 14:37:38 +05:30
Marc Delisle
d0a19abf5a Merge pull request #1286 from ashutoshdhundhara/rfe_908 
RFE#908: Improvements for the table editor (index creation).
 2014-07-22 07:28:37 -07:00
Ashutosh Dhundhara
91e9a4d46c RFE#908: Improvements for the table editor (index creation). 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

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

Make index columns sortable.

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

Fix failing test.

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

Fix drag icon in Firefox.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-07-22 15:29:06 +05:30
Isaac Bennetch
3a215f86c8 Merge pull request #1289 from D-storm/FR-1488 
RFE-1488/781: User privilege tab not shown in all relevant cases
 2014-07-21 15:26:53 -04:00
Marc Delisle
f880d489ae Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-18 10:58:29 -04:00
Marc Delisle
75aa2e8cd2 Merge branch 'QA_4_2' 2014-07-17 17:19:50 -04:00
Marc Delisle
29a1f56495 bug #4492 [security] XSS in AJAX confirmation messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-17 17:18:52 -04:00
Smita Kumari
54a413fd03 new step to 1NF: move repeating group of columns to new table 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-07-18 00:53:49 +05:30