gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,093 Commits 12 Branches 481 Tags 2.4 GiB
125c3b9105
Commit Graph

97093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
125c3b9105 Merge branch 'QA_4_3' 2015-01-08 10:08:11 -05:00
Marc Delisle
6f6c64c64e Merge commit '762dba4' 2015-01-08 10:08:02 -05:00
Marc Delisle
1ead8adb37 Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 2015-01-08 10:07:29 -05:00
Marc Delisle
6954dd971d Bug Undefined index navwork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-08 10:06:54 -05:00
Marc Delisle
5deda0fe88 Merge branch 'QA_4_3' 2015-01-08 09:33:36 -05:00
Marc Delisle
d15298b1ca Merge commit '612e191' 2015-01-08 09:33:30 -05:00
Weblate
762dba4e65 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-08 15:33:19 +01:00
Dadan Setia
65a7fb3225 Translated using Weblate (Indonesian) 
Currently translated at 74.5% (2224 of 2982 strings)

[CI skip]
 2015-01-08 15:33:15 +01:00
Jafar
4fa49ed46c Translated using Weblate (Azerbaijani) 
Currently translated at 53.0% (1583 of 2982 strings)

[CI skip]
 2015-01-08 15:33:13 +01:00
Marc Delisle
769df9acec Bug Undefined index menuswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-08 09:33:02 -05:00
Marc Delisle
8169ab1fe5 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-08 09:07:59 -05:00
Marc Delisle
2ec944b824 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-08 07:57:34 -05:00
Weblate
529a974fe8 Merge remote-tracking branch 'origin/master' 2015-01-08 13:56:26 +01:00
Dadan Setia
1867eb2c54 Translated using Weblate (Indonesian) 
Currently translated at 74.5% (2231 of 2993 strings)

[CI skip]
 2015-01-08 13:56:24 +01:00
Jafar
9f85ee09d3 Translated using Weblate (Azerbaijani) 
Currently translated at 52.8% (1581 of 2991 strings)

[CI skip]
 2015-01-08 13:56:22 +01:00
Marc Delisle
18d99fcf0f Merge pull request #1453 from smita786/master 
FRE #1578: warn about reserved kyword
 2015-01-08 07:56:19 -05:00
Smita Kumari
a9a7fef36f FRE #1578: warn about reserved kyword 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-01-08 16:07:50 +05:30
Madhura Jayaratne
743a528835 rfe #1590 Recaptcha API v2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-08 15:49:24 +05:30
Weblate
1a4cc9756b Merge remote-tracking branch 'origin/master' 2015-01-08 02:49:02 +01:00
Balázs Úr
6ecc3d0cd0 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2993 of 2993 strings)

[CI skip]
 2015-01-08 02:49:00 +01:00
Atul Pratap Singh
477cf0b44d Merge branch 'QA_4_3' 2015-01-08 07:18:38 +05:30
Atul Pratap Singh
c602c49d5d Merge commit '962fc5d084c593f00330690c5db2dedc0233728f' 2015-01-08 07:18:28 +05:30
Weblate
612e1914c1 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-08 02:46:30 +01:00
Balázs Úr
656e5ad09e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2982 of 2982 strings)

[CI skip]
 2015-01-08 02:46:27 +01:00
Atul Pratap Singh
c2afea9040 Fix bug#4695 Changing ['DefaultTabTable'] doesn't update link and title 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-08 07:15:53 +05:30
Balázs Úr
9b12e472b0 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2982 of 2982 strings)

[CI skip]
 2015-01-07 22:51:50 +01:00
Weblate
26283c774c Merge remote-tracking branch 'origin/master' 2015-01-07 22:14:22 +01:00
Balázs Úr
ac79fda612 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2988 of 2993 strings)

[CI skip]
 2015-01-07 22:14:19 +01:00
Atul Pratap Singh
727c35a657 Merge branch 'QA_4_3' 
Conflicts:
	js/functions.js
 2015-01-08 02:43:46 +05:30
Weblate
962fc5d084 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-07 21:56:21 +01:00
Balázs Úr
c357ee6f4b Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2977 of 2982 strings)

[CI skip]
 2015-01-07 21:56:18 +01:00
Atul Pratap Singh
312ff22ee5 [bugs:#4694] js error on marking table as favorite in Safari (in private mode) 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-08 02:24:47 +05:30
Marc Delisle
57b8e0c138 Merge branch 'QA_4_3' 2015-01-07 12:25:09 -05:00
Marc Delisle
1e1a674a60 4.3.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-07 12:24:54 -05:00
Marc Delisle
41e297aa60 4.3.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-07 12:23:46 -05:00
Marc Delisle
ef91568746 Merge branch 'QA_4_3' 2015-01-07 09:27:09 -05:00
Marc Delisle
88cc79896a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-07 09:25:28 -05:00
Madhura Jayaratne
e0de22d806 Do not try to auto configure pma tables if PMA_MINIMUM_COMMON is defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 09:23:28 -05:00
Marc Delisle
ea6e33af0a Clarify releasing 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-07 08:17:20 -05:00
Madhura Jayaratne
84eca3123f Merge branch 'QA_4_3' 2015-01-07 12:49:52 +05:30
Madhura Jayaratne
2770234918 bug #4688 File permissions in archive 2015-01-07 12:39:16 +05:30
Madhura Jayaratne
7f359cee8a Fix syntax error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:49:42 +05:30
Madhura Jayaratne
2365515602 Fix po file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:40:53 +05:30
Madhura Jayaratne
de81f53d45 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:33:31 +05:30
Madhura Jayaratne
5691cdb880 bug #4691 Do not include console when no server is selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:26:38 +05:30
Madhura Jayaratne
beeb84c4e3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-07 11:07:53 +05:30
Madhura Jayaratne
a06dc4f7a9 Simplify checking for Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:06:37 +05:30
Weblate
6f19afee89 Merge remote-tracking branch 'origin/master' 2015-01-07 06:24:07 +01:00
Arben Çokaj
29e7916faa Translated using Weblate (Albanian) 
Currently translated at 99.6% (2983 of 2993 strings)

[CI skip]
 2015-01-07 06:24:04 +01:00
Madhura Jayaratne
245e730f56 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 10:53:42 +05:30