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

88292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
fb8ddb4a99 Fix PHPCS errors/warning from jenkins. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-10 21:57:16 +01:00
Marc Delisle
b8f54080ab Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-10 06:13:43 -05:00
Marc Delisle
92b8aad23e Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-10 06:07:16 -05:00
Madhura Jayaratne
c9880da2ae Remove unused variables 2013-12-10 07:01:09 +05:30
Dieter Adriaenssens
737fd45858 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2744 of 2744)
 2013-12-09 16:05:35 +01:00
Marc Delisle
db6ae82c8e Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-09 07:38:11 -05:00
Kristjan Räts
ab89e97d55 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2744 of 2744)
 2013-12-09 10:57:54 +01:00
Michal Čihař
83c988026f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-12-09 09:05:59 +01:00
Michal Čihař
c02cfc71b2 Translated using Weblate (Czech) 
Currently translated at 100.0% (2744 of 2744)
 2013-12-09 08:46:05 +01:00
Michal Čihař
47ac042879 Merge branch 'QA_4_1' 
Conflicts:
	.travis.yml
 2013-12-09 08:39:40 +01:00
Michal Čihař
4cbf408ed2 Use $TRAVIS_BRANCH instead of hardcoding it 2013-12-09 08:39:22 +01:00
Panagiotis Papazoglou
96c9d9f7e7 Translated using Weblate (Greek) 
Currently translated at 100.0% (2744 of 2744)
 2013-12-09 08:38:55 +01:00
Hugues Peccatte
32a6150272 Fix PHPCS new errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-09 08:09:42 +01:00
Burak Yavuz
53fa45af35 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2744 of 2744)
 2013-12-09 07:10:13 +01:00
Marc Delisle
0986cfe538 Translated using Weblate (French) 
Currently translated at 100.0% (2744 of 2744)
 2013-12-09 01:42:42 +01:00
Marc Delisle
48db6c7064 Merge branch 'QA_4_1' 2013-12-08 19:27:43 -05:00
Marc Delisle
f488cbbb86 Remove test no longer correct 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 19:27:06 -05:00
Marc Delisle
459f2d8ae6 Update po files 2013-12-08 19:16:18 -05:00
Marc Delisle
105f7c83ad Explanation for the link (new message for development version only) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 19:15:26 -05:00
Marc Delisle
1962110d0d Merge branch 'QA_4_1' 2013-12-08 19:12:30 -05:00
Marc Delisle
709396337b bug #4173 Transformations overview not reachable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 19:11:21 -05:00
Hugues Peccatte
24aa994981 Merge pull request #781 from Tithugues/phpcs 
Rewrite to decrease number of nested levels.
 2013-12-08 06:38:15 -08:00
Marc Delisle
9a2b3b5608 Merge branch 'QA_4_1' 2013-12-08 09:29:28 -05:00
Marc Delisle
6720751744 Fix undefined variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 09:28:58 -05:00
Marc Delisle
b1fb71c120 Improve function name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 09:05:36 -05:00
Marc Delisle
6003743557 Improve function name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 09:00:18 -05:00
Hugues Peccatte
684de8bd18 Merge pull request #780 from Tithugues/ut 
Unit tests
 2013-12-08 04:56:55 -08:00
Marc Delisle
bb24ebc82b Merge branch 'QA_4_1' 2013-12-08 06:42:16 -05:00
Marc Delisle
6dccaa3b5b ChangeLog entry for fix of bug #4154 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 06:41:39 -05:00
lakshit
274943c0c5 Fixed bug 4154 
Signed-off-by: lakshit <lakshitarora26@gmail.com>
 2013-12-08 06:38:20 -05:00
Marc Delisle
8d1be739b0 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 06:27:25 -05:00
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
b76f616079 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-08 11:16:07 +01:00
Hugues Peccatte
008b1fa8d3 Rewrite to decrease number of nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-07 22:16:16 +01:00
Hugues Peccatte
bbf08d3a13 Add new unit tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-07 21:39:22 +01:00
Hugues Peccatte
226ae34061 New unit tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-07 20:01:49 +01: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