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

96236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
b7e17814c1 Fix variable name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 11:59:07 +01:00
Michal Čihař
2502375982 Add missing call to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 11:56:19 +01:00
Michal Čihař
a6764bab9b Always restore mocked instance after test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 11:38:40 +01:00
Michal Čihař
baa922e902 Define missing variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 10:43:03 +01:00
Michal Čihař
94baaba666 Adjust testcase to new split methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 10:42:11 +01:00
Michal Čihař
2ce7aa70c4 Move storing password/username after checking password 
The cookie encryption is quite expensive, so let's move it after we
check password validity.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 09:50:16 +01:00
Marc Delisle
b427d13b0f Merge commit '1292a53' 2014-11-30 06:38:17 -05:00
Marc Delisle
c4966c6fb5 Merge commit '41277d1' 2014-11-30 06:37:49 -05:00
Marc Delisle
c237f27a1b Merge commit '0ab3ee3' 2014-11-30 06:37:38 -05:00
Marc Delisle
1292a53379 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-11-30 06:36:33 -05:00
Marc Delisle
e8aa77761e Merge commit '0ab3ee3' into QA_4_3 2014-11-30 06:36:23 -05:00
Marc Delisle
41277d1887 4.2.13 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-30 06:35:21 -05:00
Hugues Peccatte
e037f60015 Factorization. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-29 16:04:29 +01:00
Hugues Peccatte
115065b3f6 Reduce nesting levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-29 14:40:02 +01:00
Marc Delisle
73e4c5653f Merge branch 'QA_4_3' 2014-11-29 06:50:03 -05:00
Marc Delisle
1e39ac53d0 Bug Undefined index menuswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-29 06:49:24 -05:00
Marc Delisle
cbbdf9825a Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-28 10:33:36 -05:00
Marc Delisle
d17215986d Improve English 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-28 08:02:01 -05:00
Michal Čihař
109f08f429 Improve a bit recommendation to use another authentication as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-28 13:44:31 +01:00
Weblate
3c6c80003c Merge remote-tracking branch 'origin/master' 2014-11-28 06:49:29 +01:00
Ann + J.M
139150b066 Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-28 06:49:27 +01:00
Madhura Jayaratne
1c6af0f7b9 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 11:18:57 +05:30
Madhura Jayaratne
3f673637b7 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-11-28 11:09:54 +05:30
Madhura Jayaratne
eb79ad9181 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 11:09:04 +05:30
Weblate
f4c5012cc7 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-28 06:31:51 +01:00
Ann + J.M
251a2aea78 Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-28 06:31:49 +01:00
Madhura Jayaratne
5c02da89be ChangeLog entry for bug #4227 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 11:01:18 +05:30
Madhura Jayaratne
ea7ca462e5 Document what these flags do 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:57:19 +05:30
Madhura Jayaratne
5e1ab952b8 Use a separate flag to avoid confusion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:52 +05:30
Madhura Jayaratne
b92d3e1047 Workaround for token mismatch error on server session timeout for config and http authentication types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:28 +05:30
Weblate
3cd0eceb55 Merge remote-tracking branch 'origin/master' 2014-11-27 16:49:22 +01:00
Ann + J.M
19efd36c9c Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-27 16:49:20 +01:00
Ann + J.M
b23a40f39c Merge branch 'QA_4_3' 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 16:49:06 +01:00
Ann + J.M
2e9b80e9e3 [DOC] Add ChangeLog entry for bug #4610 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 16:46:15 +01:00
Weblate
cb18cb6484 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-27 16:42:42 +01:00
Ann + J.M
b779a1881b Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-27 16:42:40 +01:00
Ann + J.M
36e49e496c [DOC] Add ChangeLog entry for bug #4609 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 16:42:25 +01:00
Ann + J.M
f14a051e1b [TEST] Fix failing test after 3d87430 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 16:38:50 +01:00
Panagiotis Papazoglou
8ffcc29ff8 Translated using Weblate (Greek) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2014-11-27 16:08:37 +01:00
Ann + J.M
2985b19a2f Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-27 16:01:32 +01:00
Weblate
803861b92a Merge remote-tracking branch 'origin/master' 2014-11-27 15:57:32 +01:00
Ann + J.M
93af3b758e Translated using Weblate (German) 
Currently translated at 99.9% (2976 of 2978 strings)

[CI skip]
 2014-11-27 15:57:29 +01:00
Marc Delisle
45f77e5059 Merge commit '42e7427' 2014-11-27 09:57:15 -05:00
Marc Delisle
aeebf1052f Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-27 09:54:16 -05:00
Dieter Adriaenssens
f99176f5ff Translated using Weblate (Dutch) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2014-11-27 15:39:42 +01:00
Marc Delisle
0ab3ee3728 4.3.0-rc1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-27 09:32:24 -05:00
Ann + J.M
a47128ca4f [FIX] JS error reporting: Preserve hash fragment 
The JS error reporting notification bar closing link points to href="#".
Don't allow navigating to the target, so our hash history is not
overwritten.

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 14:52:34 +01:00
Ann + J.M
3d87430aa0 [FIX] Browse table: Make Show all label clickable 
<label for> works with IDs, not names.

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 14:43:16 +01:00
Madhura Jayaratne
e528721543 Show messages for mulitquery 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 16:26:37 +05:30
Madhura Jayaratne
591fde9ed7 No longer need special handling since we are using the same div 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 15:30:10 +05:30