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

493 Commits

Author SHA1 Message Date
Nisarg Jhaveri
05fd631ed8 Some fixes in page-related settings 
- Update 'original' theme
- Fix lock icon location when settings icon is not available

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-19 18:49:37 +05:30
Hugues Peccatte
c7e7089a7b Update PHPDoc. 
Remove unused variable.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-18 22:20:32 +02:00
Nisarg Jhaveri
e115adb533 Page-related settings, rfe#1559 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-18 20:38:07 +05:30
Hugues Peccatte
18625f3bbf Update PHPDoc and minor coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 13:15:08 +02:00
Marc Delisle
2da56de847 Fix doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 12:18:20 -04:00
Marc Delisle
80e930eeb8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 09:42:29 -04:00
Marc Delisle
4bdd483869 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 09:37:00 -04:00
Nisarg Jhaveri
3fcd07ac19 Fix incorrect text in Settings > Import/Export 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-15 18:40:07 +05:30
Madhura Jayaratne
c176487e2a Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 15:08:13 +05:30
Madhura Jayaratne
279439b08a Include token in the error messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 15:04:21 +05:30
Nisarg Jhaveri
431847b39e Return HTML instead of echo-ing directly in FormDisplay 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-15 00:56:26 +05:30
Marc Delisle
2f180d2132 Merge branch 'QA_4_4' 2015-05-07 14:20:26 -04:00
Marc Delisle
822c4dfec2 bug #4876 Settings issues (Favorite tables shown twice in Settings) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 14:19:42 -04:00
Madhura Jayaratne
0e7ac33cb4 Merge branch 'QA_4_4' 2015-05-07 18:03:19 +05:30
Madhura Jayaratne
1663995c59 bug #4891 CSV Import ignores "Replace table data with file" checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 10:26:36 +05:30
Isaac Bennetch
7aa6b8adcd Merge branch 'QA_4_4' 2015-05-05 15:37:22 -04:00
Isaac Bennetch
1a9c45734f Bug 4876: Improve language for navigation separator in setup script/Settings tab 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-05-05 15:36:12 -04:00
Evert Beurskens
d76971d8dd Clarify configuration message 
Signed-off-by: Evert Beurskens evertbeurskens@gmail.com
 2015-04-10 10:18:38 -04:00
Madhura Jayaratne
84c7c61cd2 Make sql_metadata configurable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 16:53:56 +05:30
Marc Delisle
4bf1c166d0 Remove references to the old query window in messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-07 12:54:00 -04:00
Marc Delisle
eb7d05cdfe Merge commit 'a79f4a6' 2015-04-06 07:28:09 -04:00
Dan Ungureanu
a79f4a6e6b BUG #4839. Wrong documentation link. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-04-06 13:26:50 +03:00
Marc Delisle
bb1a5bdc1b Fix caps 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-22 07:35:08 -04:00
Marc Delisle
a653247189 Merge pull request #1601 from pratiksethia1/rfe1625-Autocomplete-Sql 
Feature Request #1625 Autocomplete Sql
 2015-03-22 07:26:22 -04:00
pratiksethia1
5d660eb09d Feature Request #1625 Autocomplete Sql 
Gives an option to user to toggle autocomplete of table and column
names in config settings

Signed-off-by: Pratik Sethia <pratiksethia1@gmail.com>
 2015-03-21 00:15:30 +05:30
Madhura Jayaratne
a093119b19 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 10:52:30 +05:30
Madhura Jayaratne
df38a76b9f rfe #1306 Add lock tables, disable keys options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 10:48:59 +05:30
Marc Delisle
e234d849f1 Missing ending punctuation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-10 07:47:00 -04:00
Marc Delisle
e0f6853e4b Add new feature to /setup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-09 08:13:58 -04:00
Dan Ungureanu
5f8f7ba88e RFE #1570, part 2. Added the possibility of permanently using Enter instead of Ctrl+Enter in console. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-03-09 01:25:28 +02:00
Marc Delisle
e7ced7194b Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-28 06:21:50 -05:00
Marc Delisle
f5a9002209 Merge pull request #1520 from madhuracj/rfe1441 
rfe #1441 Add regexp match when using AllowArbitraryServer
 2015-02-28 06:17:36 -05:00
Madhura Jayaratne
1b939fb3d3 rfe #1441 Add regexp match when using AllowArbitraryServer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 17:02:09 +05:30
Marc Delisle
df7f409f1b rfe #1575 "Disable database expansion" : unclear directive name and explanation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-24 13:10:48 -05:00
Hugues Peccatte
4846ef6bf7 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:51:12 +01:00
Marc Delisle
2a7f1ed42e Remove code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-14 06:12:53 -05:00
Marc Delisle
26f7584c50 Setup support for SessionTimeZone 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-10 13:03:34 -05:00
Marc Delisle
b8182e22c1 Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-06 07:36:13 -05:00
Madhura Jayaratne
0ad24870e6 rfe #1260 Setting LoginCookieValidity > session.gc_maxlifetime 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-02 16:13:50 +05:30
Marc Delisle
bdce26898e rfe #1596 Make "Options > Relational" configurable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-28 08:48:17 -05:00
Atul Pratap Singh
fc257c9904 Rename configuration option as ShowDatabasesNavigationAsTree with default true 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-27 11:31:03 +05:30
Atul Pratap Singh
2b79586343 Modify the configuration option ShowNavigationAsTree to NavigationDatabasesSelector 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-24 19:18:46 +05:30
Atul Pratap Singh
2abe91a499 Add configuration option ShowNavigationAsTree with true as default 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-15 23:45:35 +05:30
Hugues Peccatte
7053381719 Merge branch 'f1591_master' 2015-01-13 22:43:19 +01:00
Madhura Jayaratne
6d12882946 Remove display direction 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-12 14:31:44 +05:30
Hugues Peccatte
44b4f7f7eb Update setup and documentation. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-11 16:19:42 +01:00
Marc Delisle
235d5f47f8 bug #4689 Setup tool creates "pma__favorites" incorrectly 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-06 14:17:12 -05:00
Madhura Jayaratne
3bd84ee7d3 bug #4681 'Central columns table' field in setup does not have a description 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-01 11:14:05 +05:30
Madhura Jayaratne
8999bc6c65 bug #4680 Number of favorite table are not configurable in setup 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-01 11:00:48 +05:30
Madhura Jayaratne
9d2880a1c5 bug #4679 Setup does not allow providing a name for favorites table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-31 17:57:29 +05:30