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

89354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
c3bcdf2b5d Remove no longer used javascript messages 2014-01-29 13:23:03 +01:00
Michal Čihař
2a83a5d4d3 Make error message a sentence 2014-01-29 13:15:44 +01:00
Weblate
ff7c297357 Merge remote-tracking branch 'origin/master' 2014-01-28 16:12:47 +01:00
paya tada
e492a0a0ea Translated using Weblate (Persian) 
Currently translated at 33.8% (933 of 2754)
 2014-01-28 16:12:43 +01:00
Marc Delisle
fea487ad74 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-28 10:12:30 -05:00
Weblate
6ccdf990b0 Merge remote-tracking branch 'origin/master' 2014-01-28 03:36:45 +01:00
Janis Reinsons
7abc4c8dfb Translated using Weblate (Latvian) 
Currently translated at 24.9% (687 of 2756)
 2014-01-28 03:36:42 +01:00
Madhura Jayaratne
1e5517c470 Merge branch 'QA_4_1' 2014-01-28 08:05:58 +05:30
Madhura Jayaratne
d7c357eefd bug #4250 Notice on export page & bug #4253 "New" text in navigation frame acts like a database 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-28 08:02:49 +05:30
Weblate
5d757e9285 Merge remote-tracking branch 'origin/master' 2014-01-27 18:49:49 +01:00
Dziuba Rene
4f97864d70 Translated using Weblate (German) 
Currently translated at 94.7% (2609 of 2754)
 2014-01-27 18:49:46 +01:00
Marc Delisle
d948ff1ce6 Merge commit '185f16e' 2014-01-27 12:49:22 -05:00
Marc Delisle
ae4a7ad57e Merge commit 'e3cdf91' 2014-01-27 12:49:06 -05:00
Marc Delisle
ce84e3aae3 Merge commit 'de56371' 2014-01-27 12:48:43 -05:00
Marc Delisle
08b19ae088 Merge commit 'c357b1b' 2014-01-27 12:48:31 -05:00
Marc Delisle
2a2d4cd2bb Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-27 12:48:11 -05:00
Marc Delisle
8ba4548146 Merge commit 'e8fa9e5' 2014-01-27 12:45:29 -05:00
Marc Delisle
9c6a5a6e09 Merge commit '24cc797' 2014-01-27 12:45:17 -05:00
Marc Delisle
185f16e36e Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-01-27 12:44:08 -05:00
Marc Delisle
e3cdf91e22 ChangeLog entry for fix of bug #4245 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-27 12:43:56 -05:00
Weblate
de5637139f Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-01-27 18:41:42 +01:00
Dadan Setia
9ec1d29a41 Translated using Weblate (Indonesian) 
Currently translated at 80.0% (2200 of 2749)
 2014-01-27 18:41:39 +01:00
Marc Delisle
c357b1b4aa Merge pull request #878 from sampathLiyanage/bugfix4245 
Bug fix (#4245) - initial "Browse" query does not match sorting order
 2014-01-27 09:41:27 -08:00
Sampath Liyanage
ea0ad9d41c unit tests updated. Some global variables were set in setup functions of some test files. one testing function with mockobjects was changed from once() to exactly(2) because the bug fix has made that function calls twice 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-01-27 21:53:36 +05:30
Sampath Liyanage
e8fa9e5335 bug 4245 fix with minimum changes 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-01-27 21:29:27 +05:30
Weblate
fefb9b815c Merge remote-tracking branch 'origin/master' 2014-01-27 15:17:58 +01:00
Dadan Setia
48d2847281 Translated using Weblate (Indonesian) 
Currently translated at 80.5% (2221 of 2756)
 2014-01-27 15:17:55 +01:00
Dieter Adriaenssens
b37647be20 Translated using Weblate (Dutch) 
Currently translated at 97.6% (2690 of 2755)
 2014-01-27 15:17:52 +01:00
Marc Delisle
964ea23fa0 Unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-27 09:17:36 -05:00
Marc Delisle
2df3184d3a Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-26 09:25:31 -05:00
Weblate
0c30022b5a Merge remote-tracking branch 'origin/master' 2014-01-26 13:09:41 +01:00
Eduardo Abreu
b0c075d32d Translated using Weblate (Portuguese) 
Currently translated at 55.2% (1522 of 2755)
 2014-01-26 13:09:37 +01:00
Yungu Kim
655e4442f0 Translated using Weblate (Korean) 
Currently translated at 68.0% (1877 of 2757)
 2014-01-26 13:09:34 +01:00
Marc Delisle
a1995d6cc4 4.1.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-26 07:08:20 -05:00
Weblate
24cc797e50 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-01-26 13:08:11 +01:00
Eduardo Abreu
ea708974c7 Translated using Weblate (Portuguese) 
Currently translated at 61.0% (1679 of 2749)
 2014-01-26 13:08:08 +01:00
Yungu Kim
8676b5cc56 Translated using Weblate (Korean) 
Currently translated at 72.5% (1995 of 2749)
 2014-01-26 13:08:05 +01:00
Marc Delisle
041ca03f6b Merge commit 'f7aac8f' 2014-01-26 07:07:32 -05:00
Marc Delisle
f7aac8f85c 4.1.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-26 07:06:52 -05:00
Myung Han Yu
0dbf6b4e7f Translated using Weblate (Korean) 
Currently translated at 68.0% (1877 of 2757)
 2014-01-26 10:31:47 +01:00
Gyeongsu Han
f7e9b68fe4 Translated using Weblate (Korean) 
Currently translated at 68.0% (1877 of 2757)
 2014-01-26 10:29:30 +01:00
Yungu Kim
f1a1a3d730 Translated using Weblate (Korean) 
Currently translated at 68.0% (1876 of 2757)
 2014-01-26 10:28:04 +01:00
Marc Delisle
3fd584420a Merge pull request #873 from WhaleWatching/master 
Changes on Navigation
 2014-01-25 07:57:36 -08:00
Edward Chen
560a49de17 Update NavigationTree.class.php 2014-01-25 23:46:12 +08:00
Weblate
236d2f4c88 Merge remote-tracking branch 'origin/master' 2014-01-25 16:34:30 +01:00
Eduardo Abreu
cfe301f7ec Translated using Weblate (Portuguese) 
Currently translated at 53.7% (1482 of 2755)
 2014-01-25 16:34:27 +01:00
Marc Delisle
58c1c9a0f7 Merge branch 'QA_4_1' 2014-01-25 10:34:00 -05:00
Marc Delisle
b3e049675a Merge commit 'ddd26bd' 2014-01-25 10:33:45 -05:00
Atul Pratap Singh
ddd26bd6d4 add changelog entries 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-26 01:44:19 +05:30
Marc Delisle
7113b93fc3 Merge commit '611182e' 2014-01-25 10:33:34 -05:00