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

88464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
d68b901132 Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 23:19:26 +01:00
Hugues Peccatte
f8b9f66a5e Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 23:09:43 +01:00
Hugues Peccatte
a1091bee51 Merge pull request #799 from Tithugues/nestedLevels 
Nested levels
 2013-12-21 13:36:22 -08:00
Hugues Peccatte
6104e9557e Fix wrong refactoring. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 22:10:06 +01:00
Marc Delisle
b4285eb7ca Merge branch 'QA_4_1' 2013-12-21 11:57:45 -05:00
Marc Delisle
048d032d35 Merge commit '054614f' 2013-12-21 11:57:34 -05:00
Marc Delisle
5360a84a55 bug #2961 Relations settings not updated on config change 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-21 11:56:33 -05:00
Weblate
054614ff2b Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-12-21 16:26:06 +01:00
Marc Delisle
9a5c81b5ca Merge branch 'QA_4_1' 2013-12-21 10:25:03 -05:00
Marc Delisle
0d7eeadba7 Revert "bug #2961 Relations settings not updated on config change" 
This reverts commit 1cc3e27308.
 2013-12-21 10:23:54 -05:00
Weblate
11ec79aedf Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-12-21 16:13:59 +01:00
Domen
941aba2308 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2749 of 2749)
 2013-12-21 16:12:50 +01:00
Tony Nascimento
4e56bde3bd Translated using Weblate (Portuguese) 
Currently translated at 55.2% (1519 of 2749)
 2013-12-21 16:12:49 +01:00
Kristjan Räts
0b616a76df Translated using Weblate (Estonian) 
Currently translated at 100.0% (2749 of 2749)
 2013-12-21 16:11:20 +01:00
Marc Delisle
fa73a324ee Merge branch 'QA_4_1' 2013-12-21 10:10:49 -05:00
Marc Delisle
5f4dfa5035 Merge commit '320705a' 2013-12-21 10:10:41 -05:00
Marc Delisle
1cc3e27308 bug #2961 Relations settings not updated on config change 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-21 10:09:55 -05:00
Marc Delisle
daedc76dc6 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-21 07:42:53 -05:00
Hugues Peccatte
efd206f1dc Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 00:06:04 +01:00
Hugues Peccatte
c5839569f8 Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:35:54 +01:00
Hugues Peccatte
d428db6641 Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:35:53 +01:00
Hugues Peccatte
37f90df60d Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:34:52 +01:00
Hugues Peccatte
f7f5b48e40 Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:34:51 +01:00
Weblate
b6ef52029d Merge remote-tracking branch 'origin/master' 2013-12-20 23:21:59 +01:00
Tony Nascimento
c64311e8d4 Translated using Weblate (Portuguese) 
Currently translated at 55.1% (1517 of 2751)
 2013-12-20 23:21:04 +01:00
Hugues Peccatte
b6855fa70f Merge branch 'phpdoc' 2013-12-20 23:18:21 +01:00
Hugues Peccatte
f82579055b Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:11:03 +01:00
Domen
bc081c62bb Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-20 22:54:43 +01:00
Kristjan Räts
e0718fce72 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-20 20:40:28 +01:00
Chanaka Indrajith
1441e8864b Revert the commit 7c971c0 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-20 22:47:20 +05:30
Weblate
320705ae7b Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-12-20 12:28:35 +01:00
Marc Delisle
220a67f6c3 Merge branch 'QA_4_1' 2013-12-20 06:27:35 -05:00
Marc Delisle
609f72600d Merge commit '00b4801' 2013-12-20 06:27:22 -05:00
Burak Yavuz
1bdb6a3524 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2749 of 2749)
 2013-12-20 12:26:46 +01:00
Marc Delisle
33f8aa43ff Revert overflow scroll for original theme; add ChangeLog entry for fix of bug #4170 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-20 06:26:43 -05:00
Matías Bellone
d838baeee3 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2749 of 2749)
 2013-12-20 12:25:28 +01:00
Marc Delisle
d08768bbb0 Translated using Weblate (French) 
Currently translated at 100.0% (2749 of 2749)
 2013-12-20 12:24:13 +01:00
Michal Čihař
04126fec24 Translated using Weblate (Czech) 
Currently translated at 100.0% (2749 of 2749)
 2013-12-20 12:23:32 +01:00
Marc Delisle
bad4e440ec Merge pull request #798 from zixtor/QA_4_1 
Revert 4096 and fix nav resize
 2013-12-20 03:23:07 -08:00
Matías Bellone
9242825170 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-19 21:21:01 +01:00
Atul Pratap Singh
4c1951a06e fix navigation resizing with window scroll 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-20 00:24:10 +05:30
Atul Pratap Singh
286d94d424 Revert previous fix for bug#4096 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-20 00:10:15 +05:30
Marc Delisle
5c59ec266a Translated using Weblate (French) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-19 18:26:11 +01:00
Burak Yavuz
69b405f6e5 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-19 18:19:02 +01:00
Dieter Adriaenssens
ec916fa1d5 Translated using Weblate (Dutch) 
Currently translated at 99.9% (2751 of 2751)
 2013-12-19 16:38:22 +01:00
Michal Čihař
2d76b3d958 Translated using Weblate (Czech) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-19 16:12:13 +01:00
Dieter Adriaenssens
00b48015d6 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2749 of 2749)
 2013-12-19 16:09:41 +01:00
Madhura Jayaratne
726e7045f6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-12-19 20:39:25 +05:30
Madhura Jayaratne
158b9ce687 Specify the type of the array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-19 20:34:55 +05:30
Madhura Jayaratne
cfcfbded37 Specify visibility 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-19 20:25:53 +05:30