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

88310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
864ea3cc65 Update po files 2013-12-11 20:49:08 -05:00
Marc Delisle
c95e50083d Merge commit '73c6d64' 2013-12-11 20:47:25 -05:00
Marc Delisle
6731dcd198 Merge commit 'c8ac434' 2013-12-11 20:46:09 -05:00
Weblate
73c6d64d9d Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-12-12 02:45:07 +01:00
Raul Malea
7370133b86 Translated using Weblate (Romanian) 
Currently translated at 57.3% (1572 of 2742)
 2013-12-12 02:45:00 +01:00
Weblate
3300826dc8 Merge remote-tracking branch 'origin/master' 2013-12-12 02:44:50 +01:00
Raul Malea
e2dd8af78c Translated using Weblate (Romanian) 
Currently translated at 57.2% (1571 of 2744)
 2013-12-12 02:44:45 +01:00
Madhura Jayaratne
4a8e3ce39a Fix docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-12 07:14:10 +05:30
Marc Delisle
c8ac434931 Fix undefined variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-11 20:43:46 -05:00
Marc Delisle
32234fb68e ChangeLog entry for fix of bug #4149 2013-12-11 20:37:09 -05:00
Gemorroj
0232003ad2 accept license 
Signed-off-by: Gemorroj <wapinet@gmail.com>
 2013-12-11 20:32:36 -05:00
Gemorroj
b5210ba142 fix #4149 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-11 20:31:47 -05:00
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 22:13:10 +01:00
Hugues Peccatte
d27076392c Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 20:44:12 +01:00
Hugues Peccatte
9763791380 Fix new PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 19:02:05 +01:00
Hugues Peccatte
a5e6e37546 Merge pull request #782 from Tithugues/fixPHPCS_jenkins 
Fix PHPCS errors/warnings from Jenkins.
 2013-12-11 09:45:37 -08:00
Marc Delisle
bf35e2cd0f Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-11 06:23:22 -05:00
Hugues Peccatte
20ab7112bb Fix PHPCS errors/warnings from Jenkins. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-10 21:57:17 +01:00
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