gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,683 Commits 12 Branches 481 Tags 2.4 GiB
4139575bbc
Commit Graph

95683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
4139575bbc Merge remote-tracking branch 'origin/master' 2014-11-02 09:39:41 +01:00
Sevdimali İsa
92137a8c24 Translated using Weblate (Azerbaijani) 
Currently translated at 47.0% (1399 of 2973 strings)

[CI skip]
 2014-11-02 09:39:39 +01:00
Atul Pratap Singh
d4cbccd78b Merge branch 'QA_4_2' 2014-11-02 14:09:09 +05:30
Atul Pratap Singh
270a4d45a8 Merge commit '960efb0' 2014-11-02 14:08:54 +05:30
Atul Pratap Singh
e743305764 Fix bug#4574 Blank/white page when JavaScript disabled 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-11-02 13:57:48 +05:30
Hugues Peccatte
58ed27560c Reverse modification to fix PHPUnit issue. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-01 22:10:51 +01:00
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues. 
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-01 22:07:18 +01:00
Chirayu Chiripal
f7b37d8d72 Added title attr to links in navigation tree items 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-11-01 18:34:34 +05:30
Marc Delisle
2e130e8c36 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-01 08:11:47 -04:00
Hugues Peccatte
7ecbd977e6 Minor code style modifications. 
PHPDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 22:47:40 +01:00
Hugues Peccatte
e1e2669841 Remove old string manipulation test classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 22:27:52 +01:00
Hugues Peccatte
00efcadc33 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-31 21:47:53 +01:00
Hugues Peccatte
1911ece7ed Add multibytes constants. 
Update string tests.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 21:21:12 +01:00
Hugues Peccatte
68554fd920 Remove old manipulation string classes and tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 21:20:30 +01:00
Hugues Peccatte
3bf218519f Remove old manipulation string classes and tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 21:16:59 +01:00
Marc Delisle
bdb8a9abf3 Merge commit '036549a' 2014-10-31 12:31:32 -04:00
Marc Delisle
ef94ba0ee5 4.2.12-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-31 12:30:43 -04:00
Weblate
960efb0b56 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-31 17:29:52 +01:00
Aso Naderi
4bbc49744e Translated using Weblate (Kurdish Sorani) 
Currently translated at 19.1% (531 of 2768 strings)

[CI skip]
 2014-10-31 17:29:50 +01:00
Yugal Pantola
1ce48950d0 Translated using Weblate (Hindi) 
Currently translated at 46.4% (1287 of 2768 strings)

[CI skip]
 2014-10-31 17:29:49 +01:00
Aputsiaq Niels Janussen
414d80c388 Translated using Weblate (Danish) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-31 17:29:47 +01:00
josep constanti
10d2d634c3 Translated using Weblate (Catalan) 
Currently translated at 88.7% (2457 of 2768 strings)

[CI skip]
 2014-10-31 17:29:46 +01:00
Sevdimali İsa
7658f9311a Translated using Weblate (Azerbaijani) 
Currently translated at 47.9% (1326 of 2768 strings)

[CI skip]
 2014-10-31 17:29:45 +01:00
Marc Delisle
036549a8de 4.2.12-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-31 12:29:34 -04:00
Hugues Peccatte
c0b0dc2e35 Add PHPDoc comments in ImportSql.class.php. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 19:54:36 +01:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 18:37:49 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances. 
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 17:40:09 +01:00
Marc Delisle
5007cdbf5e Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-30 13:21:57 -04:00
Weblate
a4c904e3ce Merge remote-tracking branch 'origin/master' 2014-10-30 15:57:48 +01:00
Aso Naderi
bdbfa88089 Translated using Weblate (Kurdish Sorani) 
Currently translated at 17.7% (529 of 2973 strings)

[CI skip]
 2014-10-30 15:57:46 +01:00
Yugal Pantola
9991c3c499 Translated using Weblate (Hindi) 
Currently translated at 42.4% (1263 of 2973 strings)

[CI skip]
 2014-10-30 15:57:45 +01:00
Sevdimali İsa
7aeae208a3 Translated using Weblate (Azerbaijani) 
Currently translated at 46.8% (1394 of 2973 strings)

[CI skip]
 2014-10-30 15:57:43 +01:00
Marc Delisle
0a37b28e0a Fix undefined offset notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-30 10:57:33 -04:00
Weblate
bdc452637c Merge remote-tracking branch 'origin/master' 2014-10-29 17:43:23 +01:00
Aso Naderi
eda8a2c3ca Translated using Weblate (Kurdish Sorani) 
Currently translated at 17.3% (515 of 2973 strings)

[CI skip]
 2014-10-29 17:43:21 +01:00
Aputsiaq Niels Janussen
cd4f3443f4 Translated using Weblate (Danish) 
Currently translated at 96.9% (2883 of 2973 strings)

[CI skip]
 2014-10-29 17:43:19 +01:00
josep constanti
62171cb983 Translated using Weblate (Catalan) 
Currently translated at 83.9% (2495 of 2973 strings)

[CI skip]
 2014-10-29 17:43:18 +01:00
Marc Delisle
b17ff5be2c Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-29 12:43:07 -04:00
Hugues Peccatte
3b3017d7ae Manage SQL display. 
Rename attributes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-28 22:13:28 +01:00
Hugues Peccatte
3301bc3c8e Display delimiter into SQL trace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-28 21:48:51 +01:00
Marc Delisle
027f18c928 Merge commit '103ac4a' 2014-10-28 15:54:21 -04:00
Marc Delisle
62d04772ed Merge commit '2b4ed22' 2014-10-28 15:53:38 -04:00
Marc Delisle
83789ce982 Merge commit '347d345' 2014-10-28 15:53:25 -04:00
Weblate
103ac4ac14 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-28 20:51:23 +01:00
Dadan Setia
0b7559aaf5 Translated using Weblate (Indonesian) 
Currently translated at 79.8% (2210 of 2768 strings)

[CI skip]
 2014-10-28 20:51:22 +01:00
Marc Delisle
2b4ed22505 bug #4572 missing trailing slash (import and open_basedir) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-28 15:51:10 -04:00
Hugues Peccatte
e85b43b8b2 Remove unused variable. 
Rename parameter.
Update PHPDoc.
Fix data parsing.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-28 20:39:56 +01:00
Marc Delisle
90ee48f0ba Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
RFE 1550: PMA_URL_getCommon(): new style
 2014-10-28 08:14:45 -04:00
Ann + J.M
ddbcb5165a Fix unit tests 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-28 11:37:17 +01:00
Marc Delisle
5d62fcbf78 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-27 15:01:29 -04:00