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

97046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Madhura Jayaratne
6f771f20bb Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-01-06 14:28:08 +05:30
Madhura Jayaratne
ba4dd00f88 bug #4687 Designer breaks without configuration storage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 14:26:54 +05:30
Weblate
62763a4b88 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-06 08:59:06 +01:00
Martin Lacina
d682ca8c36 Translated using Weblate (Slovak) 
Currently translated at 76.5% (2280 of 2979 strings)

[CI skip]
 2015-01-06 08:59:04 +01:00
Madhura Jayaratne
a65e7fb0fc Undefined index notices while configuring recent and favorite tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 13:14:46 +05:30
Marc Delisle
5f815f4844 4.3.5 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:16:52 -05:00
Marc Delisle
968e723693 Merge commit '7562aad' 2015-01-05 10:16:00 -05:00
Marc Delisle
7562aadc40 4.3.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:15:22 -05:00
Marc Delisle
0f3e58bf2e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:08:05 -05:00
Marc Delisle
c6bf4d61bc Clarifications 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:04:09 -05:00
Isaac Bennetch
7e3309fc2a User documentation for Zero Configuration 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:00:37 -05:00
Marc Delisle
495250f8cb Merge branch 'QA_4_3' 2015-01-04 15:34:42 -05:00
Marc Delisle
d18c1e25f5 Merge commit '3777e0a' 2015-01-04 15:34:36 -05:00
Marc Delisle
89de2f6227 Merge commit 'cf4d945' 2015-01-04 15:34:24 -05:00
Marc Delisle
440afe2423 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-04 15:33:45 -05:00
Weblate
3777e0a198 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-04 21:32:48 +01:00
Ann + J.M
760c61d78c Translated using Weblate (German) 
Currently translated at 100.0% (2979 of 2979 strings)

[CI skip]
 2015-01-04 21:32:45 +01:00
Marc Delisle
63bf881f26 Merge pull request #1447 from Tithugues/b4416_qa43 
Fix #4416 New lines are removed when grid editing
 2015-01-04 15:32:41 -05:00
Hugues Peccatte
763707a72e Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-04 15:19:09 +01:00
Ann + J.M
db0327cd59 Translated using Weblate (German) 
Currently translated at 100.0% (2992 of 2992 strings)

[CI skip]
 2015-01-04 15:11:11 +01:00
Marc Delisle
56baec6160 Merge branch 'QA_4_3' 2015-01-04 07:35:26 -05:00
Marc Delisle
459f1a6c16 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-04 07:34:46 -05:00