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

94961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
208adc20ee Merge commit '5f2adcb' 2014-08-29 12:03:40 -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
Helder Santana
d1f3f208f7 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.6% (2777 of 2964)

[ci skip]
 2014-08-27 18:56:34 +02:00
Marc Delisle
ee1cfd3873 Merge commit '3a9e2bb' 2014-08-27 12:56:16 -04:00
Marc Delisle
564f50f399 Merge commit 'd789ee4' 2014-08-27 12:56:07 -04:00
Marc Delisle
8e9f1bec21 Merge commit '83e90ae' 2014-08-27 12:55:07 -04:00
Marc Delisle
e3868a9838 Merge commit '58e4568' 2014-08-27 12:54:55 -04:00
Marc Delisle
3a9e2bbf65 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-27 12:54:26 -04:00
Weblate
d789ee4bbe Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-27 18:52:24 +02:00
Chien Wei Lin
9776abce46 Translated using Weblate (Traditional Chinese) 
Currently translated at 99.8% (2765 of 2768)

[ci skip]
 2014-08-27 18:52:21 +02:00
Marc Delisle
ebf07e8131 Merge pull request #1344 from smita786/QA_4_2 
fix bug #4487
 2014-08-27 12:52:14 -04:00
Smita Kumari
83e90ae1a0 bug fix #4487 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-27 19:12:27 +05:30
Burak Yavuz
d0e0ed0478 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-27 14:55:22 +02:00
Marc Delisle
7621852654 Update po files 2014-08-27 08:27:42 -04:00
Marc Delisle
98c9604b9c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-08-27 08:27:11 -04:00
Marc Delisle
8c89232f1d Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-27 08:26:59 -04:00
Marc Delisle
0ce81cfcea Improve messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-27 08:23:39 -04:00
Weblate
6a8619e59f Merge remote-tracking branch 'origin/master' 2014-08-27 14:21:44 +02:00
Burak Yavuz
cec61325a3 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2962 of 2962)

[ci skip]
 2014-08-27 14:21:41 +02:00
Chien Wei Lin
4888250b5b Translated using Weblate (Traditional Chinese) 
Currently translated at 98.3% (2913 of 2962)

[ci skip]
 2014-08-27 14:21:39 +02:00
Marc Delisle
f87d02177e Merge pull request #1343 from Chanaka/RFE-1502 
rfe-1502 : Smart sorting for int keys
 2014-08-27 08:21:31 -04:00
Weblate
2fcba195ec Merge remote-tracking branch 'origin/master' 2014-08-26 18:45:09 +02:00
Nabin Ghimire
bd38f699e0 Translated using Weblate (Nepali) 
Currently translated at 1.8% (54 of 2962)

[ci skip]
 2014-08-26 18:45:07 +02:00
Marc Delisle
531dac4784 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-26 12:44:55 -04:00
Chanaka Dharmarathna
7969336d04 rfe-1502 : Smart sorting for int keys 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-08-26 21:44:05 +05:30
Madhura Jayaratne
8d95c4ec4f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-08-26 17:43:53 +05:30
Madhura Jayaratne
03f3ad8144 Hide PDF page related icon in visual builder 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-26 17:43:18 +05:30