webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
95,546 Commits 12 Branches 481 Tags
3363f1088091ea01e5c1917a6900a63e677b2663
Commit Graph

3635 Commits

Author SHA1 Message Date
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
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
Madhura Jayaratne
8fa9f576fd Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-06 23:07:59 +05:30
Nisarg Jhaveri
bf63a462cc Basic autocomplete in SQL Query editor 
- Autocomplete SQL keywords using CodeMirror hint addon
- Inline, footer SQL editors are not included
- Table/Database names completion is not implemented
- Added autocompletion to console, inline SQL editor, create view dialogue
- Autocomplete on `inputRead` instead of `change` event.

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-06 12:37:14 -04:00
Madhura Jayaratne
e7cd2a11cd Add index dialog does not open on choosing index from create table page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-06 19:00:13 +05:30
Madhura Jayaratne
d274064d54 Avoid bad line breaks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-04 18:40:26 +05:30
Madhura Jayaratne
92ca4abe59 Fix bad line breaks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-04 18:36:26 +05:30
Marc Delisle
9cf0be189c Merge pull request #1367 from madhuracj/Bug4547 
Fix for bug #4547
 2014-10-03 12:30:27 -04:00
Atul Pratap Singh
54f4af1d88 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-03 20:31:00 +05:30
Smita Kumari
2ee9898f20 fix mousemove conflict:bug#4549 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-03 19:35:17 +05:30
Atul Pratap Singh
035e34021a Add licencing info to js/sprintf.js from https://github.com/kvz/phpjs/blob/master/LICENSE.txt 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-03 19:04:26 +05:30
Atul Pratap Singh
c70e109bd6 Feature#1546 Replace js sprintf library with a better one 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-03 17:08:25 +05:30
Madhura Jayaratne
db2c928f12 Scroll to the top when sub menus are created 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 10:24:54 +05:30
Madhura Jayaratne
7027bcf3d1 Cleanup edit privilege functionality 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 09:48:15 +05:30
Madhura Jayaratne
6355df8f3b Cleanup add user functionality 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 07:04:03 +05:30
Atul Pratap Singh
6c83a2f2e3 Merge commit 'a020eac11a26977295cf2439ddd2e5b4af2c88fe' 
Conflicts:
	js/config.js
	js/db_search.js
	js/functions.js
	js/makegrid.js
	js/server_privileges.js
	js/tbl_structure.js
 2014-10-01 20:42:21 +05:30
Atul Pratap Singh
a020eac11a Add js checks in multiple files if data is undefined 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-01 10:00:54 +05:30
Smita Kumari
fd6e7cf4e1 resolve merge conflict 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-01 01:04:19 +05:30
Smita Kumari
179285bb61 bug fix #4545 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-01 00:16:14 +05:30
Chirayu Chiripal
5c67267a11 Merge pull request #1363 from D-storm/export 
fix export with more than 1000 input fields (db/table/column alias)
 2014-09-29 22:35:08 +05:30
Chirayu Chiripal
aae1b30d62 fix export with more than 1000 input fields (db/table/column alias) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-29 18:50:12 +05:30
Michal Čihař
8ad314d1f0 Do not pretend that sprintf in javascript supports ordering 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-09-29 11:19:35 +02:00
Smita Kumari
d00ac27f75 fix bug #4540 #4541 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-09-24 19:34:53 +05:30
Marc Delisle
a04c0106f2 Out of scope variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-22 12:40:49 -04:00
Chirayu Chiripal
9187b75424 Fix bad line breaks (coding style) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-20 16:59:18 +05:30
Chirayu Chiripal
137c44a5db Fix function was used before it was defined 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-20 16:55:04 +05:30
Chirayu Chiripal
22c44a2363 Fix bad line break in js (coding style) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-20 16:47:01 +05:30
Atul Pratap Singh
50aa2df9c2 Merge branch 'QA_4_2' 2014-09-18 17:32:58 +05:30
Dean Moncaster
95911ff20f Sticky column headers were getting wrongly aligned, http://stackoverflow.com/questions/24635110/phpmyadmin-column-headers-move-in-table-when-you-scroll 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-09-18 17:22:18 +05:30
Marc Delisle
176486c36c Merge branch 'QA_4_2' 2014-09-17 09:16:12 -04:00
Marc Delisle
070a9e1d62 bug tbl_structure.js "cannot read property" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-17 09:15:05 -04:00
Marc Delisle
d86f1ba247 Merge branch 'QA_4_2' 2014-09-17 08:27:36 -04:00
Marc Delisle
a10d5e15f6 bug ajax.js responseHandler: another "cannot read property" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-17 08:26:39 -04:00
Marc Delisle
9ab4ade266 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 11:34:32 -04:00
Marc Delisle
f70744ad71 Merge commit '41c0251' 2014-09-15 08:02:47 -04:00
Hugues Peccatte
41c02512c7 Code style improvements. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 20:47:24 +02:00
Hugues Peccatte
fbf2e028f5 Fix #4523 insert as new row submit type on multiple selected records does not set all AUTO_INCREMENTs to 0 value 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 20:45:07 +02:00
Hugues Peccatte
f0c1480ee7 Javascript coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 15:51:40 +02:00
Marc Delisle
c85c9fd417 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:39:21 -04:00
Marc Delisle
f2be36ae80 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:33:32 -04:00
Marc Delisle
33b39f9f1d bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:30:47 -04:00
Smita Kumari
42223e1bf6 avoid session timeout when user is active FR#1529 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-09-13 03:10:40 +05:30
Marc Delisle
4def6c262b Merge branch 'QA_4_2' 2014-09-05 12:39:14 -04:00
Marc Delisle
efbf606a4d bug sql.js: str is undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-05 12:38:04 -04:00
Marc Delisle
4faa0d1ebd Merge branch 'QA_4_2' 2014-09-01 11:39:50 -04:00
Marc Delisle
2a34539a48 bug ajax.js responseHandler: cannot read property of null 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-01 11:39:07 -04:00