gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,257 Commits 12 Branches 481 Tags 2.4 GiB
971db6ef8b
Commit Graph

88257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
971db6ef8b Merge commit 'd31e966' 2013-12-08 06:26:28 -05:00
Marc Delisle
d31e966a43 4.1.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 06:25:11 -05:00
Hugues Peccatte
2274453717 Minor PHPDoc modifications. 2013-12-07 19:00:53 +01:00
Marc Delisle
baa5709fbe Merge commit 'd67204c' 2013-12-07 07:38:22 -05:00
Marc Delisle
89c832ee45 Merge commit 'dd3fef8' 2013-12-07 07:38:04 -05:00
Marc Delisle
d67204c664 4.1.0-rc3 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-07 07:36:38 -05:00
Atul Pratap Singh
dd3fef83e2 Merge pull request #778 from omerjerk/QA_4_1 
bugfix in error_report.js
 2013-12-06 22:13:03 -08:00
Umair Khan
ef9cfa2474 Fixing the if condition in get_report_data 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
 2013-12-07 08:51:44 +05:30
Burak Yavuz
012d5a642a Translated using Weblate (Turkish) 
Currently translated at 100.0% (2745 of 2745)
 2013-12-06 17:47:39 +01:00
Michal Čihař
36512505a0 Merge remote-tracking branch 'origin/QA_4_1' 2013-12-06 15:49:44 +01:00
Michal Čihař
c69638bb87 Need to base check on QA_4_1 branch here 2013-12-06 15:47:21 +01:00
Domen
57b3511e2a Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2745 of 2745)
 2013-12-06 15:36:41 +01:00
Matías Bellone
7108ccba3a Translated using Weblate (Spanish) 
Currently translated at 100.0% (2745 of 2745)
 2013-12-06 14:15:34 +01:00
Marc Delisle
bb9d07e0b8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 08:06:37 -05:00
Marc Delisle
ff2af32980 Translated using Weblate (French) 
Currently translated at 100.0% (2745 of 2745)
 2013-12-06 14:01:38 +01:00
Michal Čihař
176007d75a Translated using Weblate (Czech) 
Currently translated at 100.0% (2745 of 2745)
 2013-12-06 13:25:06 +01:00
Marc Delisle
4e3158547a Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-12-06 07:22:52 -05:00
Dieter Adriaenssens
43a153c095 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2745 of 2745)
 2013-12-06 13:22:57 +01:00
Marc Delisle
a329137fbd Fix tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 07:22:47 -05:00
Kristjan Räts
2c5822c16a Translated using Weblate (Estonian) 
Currently translated at 100.0% (2745 of 2745)
 2013-12-06 13:04:16 +01:00
Panagiotis Papazoglou
df53ad0f55 Translated using Weblate (Greek) 
Currently translated at 100.0% (2745 of 2745)
 2013-12-06 12:52:59 +01:00
Marc Delisle
4f612de31d Remove unneeded transformation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 06:31:47 -05:00
Marc Delisle
dd03c5337a ChangeLog entry for rfe 1474 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 06:24:19 -05:00
Marc Delisle
258cf23731 Update po files 2013-12-06 06:23:25 -05:00
Marc Delisle
17a2ed78e0 Fix test for new transformation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 06:22:22 -05:00
Rob Lewis
ab22ae90e9 rfe #1474 Text transformation combines Append and Prepend 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 06:13:06 -05:00
Marc Delisle
63b1af983f Make the choices similar to other directives 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-05 13:27:54 -05:00
Marc Delisle
d838766b96 Merge pull request #777 from Chanaka/feature-1455 
Feature 1455 - Display image,text or both in table row actions area
 2013-12-05 10:15:33 -08:00
Chanaka Indrajith
ac84ccf35f Merge remote branch 'upstream/master' into feature-1455 2013-12-05 23:33:42 +05:30
Chanaka Indrajith
30522c8d5f Rename the global variable from row_action_type to RowActionType 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-05 23:31:50 +05:30
Michal Čihař
5a490a2314 Merge remote-tracking branch 'origin/QA_4_1' 2013-12-05 14:21:44 +01:00
Michal Čihař
b1c18ca406 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-12-05 14:21:25 +01:00
Weblate
31c0a0b66f Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-12-05 13:58:21 +01:00
Alfred Woo
8a398b8f00 Translated using Weblate (Korean) 
Currently translated at 71.1% (1950 of 2742)
 2013-12-05 13:58:17 +01:00
Michal Čihař
53dda51682 Merge branch 'QA_4_1' 2013-12-05 13:52:14 +01:00
Michal Čihař
b72d7f34b1 Merge commit '7109d49bfa6f1c1c10c1667d39bd1cdc5e980b3d' 2013-12-05 13:52:03 +01:00
Michal Čihař
27b7c57965 Merge commit 'a21a18cf562925e256aa780024bc3674001ffcd3' 2013-12-05 13:51:45 +01:00
Michal Čihař
aa92009230 Better way to discover new commits 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2013-12-05 13:51:12 +01:00
Michal Čihař
0c02835f8b Check Signed-off-by in pull requests 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2013-12-05 13:51:09 +01:00
Michal Čihař
75983f3ced Add script to check Signed-off-by header in patches 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2013-12-05 13:50:47 +01:00
Weblate
808faff63c Merge remote-tracking branch 'origin/master' 2013-12-05 13:50:43 +01:00
Alfred Woo
8f73e8d26b Translated using Weblate (Korean) 
Currently translated at 71.0% (1950 of 2744)
 2013-12-05 13:50:38 +01:00
Madhura Jayaratne
cb50080bee Merge branch 'QA_4_1' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-05 18:19:34 +05:30
Umair Khan
e56d10c2c7 bugfix in error_report.js 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
 2013-12-05 18:15:08 +05:30
Atul Pratap Singh
3410f229e1 Merge pull request #773 from madhuracj/QA_4_1 
Scroll to view only when the item is not in view
 2013-12-05 03:30:07 -08:00
Marc Delisle
6432f1e753 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-05 06:16:55 -05:00
Dieter Adriaenssens
85066fee74 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2744 of 2744)
 2013-12-05 10:24:04 +01:00
Madhura Jayaratne
15e79c94f2 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-12-05 07:44:43 +05:30
Madhura Jayaratne
fdb7655cf1 Follow consistent coding style on opening curly braces for JS functions 2013-12-05 07:26:54 +05:30
Madhura Jayaratne
9b40496c0b Force scroll to top for databases 2013-12-05 07:08:17 +05:30