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

96063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
ee22c7efa2 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-26 17:21:10 +01:00
Jan Erik Zassenhaus
0446f3c294 Translated using Weblate (German) 
Currently translated at 99.8% (2974 of 2978 strings)

[CI skip]
 2014-11-26 17:21:08 +01:00
Marc Delisle
496602674c 4.3.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 11:20:54 -05:00
Marc Delisle
e38f5753ff Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 08:12:23 -05:00
Madhura Jayaratne
f5c263119d Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 12:44:09 +05:30
Madhura Jayaratne
9a818c289d bug #4607 Syntax error during db_copy operation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 12:39:09 +05:30
Madhura Jayaratne
57413772c1 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 10:26:09 +05:30
Madhura Jayaratne
14a77261d2 bug #4606 Tracking report export as SQL dump does not work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 10:21:18 +05:30
Weblate
e2a9605706 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-25 04:45:46 +01:00
Huseyn
762dd0884f Translated using Weblate (Azerbaijani) 
Currently translated at 53.1% (1582 of 2978 strings)

[CI skip]
 2014-11-25 04:45:45 +01:00
Madhura Jayaratne
0fda8293f4 Merge branch 'QA_4_2' into QA_4_3 2014-11-25 09:15:08 +05:30
Madhura Jayaratne
8607de61e0 bug #4605 Unseen messages in tracking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 09:01:35 +05:30
Sevdimali İsa
aad6456b45 Translated using Weblate (Azerbaijani) 
Currently translated at 53.0% (1581 of 2978 strings)

[CI skip]
 2014-11-24 14:57:41 +01:00
Marc Delisle
ed6ba4210f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:10:08 -05:00
Marc Delisle
0489e3248d Merge commit '783e28f' into QA_4_3 2014-11-22 09:09:32 -05:00
Marc Delisle
9af3635c26 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:09:18 -05:00
Marc Delisle
02fcb6e746 Add FAQ reference 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:04:11 -05:00
Marc Delisle
783e28f160 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:02:53 -05:00
Weblate
42bf15ea70 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-22 13:17:54 +01:00
Sevdimali İsa
4bade1edfd Translated using Weblate (Azerbaijani) 
Currently translated at 51.6% (1537 of 2978 strings)

[CI skip]
 2014-11-22 13:17:52 +01:00
Marc Delisle
11b1dd67fb Merge branch 'QA_4_2' into QA_4_3 2014-11-22 07:14:17 -05:00
Marc Delisle
1110d08743 bug #4604 Query history not being deleted 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 07:13:41 -05:00
Marc Delisle
3810111659 Incorrect offset in tracking report 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-21 10:17:52 -05:00
Marc Delisle
89515a0aa3 4.2.13-dev in ChangeLog 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 12:14:28 -05:00
Madhura Jayaratne
0ca9f5f2c8 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-11-20 21:56:57 +05:30
Madhura Jayaratne
c2cf281dd6 Fix merge errors. MB functions are not required to handle geometry type names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:55:37 +05:30
Weblate
23d65f6889 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-20 17:15:23 +01:00
Sandro Amaral
791243700f Translated using Weblate (Portuguese) 
Currently translated at 61.0% (1819 of 2978 strings)

[CI skip]
 2014-11-20 17:15:22 +01:00
Madhura Jayaratne
93366c8c24 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:44:53 +05:30
Marc Delisle
3443cc1ca4 4.2.13-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 10:35:46 -05:00