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

103696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
a4cc36937d Merge pull request #11663 from madhuracj/issue11647 
Fix #11647 Restrict configuration NavigationTreeDbSeparator to strings
 2015-11-12 10:45:22 -05:00
Marc Delisle
a098615fdb Add a link to document internal relations 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-12 10:41:35 -05:00
Michal Čihař
a597bd2550 Remove sourceforge.net downloads badge 
Fixes #11625

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-11-12 14:28:55 +01:00
Deven Bansod
c62672edd0 Merge branch 'QA_4_5' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	po/cs.po
	po/fi.po
	po/it.po
	po/nb.po
	po/nl.po
	po/sv.po
 2015-11-12 23:49:31 +05:30
Deven Bansod
b49169c895 ChangeLog entry for issue #11661 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-12 23:16:00 +05:30
Madhura Jayaratne
2502a4ee29 Fix #11647 Restrict configuration NavigationTreeDbSeparator to strings 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-12 23:03:34 +11:00
Weblate
af057c41f1 Merge remote-tracking branch 'origin/master' 2015-11-12 12:36:10 +01:00
Michal Čihař
b319ae5316 Translated using Weblate (Swedish) 
Currently translated at 98.5% (3181 of 3228 strings)

[CI skip]
 2015-11-12 12:36:09 +01:00
Michal Čihař
b19180f664 Translated using Weblate (Finnish) 
Currently translated at 67.0% (2164 of 3228 strings)

[CI skip]
 2015-11-12 12:36:06 +01:00
Michal Čihař
c883911065 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-11-12 12:36:06 +01:00
Michal Čihař
41638f37b8 Translated using Weblate (Czech) 
Currently translated at 100.0% (1 of 1 strings)

[CI skip]
 2015-11-12 12:36:06 +01:00
Madhura Jayaratne
289ca969aa Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-12 22:35:55 +11:00
Madhura Jayaratne
3f62b99008 Document the newly allowed false value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-12 22:23:10 +11:00
Madhura Jayaratne
870c2c448b Fix notices about undefined indexes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-12 22:17:10 +11:00
Weblate
be02151e80 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-12 11:21:35 +01:00
Michal Čihař
77e213d5b3 Translated using Weblate (Swedish) 
Currently translated at 99.7% (3203 of 3211 strings)

[CI skip]
 2015-11-12 11:21:35 +01:00
Michal Čihař
5d3c7d8680 Translated using Weblate (Italian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-11-12 11:21:34 +01:00
Michal Čihař
2ff1f96f40 Translated using Weblate (Finnish) 
Currently translated at 67.4% (2167 of 3211 strings)

[CI skip]
 2015-11-12 11:21:33 +01:00
Michal Čihař
3beaef2d75 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-11-12 11:21:33 +01:00
Michal Čihař
3518d5cfff Translated using Weblate (Czech) 
Currently translated at 95.8% (3077 of 3211 strings)

[CI skip]
 2015-11-12 11:21:33 +01:00
Deven Bansod
ab5de224ad Merge pull request #11662 from devenbansod/fix_11661 
Fix #11661 : Error changing table column's encoding (collation)
 2015-11-12 15:51:29 +05:30
Deven Bansod
99be092325 Fixes issue 11661 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-12 20:05:19 +05:30
Petr Kateřiňák
569f38bd4e Translated using Weblate (Czech) 
Currently translated at 94.6% (3056 of 3228 strings)

[CI skip]
 2015-11-12 10:29:03 +01:00
nils kristian tomren
c76144394f Translated using Weblate (Norwegian Bokmål) 
Currently translated at 58.1% (1876 of 3228 strings)

[CI skip]
 2015-11-12 09:33:57 +01:00
nils kristian tomren
34f310cb59 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 58.5% (1879 of 3211 strings)

[CI skip]
 2015-11-12 09:33:52 +01:00
Madhura Jayaratne
407b68441d Fix #11641 Ability to disable the navigationhiding Feature 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-12 17:41:11 +11:00
Marc Delisle
739df4a1d8 Merge branch 'QA_4_5' 2015-11-11 13:51:59 -05:00
Marc Delisle
ba24c28eda Fixes #11658 Collation column is empty in table Structure 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-11 13:51:35 -05:00
Marc Delisle
896f0fabfc Remove specific theme-related directives from the doc. 
See rationale here: http://wiki.phpmyadmin.net/pma/2015-11_Meeting#Theme_configuration_directives

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-11 12:07:51 -05:00
Madhura Jayaratne
5eaa8f86e0 Fix #11654 Use a slider for Internal relations in foreign key supported tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-11 07:44:41 +11:00
Dan Ungureanu
ee3090b96f Merge branch 'QA_4_5'. 2015-11-10 20:26:55 +02:00
Marc Delisle
40beea16cc Add column header for foreign key drop-downs 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-10 13:24:47 -05:00
Dan Ungureanu
dd14663326 Added ChangeLog entries. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-11-10 20:20:18 +02:00
Dan Ungureanu
195945a7c5 Merge pull request #11650 from udan11/QA_4_5 
Fixed multiple parser issues (#11646, #11635, #11631, #11626, #11608, #11602).
 2015-11-10 20:15:39 +02:00
Marc Delisle
0187c60d61 Internal relations are probably less commonly used than Foreign key constraints and the display column dialog 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-09 09:27:23 -08:00
Marc Delisle
06a4c57da1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-09 05:39:17 -08:00
Hugues Peccatte
bb0094d02d Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 16:09:29 +01:00
Hugues Peccatte
0df3e58fc8 Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 16:05:36 +01:00
Hugues Peccatte
c3e1c981c0 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 16:05:25 +01:00
Hugues Peccatte
7da4dd0031 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 16:03:04 +01:00
Hugues Peccatte
d80e139bab Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-11-08 15:59:00 +01:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:58:48 +01:00
Hugues Peccatte
ea806f645d Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:22:54 +01:00
Hugues Peccatte
0ed6db195b Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:21:04 +01:00
Marc Delisle
c3720ce8bf Merge branch 'QA_4_5' 2015-11-08 05:39:26 -08:00
Marc Delisle
c12b63938b Merge commit '5abebfc' 2015-11-08 05:39:20 -08:00
Weblate
a61b52dca9 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-08 14:38:39 +01:00
Burak Yavuz
b7b6092db0 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-11-08 14:38:39 +01:00
Marc Delisle
0065a02854 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-08 05:38:24 -08:00
John Homerstad
711fab59d1 Fixes #11648 Notice in ./export.php#214 Undefined index: quick_or_custom 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-08 05:37:46 -08:00