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

3614 Commits

Author SHA1 Message Date
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
Marc Delisle
ecdc5f3dc6 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 17:10:59 -04:00
Marc Delisle
6e0189ba74 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-30 07:30:12 -04:00
Marc Delisle
fee447fae8 bug in functions.js: Cannot read property 'replace' of undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-30 07:22:14 -04:00
Marc Delisle
6cd19738cd Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 09:13:41 -04:00
Marc Delisle
d6cf9ebaaa bug in server_privileges.js: cannot read property 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 09:08:02 -04:00
Madhura Jayaratne
bd378db70d Fix db fast filters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 21:37:13 +05:30
Madhura Jayaratne
dc8f2c5606 Properly mark saved status for new pages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:58:13 +05:30
Madhura Jayaratne
681bca3560 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-08-24 07:36:53 +05:30
Madhura Jayaratne
e5f1c6d8bf Simplify schema exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 07:36:10 +05:30
Madhura Jayaratne
e2f7257a2c Indicate save status 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-22 12:17:27 +05:30
Madhura Jayaratne
10b90e1a74 Use pma_ prefix 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-22 11:01:06 +05:30
Madhura Jayaratne
c2bcb4f844 Simplify callbacks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-22 10:38:39 +05:30
Madhura Jayaratne
94738c9e67 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-21 19:29:29 +05:30
Madhura Jayaratne
fae3858669 bug #4521 Initially allowed chart types do not match selected data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-21 19:24:33 +05:30
Marc Delisle
861b0b0954 Merge branch 'QA_4_2' 2014-08-20 12:29:20 -04:00
Marc Delisle
4992cea190 bug #4520 sql.js: cannot read property 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-20 12:27:05 -04:00
Marc Delisle
29fca69f57 Merge branch 'QA_4_2' 2014-08-19 08:52:06 -04:00
Marc Delisle
a2ab758e9b bug #4519 Uncaught TypeError: Cannot read property 'success' of null 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-19 08:51:15 -04:00
Marc Delisle
f7fd63916c Merge pull request #1337 from ashutoshdhundhara/scrutinizer_fix 
Fix issues reported by Scrutinizer.
 2014-08-17 13:37:22 -04:00
Marc Delisle
38b8cd7a80 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 12:40:53 -04:00
Madhura Jayaratne
90ddeecf60 bug #4504 [security] Self-XSS in query charts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:52:05 -04:00