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

95104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
c4c5810c9d Merge remote-tracking branch 'origin/master' 2014-09-17 14:29:18 +02:00
dingo thirteen
30274535b4 Translated using Weblate (Dutch) 
Currently translated at 98.9% (2933 of 2964)

[ci skip]
 2014-09-17 14:29:14 +02: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
Chanaka Dharmarathna
4c1d1b877f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-09-17 00:22:30 +05:30
Chanaka Dharmarathna
31da8b1cdc Remove unsed variable 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-17 00:21:10 +05:30
Chanaka Dharmarathna
08e8ab1cda Remove unused parameter 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-17 00:04:01 +05:30
Chanaka Dharmarathna
fe17e81299 Remove unused variables 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-16 23:19:04 +05:30
Marc Delisle
25cbe79a53 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-16 08:10:33 -04:00
Marc Delisle
64d606ed59 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-16 07:59:18 -04:00
Marc Delisle
e279834262 Merge pull request #1359 from cmyker/master 
Fix: broken skip slave error functionality
 2014-09-16 07:40:56 -04:00
Igor Prokopenkov
d052fd0c51 Fix: broken skip slave error functionality 
libraries/replication_gui.lib.php:908
function PMA_handleControlRequest()
checks for
if (isset($_REQUEST['sr_take_action']))
libraries/replication_gui.lib.php:202
but sr_take_action variable isn't included in $slave_skip_error_link generation

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
 2014-09-15 21:34:09 +03:00
Chanaka Dharmarathna
866a62800d Remove unused variable in _getPlacedLinks() function 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-15 22:25:25 +05:30
Marc Delisle
01740a54f7 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 11:35:21 -04:00
Marc Delisle
9ab4ade266 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 11:34:32 -04:00
Weblate
57e1d10b02 Merge remote-tracking branch 'origin/master' 2014-09-15 14:05:09 +02:00
Kyeong Su Shin
54773d9565 Translated using Weblate (Korean) 
Currently translated at 79.6% (2362 of 2964)

[ci skip]
 2014-09-15 14:05:06 +02:00
Marc Delisle
7b619ab00b Merge commit '35dd99c' 2014-09-15 08:03:54 -04:00
Marc Delisle
250482589e Merge commit '6af812e' 2014-09-15 08:03:43 -04:00
Marc Delisle
4ac743f5e9 Merge commit '26b6ba5' 2014-09-15 08:03:06 -04:00
Marc Delisle
f70744ad71 Merge commit '41c0251' 2014-09-15 08:02:47 -04:00
Marc Delisle
35dd99c499 Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-09-15 08:02:08 -04:00
Marc Delisle
6af812ee44 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 08:01:57 -04:00
Weblate
26b6ba50a6 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-15 14:00:58 +02:00
Kyeong Su Shin
0df1d4b837 Translated using Weblate (Korean) 
Currently translated at 84.6% (2342 of 2768)

[ci skip]
 2014-09-15 14:00:55 +02:00
Marc Delisle
51f2b5f319 Merge pull request #1357 from Tithugues/b4523_q42 
Fix #4523: tbl_change.js: insert as new row submit type on multiple selected records does not set all AUTO_INCREMENTs to 0 value
 2014-09-15 08:00:41 -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
f9dd601397 Coding style modifications. 
Refactoring.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 16:16:47 +02:00
Hugues Peccatte
b4b506af2f Coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 16:14:32 +02:00
Hugues Peccatte
aac5379dff Fix typo. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 16:09:08 +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
Hugues Peccatte
ebda4090db Coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 15:47:14 +02:00
Marc Delisle
6a038d5f90 Merge pull request #1356 from Tithugues/b4528_master 
Fix #4528 Can't import dump via SQL field
 2014-09-14 08:49:58 -04:00
Marc Delisle
d978643fc2 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-14 06:55:05 -04:00
Hugues Peccatte
e85eddb01f Fix #4528 Can't import dump via SQL field 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-13 23:10:57 +02:00
Marc Delisle
c8b4217e42 Fix tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:54:46 -04:00
Marc Delisle
308ae6fb90 Merge commit 'e38891f' 2014-09-13 10:43:19 -04:00
Marc Delisle
969aa8a987 Merge commit 'c0548df' 2014-09-13 10:43:00 -04: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
757bd71959 Merge commit '01c553a' 2014-09-13 10:36:41 -04:00
Weblate
e38891f07a Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-13 16:35:12 +02:00
Kristjan Räts
bfc4c21b1f Translated using Weblate (Estonian) 
Currently translated at 100.0% (2768 of 2768)

[ci skip]
 2014-09-13 16:35:09 +02: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
c0548df2f9 Merge commit '01c553a' into QA_4_2 2014-09-13 10:31:56 -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
Marc Delisle
cce31f752e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 08:45:46 -04:00
Marc Delisle
92640e56d3 Merge pull request #1355 from smita786/master 
avoid session timeout when user is active FR#1529
 2014-09-13 08:43:27 -04:00
Chanaka Dharmarathna
e12131f769 CSS imprvements - added more space between top menu and page content in structure and insert pages 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-13 10:45:01 +05:30
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