gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,032 Commits 12 Branches 481 Tags 2.4 GiB
762dd0884f
Commit Graph

3679 Commits

Author SHA1 Message Date
Madhura Jayaratne
566466e32b Eliminate duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 10:20:30 +05:30
Madhura Jayaratne
5e1b5e086f Keep the content of the table structure page until editing page is loaded 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 10:12:28 +05:30
Madhura Jayaratne
b802b5f9b3 Bug #4591 Spinner in navigation running forever 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-18 15:51:06 +05:30
Madhura Jayaratne
5e7503673d Replace only if there are actually errors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 09:28:03 +05:30
Madhura Jayaratne
78d6c04c4a Update errors on navigation panel actions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 08:38:07 +05:30
Marc Delisle
1fc718babb Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-13 11:57:29 -05:00
Marc Delisle
9c82f7050a Merge pull request #1400 from madhuracj/ShowAll1 
rfe #1556 implemented with a checkbox for 'Show all'
 2014-11-13 11:54:27 -05:00
Madhura Jayaratne
183aae0c3f rfe #1556 Disabling Show all 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-13 12:42:16 +05:30
Madhura Jayaratne
52596698a7 Prompt to confirm on Show All 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-13 10:53:29 +05:30
Madhura Jayaratne
410e9d35aa Bug #4588 Moving, renaming, dropping actions in table operations page results in token mismatch 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-13 08:10:53 +05:30
Marc Delisle
4246606798 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-12 08:02:55 -05:00
Atul Pratap Singh
d533e98176 Fix bug#4586 Javascript error after moving a column 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-11-12 14:06:49 +05:30
Marc Delisle
4ccb8df7ea Merge pull request #1394 from nisargjhaveri/autocomplete 
SQL autocomplete in RTE editors
 2014-11-11 10:33:31 -05:00
Madhura Jayaratne
3b3bd0c2eb Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 10:41:56 +05:30
Madhura Jayaratne
1d54c59049 #4584 Edit dialog for routines is too long for smaller displays 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 10:35:00 +05:30
Nisarg Jhaveri
a4c2cfea87 SQL autocomplete in RTE editors 
Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-11-11 00:16:59 +05:30
Madhura Jayaratne
da07378c36 Allow debugging queries executed by the navigation panel 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 12:23:43 +05:30
Madhura Jayaratne
2377ba4dd7 bug #4582 Debug SQL works only for the first page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 11:30:33 +05:30
Madhura Jayaratne
e49e9d82bd Update to match ajax page loading mechanism 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-05 16:14:16 +05:30
Marc Delisle
4360a174e5 bug ReferenceError: targeurl is not defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-04 12:35:10 -05:00
Madhura Jayaratne
e4d5503bcf bug #4577 Additional fix for table structure page. Multi submits can be inputs as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:31:51 -08:00
Madhura Jayaratne
eef8565b73 bug #4577 Multi row actions cause full page reloads 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:00:03 -08:00
Madhura Jayaratne
a8866653ec Fix merge error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 14:29:49 -08:00
Madhura Jayaratne
5b2fff405f Merge branch 'QA_4_2' 
Conflicts:
	js/sql.js

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:48:02 -08:00
Madhura Jayaratne
4d16273018 Merge branch 'QA_4_2' 
Conflicts:
	js/sql.js

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:04:06 -08:00
Hugues Peccatte
1390d133f6 Minor modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-03 22:02:01 +01:00
Hugues Peccatte
2b4d6c955e Remove duplicated js function. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-03 21:57:55 +01:00
Hugues Peccatte
037a034b43 Minor coding style modifications. 
Fix typos.
PHPDoc and JSDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:04:35 +01:00
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues. 
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-01 22:07:18 +01:00
Marc Delisle
90ee48f0ba Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
RFE 1550: PMA_URL_getCommon(): new style
 2014-10-28 08:14:45 -04:00
Marc Delisle
0b9bd29f27 Merge branch 'QA_4_2' 2014-10-25 08:59:12 -04:00
Marc Delisle
1e51819d6e bug in makegrid.js: where_clause is undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-25 08:58:20 -04:00
Marc Delisle
0f58673cee Merge pull request #1383 from smita786/master 
moving out inline js from db_designer.lib.php plus minor bug fixes
 2014-10-23 07:46:22 -04:00
Ann + J.M
953e865fc6 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:44:50 +02:00
Ann + J.M
6feb3b0d3a Fix failing unit tests 
Signed-off-by: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:06:14 +02:00
Smita Kumari
28622a4bcc fixing coding style 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-22 22:53:35 +05:30
Ann + J.M
29ec69c849 Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 16:58:00 +02:00
Smita Kumari
41eda0819a resolve conflict 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-21 23:43:10 +05:30
Madhura Jayaratne
c678cc5bb0 Merge branch 'QA_4_2' 2014-10-21 22:27:13 +05:30
Madhura Jayaratne
1e21d7b0da bug #4568 Date displayed incorrectly when charting a timeline 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 22:24:44 +05:30
Marc Delisle
dde9ca7c79 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-21 10:38:46 -04:00
Smita Kumari
d87a99e01c moving inline js out from db_designer.lib.php plus minor bug fixes 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-21 12:40:09 +05:30
Madhura Jayaratne
7b8962dede bug #4563 [security] XSS in monitor query analyzer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 08:45:09 +05:30
Madhura Jayaratne
d2aec03f2b Do not remove throbber in case of aborted ajax filter calls 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-20 14:56:40 +05:30
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:39 +02:00
Marc Delisle
5efd2feb49 Merge pull request #1378 from nisargjhaveri/bug_4558 
bug #4558 Unable to Add Rows while Creating Table
 2014-10-16 10:39:39 -04:00
Nisarg Jhaveri
310b76c585 bug #4558 Unable to Add Rows while Creating Table 
- Remove inline JS from add column button.
- Remove unnecessary eventhandler to submit form on enter.
- Added event handler to add column field to add on enter.
- Fix tests

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-16 19:43:52 +05:30
Nisarg Jhaveri
6cc3ea6eae Autocomplete table/column names in SQL editors 
- In DB and Table level SQL editors, console
- Updated CodeMirror addon `sql-hint.js` to newer version

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-14 23:22:15 +05:30
Marc Delisle
d189751262 Merge commit '536d4ef' 2014-10-08 08:45:54 -04:00
Ashutosh Dhundhara
536d4ef845 bug #4554 Grid-editing timestamp column forces datepicker. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-10-08 15:32:50 +05:30