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

97068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atul Pratap Singh
c602c49d5d Merge commit '962fc5d084c593f00330690c5db2dedc0233728f' 2015-01-08 07:18:28 +05:30
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
Weblate
43d785393e Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-07 06:19:56 +01:00
Arben Çokaj
50b231bc42 Translated using Weblate (Albanian) 
Currently translated at 100.0% (2982 of 2982 strings)

[CI skip]
 2015-01-07 06:19:54 +01:00
Madhura Jayaratne
99aad2c118 bug #4685 Call to a member function isUserType() on a non-object 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 10:49:33 +05:30
Arben Çokaj
3c10c91cb7 Translated using Weblate (Albanian) 
Currently translated at 25.3% (760 of 2993 strings)

[CI skip]
 2015-01-06 23:59:53 +01:00
Arben Çokaj
fd8ba9175e Translated using Weblate (Albanian) 
Currently translated at 80.8% (2410 of 2982 strings)

[CI skip]
 2015-01-06 23:52:11 +01:00
Arben Çokaj
326060d00d Translated using Weblate (Albanian) 
Currently translated at 59.2% (1766 of 2982 strings)

[CI skip]
 2015-01-06 23:40:41 +01:00
Arben Çokaj
07d31ef877 Translated using Weblate (Albanian) 
Currently translated at 25.2% (754 of 2982 strings)

[CI skip]
 2015-01-06 23:20:32 +01:00
Marc Delisle
5091f04058 Merge branch 'QA_4_3' 2015-01-06 14:18:45 -05:00
Marc Delisle
60d2e544f1 Merge commit '9cbd722' 2015-01-06 14:18:37 -05:00
Marc Delisle
235d5f47f8 bug #4689 Setup tool creates "pma__favorites" incorrectly 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-06 14:17:12 -05:00
Marc Delisle
1bb664ada8 This directive should not be inside the server-specific section 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-06 13:45:21 -05:00
Marc Delisle
db4ba3e138 Translated using Weblate (English (United Kingdom)) 
Currently translated at 90.6% (2712 of 2993 strings)

[CI skip]
 2015-01-06 18:52:25 +01:00
Madhura Jayaratne
354ac7975a 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-06 16:49:51 +05:30
Madhura Jayaratne
41f0dc4aa6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-06 15:35:03 +05:30
Madhura Jayaratne
80121c47c9 Merge branch 'QA_4_3' 2015-01-06 15:32:56 +05:30
Weblate
e8580793fc Merge remote-tracking branch 'origin/master' 2015-01-06 11:02:40 +01:00
Παναγιώτης Παπάζογλου
79b54d2478 Translated using Weblate (Greek) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2015-01-06 11:02:36 +01:00
Weblate
9cbd722fd5 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-06 11:01:54 +01:00
Παναγιώτης Παπάζογλου
3a7c230789 Translated using Weblate (Greek) 
Currently translated at 99.9% (2980 of 2981 strings)

[CI skip]
 2015-01-06 11:01:51 +01:00
Madhura Jayaratne
9829c7662a bug #4686 Select elements flicker and selects something else 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 15:31:31 +05:30
Madhura Jayaratne
fac655454f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-06 14:47:51 +05:30
Madhura Jayaratne
e0baf5fb5f Access only the elements in the array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 14:46:41 +05:30
Weblate
fe77111053 Merge remote-tracking branch 'origin/master' 2015-01-06 10:00:20 +01:00
Martin Lacina
c36d347b9d Translated using Weblate (Slovak) 
Currently translated at 76.4% (2287 of 2990 strings)

[CI skip]
 2015-01-06 10:00:17 +01:00
Madhura Jayaratne
b9b42270a5 Merge branch 'QA_4_3' 2015-01-06 14:29:44 +05:30