webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity
85,394 Commits 12 Branches 481 Tags
71fcb2fe2cf74cdafe804154eba3e713fbfcd2ee
Commit Graph

145 Commits

Author SHA1 Message Date
Kasun Chathuranga
04c2e88d67 Change tables name from 'navigation' to 'navigationhiding' 2013-07-25 21:26:23 +05:30
Kasun Chathuranga
d0522a779c Revert half done commit 2013-07-25 07:22:40 +05:30
Kasun Chathuranga
1ae59ad063 Merge branch 'hideTables' of github.com:kasunchathuranga/phpmyadmin into hideTables 
Conflicts:
	libraries/navigation/Nodes/Node_Database.class.php
	libraries/relation.lib.php
 2013-07-25 07:08:04 +05:30
Kasun Chathuranga
dd39bdd717 Use 'show' instead of 'unhide' in messages and method comments 2013-07-25 06:52:29 +05:30
Kasun Chathuranga
342e0a6b33 Configuration values for hide/unhide navigation items feature 2013-07-20 17:10:43 +05:30
Isaac Bennetch
9525e09e1b Typo 2013-07-16 10:58:30 -04:00
Kasun Chathuranga
027117c94a Document new configurations 2013-07-05 12:24:37 +05:30
Michal Čihař
0f3754a271 Raise requirements to PHP 5.3 2013-07-01 15:29:47 +02:00
Kasun Chathuranga
247e79b840 Merge branch 'master' into relView 
Conflicts:
	tbl_relation.php
 2013-06-25 00:27:17 +05:30
Michal Čihař
b0f322eab7 Drop ShowAll dependency on MaxRows 
It does not make sense since we now allow to choose up to 500 rows in
dropdown.
 2013-06-24 15:32:21 +02:00
Marc Delisle
2837201fff Improve English 2013-06-24 07:05:05 -04:00
Marc Delisle
a5bf25a9ca Fix typo 2013-06-24 06:57:10 -04:00
Michal Čihař
bebba32337 Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php
 2013-06-24 10:41:54 +02:00
Marc Delisle
f59ef5faad Frames are gone 2013-06-23 15:24:23 -04:00
Marc Delisle
d4d5a03766 Bug #3960 NavigationBarIconic config not honored 2013-06-21 10:00:41 -04:00
Marc Delisle
41d64851fa Number of rows dropdown, to improve usability 2013-06-19 12:36:04 -04:00
Marc Delisle
b065bff077 Change MaxRows default value to 25 to fit with the upcoming selector 2013-06-19 11:44:49 -04:00
Kasun Chathuranga
71e4dd5f52 Update FAQs to reflect new process of selecting foreign columns 2013-06-19 12:07:09 +05:30
Kasun Chathuranga
768f736bcb Update FAQs to reflect the ability to set cross database relations 2013-06-19 11:54:35 +05:30
Marc Delisle
18b7f4e4d0 4.0.5-dev 2013-06-13 13:41:49 -04:00
Michal Čihař
fab879f924 Simplify reCaptcha configuration 
Once private and public keys are in place, it is enabled. I see no need
for per server setup.
 2013-06-12 09:38:10 +02:00
Michal Čihař
e9f7faa6d3 Add hint to captcha in security tips 2013-06-11 15:33:41 +02:00
Michal Čihař
5936f61486 Missing crossreferences in captcha doc (issue #369) 2013-06-11 15:31:43 +02:00
Michal Čihař
d08730780a Consistent config naming with other config options (issue #369) 2013-06-11 15:30:14 +02:00
Michal Čihař
65a083f6d4 Merge branch 'RECAPTCHA2' of git://github.com/pbojan/phpmyadmin into pbojan-RECAPTCHA2 
Conflicts:
	libraries/Header.class.php
 2013-06-11 15:28:19 +02:00
Michal Čihař
bdcba3b082 Document switching extension as an option (RFE #1427) 2013-06-11 11:12:59 +02:00
Marc Delisle
684c85d90f Merge commit '063a2d9' 2013-06-10 08:03:38 -04:00
Marc Delisle
063a2d9937 bug #3964 Import using https does not work 2013-06-10 08:02:00 -04:00
Marc Delisle
3d611c386d Merge branch 'QA_4_0' 2013-06-06 08:48:41 -04:00
Marc Delisle
eb12fe41a7 bug #3960 NavigationBarIconic config not honored 2013-06-06 08:47:59 -04:00
Michal Čihař
8002be2ad8 Highlight PHP without starting <?php tag in docs 2013-06-05 10:29:37 +02:00
Michal Čihař
e63b20e391 Add example for CSP rules adjusting 2013-06-05 10:19:56 +02:00
Michal Čihař
b07177bbac Now it allows images as well 2013-06-05 10:18:36 +02:00
Michal Čihař
56addefcb1 Document when this option was made available 2013-06-05 10:18:11 +02:00
Michal Čihař
bfa6282083 Merge branch 'QA_4_0' 2013-06-05 10:04:57 +02:00
Michal Čihař
eb29af585a Allow customization of CSP headers 
This is useful for inserting custom javascript in header/footer files.
 2013-06-05 10:04:06 +02:00
Marc Delisle
961515d50b 4.0.4-dev 2013-05-31 12:30:06 -04:00
Marc Delisle
5fffdca3aa Parser: remove the color (html) mode 2013-05-30 07:54:05 -04:00
Michal Čihař
ebae95d898 Add mising colon 2013-05-21 14:34:52 +02:00
Michal Čihař
69fc0a94a3 Fix text description around SQL for granting pma user privileges 2013-05-21 14:32:21 +02:00
Marc Delisle
e0c3c1d977 4.0.3-dev 2013-05-21 08:30:59 -04:00
Michal Čihař
0068e8b567 Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	libraries/config/messages.inc.php
 2013-05-21 14:01:40 +02:00
Marc Delisle
6d890c3626 bug #3917 CountTables directive is deprecated 2013-05-20 13:28:44 -04:00
Marc Delisle
57e144edde Merge pull request #270 from roccivic/version-check-proxy 
Implemented rfe #1416 config.inc.php proxy settings for version_check.ph...
 2013-05-14 09:48:22 -07:00
Michal Čihař
712bbac48e Merge pull request #380 from ibennetch/faq1_34 
Documentation - fix URL with line break issue
 2013-05-13 15:01:59 -07:00
Isaac Bennetch
efcdf8efdc Documentation - fix URL with line break issue 2013-05-13 08:27:42 -04:00
Bojan Petkovski
1832c8fa33 ReCaptcha feature 2013-05-11 17:53:32 +02:00
Marc Delisle
9fa18175fd 4.0.2-dev 2013-05-10 08:02:02 -04:00
Kasun Chathuranga
adb2e43f7d Implement feature request #1414 - Allow specifying crontrolport 
Set the value of controlport based on the value of controlhost
 2013-05-02 21:36:05 +05:30
Marc Delisle
5a383c5be1 4.0.1-dev 2013-04-25 06:45:50 -04:00