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

95002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aputsiaq Niels Janussen
9ee46bef3e Translated using Weblate (Danish) 
Currently translated at 96.8% (2870 of 2964)

[ci skip]
 2014-09-03 19:32:11 +02:00
Weblate
bcdcd9ca6c Merge remote-tracking branch 'origin/master' 2014-09-03 00:21:27 +02:00
Dieter Adriaenssens
f291158069 Translated using Weblate (Dutch) 
Currently translated at 98.6% (2923 of 2964)

[ci skip]
 2014-09-03 00:21:24 +02:00
Marc Delisle
bfd832b2da Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-02 18:21:12 -04:00
Marc Delisle
a19804dc5c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-02 18:18:58 -04:00
Marc Delisle
8a79d8316d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-02 07:50:56 -04:00
Weblate
bd63258d41 Merge remote-tracking branch 'origin/master' 2014-09-02 13:49:48 +02:00
Alex Smirnov
4d7e19839b Translated using Weblate (Russian) 
Currently translated at 99.7% (2956 of 2964)

[ci skip]
 2014-09-02 13:49:44 +02:00
Marc Delisle
f2e6c24370 Merge pull request #1350 from cmyker/master 
Support of MariaDB 10+ multi-master replication functionality See https:...
 2014-09-02 07:49:39 -04:00
cmyker
06e8b65738 Support of MariaDB 10+ multi-master replication functionality See https://mariadb.com/kb/en/mariadb/documentation/replication-cluster-multi-master/replication/multi-source-replication/ 
Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
 2014-09-02 13:52:09 +03:00
Marc Delisle
4faa0d1ebd Merge branch 'QA_4_2' 2014-09-01 11:39:50 -04:00
Marc Delisle
2a34539a48 bug ajax.js responseHandler: cannot read property of null 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-01 11:39:07 -04:00
Marc Delisle
afd2abbe3c Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-01 09:04:33 -04:00
Marc Delisle
3ebd68a315 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 20:22:21 -04:00
Marc Delisle
ecdc5f3dc6 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 17:10:59 -04:00
chanaka
f26f6287db Remove useless code 
Signed-off-by: chanaka <chanaka@oneit.com.au>
 2014-08-31 22:37:47 +05:30
Marc Delisle
321d3eee91 Merge branch 'QA_4_2' 2014-08-31 10:54:56 -04:00
Marc Delisle
d56af4f911 4.2.8 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:54:18 -04:00
Marc Delisle
68c82fcd2e 4.2.9-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:50:23 -04:00
Marc Delisle
0266a6a55c Merge commit 'b0d3056' 2014-08-31 10:49:52 -04:00
Marc Delisle
b0d3056de9 4.2.9-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:49:12 -04:00
Marc Delisle
800dc32e23 Remove useless code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:44:27 -04:00
Marc Delisle
de4f81ea2b Remove problematic translated message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 08:49:47 -04:00
Marc Delisle
b55df3c9b1 Fix Turkish problem in message generation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 08:38:59 -04:00
Marc Delisle
104756e0a5 Merge pull request #1348 from D-storm/travis 
use phpunit 4.1.x for testing (Travis)
 2014-08-31 08:06:08 -04:00
Marc Delisle
91a66bf5ef Remove dead messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 07:51:39 -04:00
Chirayu Chiripal
f7610b37dc install composer packages for hhvm also 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-08-31 15:13:45 +05:30
Chirayu Chiripal
20ab54ac9a use phpunit 4.1.x for testing 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-08-31 14:53:03 +05:30
Hugues Peccatte
4960f208e2 Add PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-30 21:14:30 +02:00
Marc Delisle
6e0189ba74 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-30 07:30:12 -04:00
Marc Delisle
fee447fae8 bug in functions.js: Cannot read property 'replace' of undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-30 07:22:14 -04:00
Marc Delisle
792a8d3244 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-30 07:01:35 -04:00
Marc Delisle
1d5d236de3 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-30 06:59:17 -04:00
Atul Pratap Singh
79363e9c4a Merge branch 'QA_4_2' 2014-08-30 13:35:20 +05:30
Atul Pratap Singh
6648319c62 Changelog entry 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-08-30 13:32:40 +05:30
Marc Delisle
6843e19368 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 14:50:25 -04:00
Marc Delisle
7c74053c15 Remove dead assignments 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 13:04:57 -04:00
Marc Delisle
5a40595010 Merge commit '5cdd9f4' 2014-08-29 12:04:00 -04:00
Marc Delisle
b23c9b9504 Merge commit '54f80bf' 2014-08-29 12:03:52 -04:00
Marc Delisle
208adc20ee Merge commit '5f2adcb' 2014-08-29 12:03:40 -04:00
Marc Delisle
5cdd9f4792 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 12:02:53 -04:00
Marc Delisle
54f80bfd7f Merge pull request #1347 from ashutoshdhundhara/bug_4527 
Bug #4527: Importing ODS files with column names having trailing spaces fails.
 2014-08-29 12:02:07 -04:00
Ashutosh Dhundhara
5f2adcb9ca Bug #4527: Importing ODS files with column names having trailing spaces fails. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-29 20:39:34 +05:30
Marc Delisle
6cd19738cd Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 09:13:41 -04:00
Marc Delisle
d6cf9ebaaa bug in server_privileges.js: cannot read property 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 09:08:02 -04:00
Atul Pratap Singh
92335f8582 Merge branch 'QA_4_2' 2014-08-29 14:26:42 +05:30
Atul Pratap Singh
7e5026cde4 Fix bug#4413 Navigation Error in Nav Tree for Search Results Past the First Page 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-08-29 14:19:38 +05:30
Marc Delisle
9f971f3087 Merge commit '74ae4a2' 2014-08-28 15:43:54 -04:00
Marc Delisle
e3fb12e385 Merge commit '3b479f5' 2014-08-28 15:43:36 -04:00
Marc Delisle
74ae4a2938 Merge pull request #1346 from smita786/QA_4_2 
update unit test needed after fixing bug 4487
 2014-08-28 15:43:05 -04:00