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

96219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Madhura Jayaratne
36693cf6c3 Use the same div to show message when no rows are returned 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 15:27:18 +05:30
Madhura Jayaratne
47fdaea07d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-27 15:07:48 +05:30
Madhura Jayaratne
dfd10b34fe Serve both ajax and non-ajax scenarios 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 15:06:14 +05:30
Kristjan Räts
90eda81d9c Translated using Weblate (Estonian) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2014-11-27 08:53:56 +01:00
Weblate
6756460d35 Merge remote-tracking branch 'origin/master' 2014-11-27 06:06:39 +01:00
Marcos Algeri
5f9a8cfe3c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.6% (2801 of 2991 strings)

[CI skip]
 2014-11-27 06:06:36 +01:00
Giovanni Sora
0c41d54852 Translated using Weblate (Interlingua) 
Currently translated at 63.8% (1911 of 2991 strings)

[CI skip]
 2014-11-27 06:06:35 +01:00
Aputsiaq Niels Janussen
870bc24215 Translated using Weblate (Danish) 
Currently translated at 96.8% (2896 of 2991 strings)

[CI skip]
 2014-11-27 06:06:33 +01:00
Madhura Jayaratne
6fb9a53b4a Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 10:34:44 +05:30
Weblate
42e74273a5 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-27 05:58:10 +01:00
Marcos Algeri
c9cbfec6ca Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.0% (2801 of 2978 strings)

[CI skip]
 2014-11-27 05:58:08 +01:00
Giovanni Sora
6aaf98273b Translated using Weblate (Interlingua) 
Currently translated at 63.7% (1898 of 2978 strings)

[CI skip]
 2014-11-27 05:58:06 +01:00
Aputsiaq Niels Janussen
b215875e3e Translated using Weblate (Danish) 
Currently translated at 97.2% (2896 of 2978 strings)

[CI skip]
 2014-11-27 05:58:04 +01:00
Madhura Jayaratne
10b958c1ba Merge branch 'QA_4_2' into QA_4_3 2014-11-27 10:27:34 +05:30
Madhura Jayaratne
19802ca9f9 bug #4608 SELECT permission issues with relations and restricted access 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 10:25:42 +05:30
Danilo GUia
e08383ba25 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.9% (2797 of 2978 strings)

[CI skip]
 2014-11-26 18:32:25 +01:00
Weblate
bf4a032384 Merge remote-tracking branch 'origin/master' 2014-11-26 17:22:04 +01:00