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

105421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
d799a9a997 Merge branch 'QA_4_6' 2016-02-26 13:28:43 +11:00
Andre Evertz
f825abc8a7 Fix for wrong mysql_upgrade message on Users tab with Percona Server >= 5.7 
Signed-off-by: Andre Evertz <andre.evertz@devil-coding.de>
 2016-02-26 13:26:35 +11:00
Weblate
78be1555c0 Merge remote-tracking branch 'origin/master' 2016-02-26 03:21:47 +01:00
Ray Santos
7adf86472e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.8% (2953 of 3214 strings)

[CI skip]
 2016-02-26 03:21:46 +01:00
Madhura Jayaratne
4fb120f78d Merge pull request #12036 from KeldorDE/percona_server 
Fix for wrong mysql_upgrade message on Users tab with Percona Server 5.7
 2016-02-26 13:21:40 +11:00
Andre Evertz
10e9a91c12 Fix for wrong mysql_upgrade message on Users tab with Percona Server >= 5.7 
Signed-off-by: Andre Evertz <andre.evertz@devil-coding.de>
 2016-02-25 23:35:11 +01:00
Michal Čihař
1d99372688 Add extension dependencies to composer.json 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 14:16:19 +01:00
Michal Čihař
0d3cac9e04 Merge branch 'QA_4_6' 2016-02-25 12:31:13 +01:00
Michal Čihař
33f0b947db Merge branch 'QA_4_5' into QA_4_6 2016-02-25 12:30:42 +01:00
Michal Čihař
1297747a65 Fixed incorrect usage of SQL parser context in SQL export 
Fixes #12029

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:29:34 +01:00
Michal Čihař
57607e062b Add changelog for SQL parser update 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:28:24 +01:00
Michal Čihař
5fb33a7af4 Merge commit '2b1a68cc4eb935ef3df5c7401d0d1338df09bc72' into MAINT_4_5_5 2016-02-25 12:25:07 +01:00
Michal Čihař
9702259f81 Merge remote-tracking branch 'security/MAINT_4_5_4-security' into MAINT_4_5_5 2016-02-25 08:55:45 +01:00
Michal Čihař
67c5514e65 Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security 2016-02-25 08:53:52 +01:00
Atul Pratap Singh
ec38e05267 Merge pull request #12003 from ujjwalwahi/issue_11991 
Refactor TableSearchController
 2016-02-25 04:38:25 +05:30
Atul Pratap Singh
0370f382c2 Merge pull request #12008 from 007durgesh219/Issue#12004 
Templating getWithSelected() and getCheckbox(), Issue #12004
 2016-02-25 04:21:24 +05:30
Dan Ungureanu
70e326deb9 Added changelog entries. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-24 20:56:33 +02:00
Dan Ungureanu
90605cc9a8 Merge branch 'QA_4_5' into QA_4_6 2016-02-24 20:48:14 +02:00
Dan Ungureanu
2b1a68cc4e Updates sql-parser to phpmyadmin/sql-parser@5c489d91f5 (v3.4.0). 
Fixes #11971. CREATE UNIQUE INDEX index type is not recognized by parser.
Fixes #11982. Row count wrong when grouping joined tables.
Fixes #12012. Column definition with default value and comment in CREATE TABLE expoerted faulty.
Fixes #12020. New statement but no delimiter and unexpected token with REPLACE.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-24 20:41:54 +02:00
Michal Čihař
132dcfc1de Merge branch 'QA_4_6' 2016-02-24 14:46:40 +01:00
Michal Čihař
0f525e3ae4 Document how we ship embedded PHP libraries now. 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 14:46:06 +01:00
Michal Čihař
f2e034451a Remove exclusion of php-gettext from test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 14:44:17 +01:00
Michal Čihař
4103e0c6ae Do not generate coverage for tests 
It is broken due to way how phpunit works - it doesn't count as covered
data providers.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 14:42:26 +01:00
Weblate
968edb64bd Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-24 14:41:34 +01:00
Yury Vidal
18de5389b9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.1% (2960 of 3211 strings)

[CI skip]
 2016-02-24 14:41:33 +01:00
Michal Čihař
f79d7238b8 Merge branch 'QA_4_6' 2016-02-24 14:41:09 +01:00
Michal Čihař
a6e3c6e020 Merge commit '4450a44d54d2be5b4bf082c19223ddd4f788ed2b' 2016-02-24 14:40:35 +01:00
Michal Čihař
d96bc13f76 Strip motranslator tests from release tarball 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 14:39:52 +01:00
Michal Čihař
7ca6299093 Merge branch 'QA_4_5' into QA_4_6 2016-02-24 14:39:39 +01:00
Weblate
a0845e92fc Merge remote-tracking branch 'origin/master' 2016-02-24 14:36:01 +01:00
Yury Vidal
c82baa09a7 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.8% (2951 of 3214 strings)

[CI skip]
 2016-02-24 14:36:00 +01:00
Michal Čihař
09d3286895 Merge pull request #12023 from nijel/motranslator 
Replace embedded php-gettext library with motranslator
 2016-02-24 14:35:52 +01:00
Michal Čihař
676514a7e8 Remove code not needed with motranslator 
- the charset is always UTF-8
- the gettext constants do not have to be defined

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 13:02:55 +01:00
Michal Čihař
912bf964c7 Replace embedded php-gettext library with motranslator 
Fixes #12018

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 11:49:43 +01:00
Durgesh
307f7069e5 Templating getWithSelected() and getCheckbox(), Issue #12004 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-23 18:10:24 +05:30
Madhura Jayaratne
bdfbddf771 collation_connection is also not centrally set up in bootstrap 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 23:09:31 +11:00
Madhura Jayaratne
891d724772 $GLOBALS['server'] is not centrally set in bootstrap 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 23:06:56 +11:00
Madhura Jayaratne
ada984c84d You should reset the GLOBALS you are unsetting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 23:03:52 +11:00
Madhura Jayaratne
5a8db3e65f Fix duplicate method name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:57:27 +11:00
Madhura Jayaratne
47b5b07b13 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:46:32 +11:00
Madhura Jayaratne
81821574b1 Merge test files since they both test the same class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:45:28 +11:00
Madhura Jayaratne
6c2ade29d9 This doc block is for the method and not for the use 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:41:10 +11:00
Madhura Jayaratne
abfce82447 Fix test file names and test class names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:39:15 +11:00
Madhura Jayaratne
b2e990a067 Fix class doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:35:02 +11:00
Madhura Jayaratne
2a5f6acbee Class curly braces should be on the next line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:34:32 +11:00
Madhura Jayaratne
340861150a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-23 22:33:31 +11:00
Madhura Jayaratne
c7063d2517 Add class doc blocks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:32:05 +11:00
Weblate
91fa913fdc Merge remote-tracking branch 'origin/master' 2016-02-23 10:00:37 +01:00
Domen
e2998b742f Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-02-23 10:00:36 +01:00
Madhura Jayaratne
f0bbe702ba Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-23 20:00:24 +11:00