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

514 Commits

Author SHA1 Message Date
Michal Čihař
57a97a7057 Use up to date links to bugs and feature requests 2013-02-04 11:52:47 +01:00
Marc Delisle
be42bf2035 This is now called the navigation panel 2013-01-17 06:32:09 -05:00
Marc Delisle
e610174ef2 Default value for NavigationDisplayServers now set to true 2013-01-17 06:28:41 -05:00
Marc Delisle
2723495a4f Removed the AjaxEnable directive 2012-12-21 16:04:57 -05:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Marc Delisle
3a5843a7cd rfe #1052091 [config] Double-underscores in PMA table names 2012-11-11 08:57:41 -05:00
Michal Čihař
8bab2af87b Fix description of frames 2012-11-09 13:37:45 +01:00
Rouslan Placella
c1ea4f00f9 Renamed configuration directive: LeftDisplayDatabaseFilterMinimum => NavigationTreeDisplayDbFilterMinimum 2012-10-30 20:16:57 +00:00
Rouslan Placella
3dc9897561 Renamed configuration directive: LeftRecentTable => NumRecentTables 2012-10-30 20:16:57 +00:00
Rouslan Placella
41ddd1cc6a Renamed configuration directive: LeftDisplayServers => NavigationDisplayServers 2012-10-30 20:16:57 +00:00
Rouslan Placella
4f8896b98a Renamed configuration directive: LeftLogoLinkWindow => NavigationLogoLinkWindow 2012-10-30 20:16:57 +00:00
Rouslan Placella
5940cf29bb Renamed configuration directive: LeftLogoLink => NavigationLogoLink 2012-10-30 20:16:57 +00:00
Rouslan Placella
b0f5dd28ec Renamed configuration directive: LeftDisplayLogo => NavigationDisplayLogo 2012-10-30 20:16:57 +00:00
Rouslan Placella
d364d849f1 Renamed configuration directive: LeftDisplayTableFilterMinimum => NavigationTreeDisplayItemFilterMinimum 2012-10-30 20:16:57 +00:00
Rouslan Placella
8012c6fb62 Renamed configuration directive: LeftDefaultTabTable => NavigationTreeDefaultTabTable 2012-10-30 20:16:57 +00:00
Rouslan Placella
8035eecf87 Renamed configuration directive: LeftPointerEnable => NavigationTreePointerEnable 2012-10-30 20:16:57 +00:00
Rouslan Placella
8d4da3ea67 Renamed configuration directive: LeftFrameTableLevel => NavigationTreeTableLevel 2012-10-30 20:16:57 +00:00
Rouslan Placella
31a3f1d73c Renamed configuration directive: LeftFrameTableSeparator => NavigationTreeTableSeparator 2012-10-30 20:16:57 +00:00
Rouslan Placella
4f4671b284 Renamed configuration directive: LeftFrameDBSeparator => NavigationTreeDbSeparator 2012-10-30 20:16:57 +00:00
Rouslan Placella
6f8544c5ef Renamed configuration directive: LeftFrameDBTree => NavigationTreeEnableGrouping 2012-10-30 20:16:57 +00:00
Rouslan Placella
90b6718bfb Added configuration directive: MaxNavigationItems 2012-10-30 20:16:56 +00:00
Rouslan Placella
5f66444f5b Dropped configuration directives: ShowTooltipAliasDB and ShowTooltipAliasTB 2012-10-30 20:16:56 +00:00
Rouslan Placella
9f360c30f5 Dropped configuration directive: DisplayDatabasesList 2012-10-30 20:16:56 +00:00
Rouslan Placella
c9edec6e65 Dropped configuration directive: LeftFrameLight 2012-10-30 20:16:56 +00:00
Rouslan Placella
d7e0bed284 Dropped configuration directive: AllowThirdPartyFraming 2012-10-30 20:16:56 +00:00
Rouslan Placella
9e3a9ee52f Dropped main.php 2012-10-30 20:10:20 +00:00
Jim Nelin
8e6d434159 Added $cfg['ServerLibraryDifference_DisableWarning'] to make it possible to hide the warning about differences in MySQL library and server version. 2012-10-22 17:22:03 +02:00
Marc Delisle
6b56856b1d Grid editing mode: configuration 
Move SaveCellsAtOnce to a better place in the configuration file
 2012-10-20 07:12:14 -04:00
Marc Delisle
3dd52636eb Bypass InnoDB and views row counting by default, for performance 
reasons.
See https://github.com/phpmyadmin/phpmyadmin/pull/83 for the discussion,
but my commit changes the default values, not the sample values.
 2012-07-25 08:19:41 -04:00
Alex Marin
5623356e7a oop: fix bugs and phpcs errors for all export plugins 2012-06-18 14:22:12 +03:00
Michal Čihař
39df7de25b Whitespace cleanup 2012-05-29 17:05:42 +02:00
Marc Delisle
45e0398d4c Merge pull request #61 from nicokaiser/TableStatusCache 
Add StatsCache* config options for caching TABLE STATUS output in APC (if available)
 2012-05-17 17:17:31 -07:00
Miłosz Lewandowski
6130edd505 Feature Requests item #3300418: Fast database search. 2012-05-16 21:31:59 +02:00
Nico Kaiser
e7cccad2c3 Add StatsCache* config options for caching TABLE STATUS output in APC (if available) 2012-05-10 10:25:03 +02:00
Madhura Jayaratne
ec9a8cf997 Coding style improvements 2012-05-01 19:38:04 +05:30
Marc Delisle
b4f51cada5 Remove ReplaceHelpImg directive; this is a behavior that belongs to the themes 2012-04-27 15:44:20 -04:00
Marc Delisle
9f4fb06e8b Fix the comment according to the code's behavior 2012-04-26 12:47:43 -04:00
Marc Delisle
28d45840ac Remove VerboseMultiSubmit configuration directive 2012-04-26 12:37:07 -04:00
Michal Čihař
29870761c5 Move column types to PMA_Types class 2012-04-26 13:38:54 +02:00
Michal Čihař
28fdb4cc53 Move attributes to PMA_Types class 2012-04-26 13:33:00 +02:00
Michal Čihař
3f4b21801f Remove no longer used config variables for data types 2012-04-26 11:35:27 +02:00
Michal Čihař
f2d2284211 Move DefaultFunctions to top level (will be kept) 2012-04-26 11:04:57 +02:00
Michal Čihař
454493992e Move NumOperators to PMA_Types 2012-04-26 10:02:30 +02:00
Michal Čihař
89d1733200 Move TextOperators to PMA_Types 2012-04-26 10:01:19 +02:00
Michal Čihař
ffaf63b79d Move EnumOperators to PMA_Types 2012-04-26 09:59:59 +02:00
Michal Čihař
e4e414fbcd Remove not used $cfg[SetOperators] 2012-04-26 09:58:01 +02:00
Michal Čihař
1ad90fde1c Move NullOperators to PMA_Types 2012-04-26 09:57:49 +02:00
Michal Čihař
f4a0549beb Drop config option UnaryOperators 2012-04-25 15:17:37 +02:00
Marc Delisle
b6925193d6 Remove SuggestDBName configuration directive 2012-04-21 08:21:28 -04:00
Marc Delisle
d0f26ddc9b Merge branch 'QA_3_5' 2012-04-20 12:37:29 -04:00
Marc Delisle
f9e104af35 Remove old comment about MS Excel export 2012-04-20 12:37:16 -04:00
Jo Michael
c0329abd23 rfe #3518852 [edit] edit blob but not other binary, new option $cfg['ProtectBinary'] = 'noblob' 2012-04-19 22:32:51 +02:00
Michal Čihař
16550186a1 Merge pull request #32 from alexukf/features 
export mediawiki outputs content and structure
 2012-04-18 04:10:44 -07:00
Alex Marin
384e32f92a export mediawiki outputs content and structure 2012-04-16 21:19:59 +03:00
Marc Delisle
5364b2c470 Merge pull request #37 from honzap/force_more_3475567 
Add new config value for hide action columns to drop down menu in table structure (RequestID: 3475567)
 2012-04-16 07:02:14 -07:00
Jan Pecek
0970a3eac0 Add new config value for hide action columns to drop down menu or not (frID: 3475567) 2012-04-16 15:20:02 +02:00
Marc Delisle
049a222648 Remove LightTabs configuration directive 2012-04-15 19:57:06 -04:00
Marc Delisle
d3266a202d verbose_check is no longer needed 2012-04-14 10:06:58 -04:00
Jo Michael
8744f8cf66 + rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false 2012-04-13 01:43:32 +02:00
Michal Čihař
5d54482c66 Drop $cfg['MainPageIconic']. 2012-04-11 15:34:27 +02:00
Michal Čihař
cfee08c781 Drop $cfg['ErrorIconic'] 2012-04-11 15:27:23 +02:00
Jo Michael
10baa48564 + rfe #3516187 show tables last check time in db_structure 2012-04-09 23:09:52 +02:00
Jo Michael
d4658e5b2e + rfe #3516187 show tables creation time in db_structure 2012-04-09 23:09:51 +02:00
Jo Michael
061d49f225 + rfe #3516187 show tables last update time in db_structure 2012-04-09 23:09:50 +02:00
Marc Delisle
9620b0a2de ChangeLog entry for patch #3509360 
Default value for truncate table in export
 2012-03-20 12:49:24 -04:00
Michal Čihař
a32fac4c4b Update references to SQL files 2012-02-14 16:01:32 +01:00
Yuichiro
786358531b patch #3475424 [import] Fixed CSV escape for the import 2012-01-22 04:24:03 -05:00
Yuichiro
82aa0b7dc1 patch #3472899 [export] Fixed CSV escape for the export 2012-01-22 04:09:29 -05:00
Marc Delisle
e5323864b7 Make message and field name more consistent with existing interface (query box) 2012-01-07 07:05:25 -05:00
Gareth Pursehouse
73edcc1511 patch #3303195 [interface] Checkbox to have SQL input remain 2012-01-07 07:00:56 -05:00
Marc Delisle
fc928ad7b6 bug #3093145 [display] Page through rows returned from a view 2012-01-05 07:57:12 -05:00
Marc Delisle
6f7ca79218 patch #3410688 [interface] Improving field size for character columns 2011-10-30 05:35:00 -04:00
Marc Delisle
46ce1d765e Default values for controlhost 2011-10-29 08:07:44 -04:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Marc Delisle
d1aa3e3b02 [interface] Remove DefaultPropDisplay feature 2011-10-08 06:40:10 -04:00
Marc Delisle
85037b0d6a Missing choice for InitialSlidersState 2011-08-27 13:21:55 -04:00
Piotr Przybylski
bd3b7d28d4 Whitespace cleanup 2011-08-25 13:16:06 +02:00
Piotr Przybylski
1aa438539a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/common.lib.php
	libraries/config.default.php
	server_synchronize.php
 2011-08-17 16:39:43 +02:00
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Piotr Przybylski
e19d93a70c Remove unneeded variables from config.default.php 2011-08-15 11:58:54 +02:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS 
Conflicts:
	tbl_select.php
 2011-08-13 14:12:46 +05:30
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
 2011-08-12 22:02:40 +02:00
Marc Delisle
8f7312956d Merge commit '1b7e2f6c7be6c7a96d780a7e9870d498f84e7339' 2011-08-12 14:40:56 -04:00
Aris Feryanto
3a672d43b8 Change the default MaxTableUiprefs to 100 2011-08-12 16:11:17 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Ammar Yasir
57af6f9502 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/tbl_select.js
 2011-08-12 00:10:17 +05:30
Aris Feryanto
ca0aa169c0 Fix merge conflict with grid branch 2011-08-08 15:48:51 +08:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Aris Feryanto
79e4e4fb88 Merge branch 'grid' into aris 2011-08-05 09:56:33 +08:00
Aris Feryanto
9adfe5b99c Grid edit: change the default cfg['SaveCellsAtOnce'] to false 2011-08-05 09:56:23 +08:00
Aris Feryanto
0e39df6ca4 add configuration in 'user preferences' and 'setup' to show/hide the Hint created with PMA_createqTip function 2011-08-04 16:27:47 +08:00
Ammar Yasir
e4b676e356 Merge remote branch 'phpmyadmin/master' 2011-08-03 09:15:29 +05:30
Aris Feryanto
11e1ead21c Merge remote-tracking branch 'origin/master' into aris 2011-08-01 17:22:44 +08:00
Madhura Jayaratne
fe10dec01f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-31 23:25:33 +05:30
Piotr Przybylski
d7bea4d4ee Merge remote-tracking branch 'origin/master' into drizzle 2011-07-31 17:26:18 +02:00
Piotr Przybylski
6a54e26318 Remove information about PHP 4.3, the minimal supported version is now 5.2 2011-07-31 15:07:09 +02:00
Aris Feryanto
b81acce4c9 Merge remote-tracking branch 'origin/master' into grid 2011-07-27 10:16:53 +08:00
Aris Feryanto
4d3c9541de Merge branch 'grid' into aris 2011-07-26 18:33:02 +08:00
Aris Feryanto
338552b21d Grid edit: change cfg['SaveCellsAtOnce'] default to true 2011-07-26 18:32:46 +08:00
Aris Feryanto
4b0cd86ea7 Merge branch 'grid' into aris 2011-07-26 18:30:51 +08:00
Aris Feryanto
cb090c7e21 Grid edit: add configuration to save edited cell(s) at once 2011-07-26 18:30:40 +08:00
Piotr Przybylski
f2935d56d9 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	server_status.php
 2011-07-25 21:55:16 +02:00
Ammar Yasir
18a6f0b070 Merge remote branch 'phpmyadmin/master' 2011-07-25 04:49:22 +05:30
Madhura Jayaratne
ec7feea9b0 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
	libraries/zip_extension.lib.php
 2011-07-24 23:05:35 +05:30
Marc Delisle
35a5f31283 Merge branch 'QA_3_4' 2011-07-24 08:08:51 -04:00
Marc Delisle
08ee54d4a4 bug #3358750 [core] With Suhosin, urls are too long in edit links 2011-07-24 08:08:38 -04:00
Ammar Yasir
811996e92a Merge remote branch 'phpmyadmin/master' 2011-07-15 00:38:31 +05:30
Madhura Jayaratne
1d9ef02608 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-13 23:55:14 +05:30
Piotr Przybylski
480fe9f78c Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 17:37:50 +02:00
Piotr Przybylski
c3d1a8b14a Ignore SkipLockedTables (Drizzle) 2011-07-13 16:59:22 +02:00
Marc Delisle
b2d8e0b60f Clarify directive name: ShowDisplayDir -> ShowDisplayDirection 2011-07-13 09:19:38 -04:00
Madhura
6f4db19f53 Merge remote branch 'origin/master' into OpenGIS 2011-07-08 18:05:52 +05:30
Ammar Yasir
41715e512a Removed mode feature, appended a missing configuration directive and changed help link duration to 10sec 2011-07-07 20:53:32 +05:30
Piotr Przybylski
ff0081bb7a Rename pk_char36 to FUNC_UUID 2011-07-06 19:06:51 +02:00
Piotr Przybylski
b1b4e6389d Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
 2011-07-06 18:31:38 +02:00
Piotr Przybylski
19ec26904b Revert "Provide proper function list in Insert dropdowns and proper column types in field type dropdowns (Drizzle)" 
This reverts commit 35843439df.
 2011-07-06 18:22:55 +02:00
Piotr Przybylski
66158f66c2 Move DefaultFunctions back to config.default.php 2011-07-06 17:47:07 +02:00
Piotr Przybylski
866d1da95a Move ColumnTypes, AttributeTypes, Functions, RestrictColumnTypes, RestrictFunctions and DefaultFunctions to a separate file 2011-07-06 17:29:33 +02:00
Piotr Przybylski
87a539aea7 Remove *Operators configuration variables 2011-07-06 17:00:33 +02:00
Ammar Yasir
03a1a84b78 Test 2011-07-05 05:21:16 +05:30
Ammar Yasir
78f93fdd3c Merge remote branch 'phpmyadmin/master' 2011-07-04 21:58:47 +05:30
Madhura Jayaratne
1bc0473fe2 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	tbl_replace.php
 2011-07-03 21:42:04 +05:30
Marc Delisle
3c0853dc68 Merge commit '61ea5e765db6c9382ef8fba9ab27737664b2d6cc' 2011-07-03 07:29:03 -04:00
Piotr Przybylski
35843439df Provide proper function list in Insert dropdowns and proper column types in field type dropdowns (Drizzle) 2011-07-03 01:47:03 +02:00
Piotr Przybylski
0266ddd7bd Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-07-03 00:41:31 +02:00
Piotr Przybylski
b232941976 Whitespace and comments 2011-07-02 00:30:09 +02:00
Piotr Przybylski
da63d2cb13 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-07-01 20:52:25 +02:00
Piotr Przybylski
a28d43abf3 Updated MySQL function list 2011-07-01 20:37:57 +02:00
Piotr Przybylski
56d4b081a0 Remove STDDEV_* and VAR_* 
Standard deviation and variance make no sense when called with one argument
 2011-07-01 20:37:56 +02:00
Ammar Yasir
543df4c802 Added interface for browsing/editing points 2011-07-01 15:31:56 +05:30
Aris Feryanto
c4ee218fb5 Navigation bar: more compact, display horizontal/vertical mode only when configured 2011-07-01 11:31:30 +08:00
Madhura Jayaratne
63900d0094 GIS data editor for environments without JavaScript support. 
GIS data preserved while editing.
 2011-06-25 19:39:31 +05:30
Piotr Przybylski
b35cd1b40f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	tbl_structure.php
 2011-06-08 00:47:17 +02:00
Michal Čihař
72886c3c8a Add option to call extenal script from signon method 2011-06-06 17:13:15 +02:00
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Gábor Kövesdán
4294f8ea41 patch #3271804 New DisableMultiTableMaintenance directive 2011-06-05 06:53:34 -04:00
Piotr Przybylski
121cd6263b Merge remote-tracking branch 'origin/master' into drizzle 2011-06-02 15:43:28 +02:00
Michal Čihař
d5f18d4e7f Merge branch 'integration' 
Conflicts:
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
 2011-06-02 11:41:31 +02:00
Rouslan Placella
860250f020 Fix bug #3302961 - Row check boxes missing when table row links are disabled 2011-06-02 11:39:57 +02:00
Piotr Przybylski
56768f5f4c Merge branch 'master' into drizzle 2011-05-29 18:27:58 +02:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Piotr Przybylski
83b81dc242 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/common.lib.php
 2011-05-24 15:13:41 +02:00
Aris Feryanto
20f2e2011d Change default value for RememberSorting to true, for testing in the demo server 2011-05-24 16:57:01 +07:00
Aris Feryanto
81f9537778 Add new configuration field for RememberSorting 2011-05-24 14:50:47 +07:00
Aris Feryanto
ab6d16ed2f Set default LeftRecentTable to 10 2011-05-24 08:38:09 +07:00
Piotr Przybylski
be748a7d84 Case insensitive comparisons to check for I_S, tread D_D as I_S 2011-05-17 00:00:21 +02:00
Aris Feryanto
23021911b1 Recently used tables (class, configuration, remember in pma database) 2011-05-08 02:42:38 +07:00
Aris Feryanto
21bceed414 Recently used tables (now with configuration) 2011-05-07 14:52:07 +07:00
Michal Čihař
26a4a09c11 Display warning about incomplete translations 2011-04-06 09:48:20 +02:00
Michal Čihař
c052954bec rfe #1312657 [dbi] Default to mysqli extension. 2011-03-02 14:19:01 +01:00
Michal Čihař
c9410ed7ac pmahomme is now default theme 2011-03-01 16:41:52 +01:00
Marc Delisle
b78bd77e41 For bug 3168757: 
- Change default link length limit to 2000
- Add text next to the image
 2011-02-24 05:21:24 -05:00
Michal Čihař
b1fe08fa92 Add version check to vendor configuration. 
This is something what most Linux distributions will want to disable, so
give it to place where this customisation should happen.
 2011-02-02 14:38:10 +01:00
Michal Čihař
42c8e65139 Make version check configurable. 2011-02-02 14:32:46 +01:00
Michal Čihař
67a8a06c1a [interface] Default to not count tables in database. 
This gives big performance penalty in case there is many databases and
the number of tables is not that much useful to justify it.
 2011-01-28 14:29:44 +01:00
Marc Delisle
5464b54e17 Start implementing conditional Ajax (in results page) 2011-01-22 09:50:12 -05:00
Herman van Rink
8017a61253 patch #3055886 [config] update, changed boolean to integer for more precise control 2010-12-02 16:31:49 +01:00
Marc Delisle
38334e4f91 CtrlArrowsMoving not really needed as an option, now always active 2010-10-04 08:07:48 -04:00
Marc Delisle
7a074671d0 this is now called phpMyAdmin configuration storage 2010-09-05 09:06:50 -04:00
Marc Delisle
eb3e105361 be consistent when talking about a column 2010-09-05 08:56:36 -04:00
Herman van Rink
223d8850cf patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau 2010-09-02 14:35:30 +02:00
Michal Čihař
7f1b1df69f [core] Remove last remaining parts of profiling code which was removed in 2006. 2010-08-30 11:01:31 +02:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
Michal Čihař
5a51858352 [relations] Dropped WYSIWYG-PDF configuration variable. 2010-08-23 11:05:12 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Crack
a5417a0ce7 add custom-no-form to Export/method 2010-08-19 20:35:49 +02:00
Crack
e344696016 account for changes introduced when merging lori/gsoc branch 2010-08-19 16:36:41 +02:00
Crack
b8cee3086b Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	js/functions.js
	js/tooltip.js
	libraries/config.default.php
	libraries/config.values.php
	libraries/display_export.lib.php
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-08-19 14:45:18 +02:00
Michal Čihař
6aefc832ad Fixes for JSON plugin. 2010-08-19 14:05:04 +02:00
lorilee
955df80a30 Set properties to be text and icons by default 2010-08-14 11:47:44 -07:00
lorilee
5dafeb467f Added Quick export options 2010-08-10 22:12:46 -07:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
 2010-08-01 23:19:21 +02:00
lorilee
f1686d5172 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-29 14:12:36 -07:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
8120a00af7 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-28 15:03:28 -07:00
Marc Delisle
d0fc397fe1 new database format string 2010-07-28 13:05:24 -04:00
Michal Čihař
39aa4355a9 Convert default queries to unified expansion. 2010-07-27 10:01:58 +02:00
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	server_export.php
 2010-07-26 13:42:42 -07:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
ed34bb9054 Adjust documentation to gettext. 2010-07-26 16:41:49 +02:00
Crack
b39567f381 revert disable/* options 2010-07-25 22:58:14 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
lorilee
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-07-23 20:43:35 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Crack
2e55d85ab5 Developers tab no longer depends on UserprefsDisallow, introduced UserprefsDeveloperTab setting 2010-07-22 20:04:16 +02:00
Marc Delisle
ec9a60f8e0 undefined variables; unneeded config variables 2010-07-22 13:22:30 -04:00
Crack
7ac7e24d8c more styling for disabled options 
new "Developer" tab (by default all options are disabled, users can't modify them)
fixed UserprefsDisallow export in setup script
 2010-07-22 01:29:36 +02:00
Michal Čihař
906d7bc632 By default use new format strings. 2010-07-21 10:06:16 +02:00
Crack
cc9b5c9028 mark fields that user can disable in setup script 2010-07-21 01:21:32 +02:00
lorilee
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-20 15:23:12 -07:00
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
 2010-07-20 13:04:03 -07:00
Crack
43a7629da9 Users can disable: AllowUserDropDatabase, UseDbSearch, QueryHistoryDB, ShowPhpInfo, ShowChgPassword 
Users can change: QueryHistoryMax (must be lower than value from file config)
 2010-07-20 21:57:05 +02:00
Michal Čihař
0b86b981bb This comment looks totally irellevant. 2010-07-20 15:29:06 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00