gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,986 Commits 12 Branches 481 Tags 2.4 GiB
321d3eee91
Commit Graph

94986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Smita Kumari
3b479f52f9 fix unit test 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-28 22:48:35 +05:30
Marc Delisle
10c075239c Translated using Weblate (French) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-28 18:42:24 +02:00
Weblate
f0867e9c4b Merge remote-tracking branch 'origin/master' 2014-08-28 18:37:31 +02:00
Alex Smirnov
654d9ebee5 Translated using Weblate (Russian) 
Currently translated at 99.7% (2956 of 2964)

[ci skip]
 2014-08-28 18:37:28 +02:00
Giovanni Sora
d50c7f04b8 Translated using Weblate (Interlingua) 
Currently translated at 61.4% (1821 of 2964)

[ci skip]
 2014-08-28 18:37:25 +02:00
Marc Delisle
7beeab615d Merge commit '5c11862' 2014-08-28 12:37:08 -04:00
Marc Delisle
31c1f6e70f Merge commit 'fed4664' 2014-08-28 12:36:53 -04:00
Weblate
5c118629c0 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-28 18:35:49 +02:00
Alex Smirnov
ed284bd574 Translated using Weblate (Russian) 
Currently translated at 99.8% (2765 of 2768)

[ci skip]
 2014-08-28 18:35:45 +02:00
Marc Delisle
14d9437c04 Merge pull request #1345 from smita786/QA_4_2 
update bug fix #4487
 2014-08-28 12:35:34 -04:00
Smita Kumari
fed466498e update bug fix #4487 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-28 21:12:04 +05:30
Kristjan Räts
ab9d130a43 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-28 09:44:34 +02:00
Matías Bellone
6fa68700f3 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-28 06:15:48 +02:00
Domen
9795cccb2b Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-27 22:57:01 +02:00
Panagiotis Papazoglou
93d6508dd5 Translated using Weblate (Greek) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-27 20:24:25 +02:00
Weblate
5bf1af58a0 Merge remote-tracking branch 'origin/master' 2014-08-27 18:56:37 +02:00