gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,029 Commits 12 Branches 481 Tags 2.4 GiB
9f8615dfb4
Commit Graph

68 Commits

Author SHA1 Message Date
Marc Delisle
379f8b6704 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-15 08:53:00 -05:00
Marc Delisle
144e00e5da bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-15 08:39:42 -05:00
Marc Delisle
652b351c4a Merge branch 'QA_4_1' 2013-12-23 13:48:34 -05:00
Marc Delisle
a8b2e4cee1 bug #3938 PDFDefaultPageSize doc and easy configurability 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-23 13:41:14 -05:00
Marc Delisle
2a8962aa95 Signed-off-by: Marc Delisle <marc@infomarc.info> 
Added warning about the mysql extension being deprecated
and removed the extension directive
 2013-12-14 14:26:12 -05:00
J.M
6cd4c7c6dd Fix bug #4145 Config validation MemoryLimit = -1 
(new default)
 2013-10-27 20:26:04 +01:00
Mohamed Ashraf
1bbb3816a8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 
Conflicts:
	ChangeLog
	libraries/Scripts.class.php
	libraries/config.default.php
 2013-08-07 01:05:48 +02:00
Michal Čihař
e0fce588d2 Allow to choose mbstring as recoding engine 2013-07-30 13:59:26 +02:00
Mohamed Ashraf
b83f0eb463 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 
Conflicts:
	ChangeLog
	doc/config.rst
	js/messages.php
	libraries/config/setup.forms.php
	version_check.php

changed 'libraries/Util.class.php' to accept the newly renamed proxy variables
 2013-07-29 18:12:04 +02:00
Madhura Jayaratne
d103a17c29 These methods are now part of Validator class, hence no PMA_ prefix 2013-07-27 21:26:57 +05:30
ayushchd
8ae544fd13 Validator names fix 2013-07-12 16:12:46 +05:45
ayushchd
2e599927d7 Convert validate.lib.php to class PMA_Validator 2013-07-11 14:29:20 +05:45
Mohamed Ashraf
b9bf9e0bcc Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 2013-06-25 07:19:30 +02:00
Michal Čihař
2e81d07859 Add some spacing 2013-06-24 15:38:08 +02: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
d4d5a03766 Bug #3960 NavigationBarIconic config not honored 2013-06-21 10:00:41 -04:00
Mohamed Ashraf
a2f9d9cc7e Merge remote-tracking branch 'origin/master' into error_reporting 2013-06-19 21:40:41 +02:00
Marc Delisle
41d64851fa Number of rows dropdown, to improve usability 2013-06-19 12:36:04 -04:00
Mohamed Ashraf
1214e19ad5 Added setting for confirmation before sending error reports 2013-06-15 09:43:07 +02:00
Brad Jorgensen
c776e02e44 implementation of feature request #1423 2013-05-13 15:50:59 -05:00
Michal Čihař
1d5539d3aa Better function names 
Follow PEAR coding standard for function names.
 2013-05-02 15:01:11 +02:00
Michal Čihař
3751572ad8 Wrap some long lines 2013-04-26 10:07:53 +02:00
Marc Delisle
bcfba0d46c Fix merge conflicts 2013-02-09 07:50:16 -05:00
Rouslan Placella
3dc9897561 Renamed configuration directive: LeftRecentTable => NumRecentTables 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
8012c6fb62 Renamed configuration directive: LeftDefaultTabTable => NavigationTreeDefaultTabTable 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
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
9e3a9ee52f Dropped main.php 2012-10-30 20:10:20 +00:00
Michal Čihař
c6d31ab09e Translatable values for grid editing 2012-10-21 14:14:14 +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
Madhura Jayaratne
ec9a8cf997 Coding style improvements 2012-05-01 19:38:04 +05:30
Rouslan Placella
ff66fdbdf9 Remove stray trailing whitespaces 2012-04-22 00:12:30 +01: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ř
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
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +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
Aris Feryanto
6e4abf02d6 Validation (non-negative number) for LeftRecentTable 2011-05-10 16:18:18 +07:00
Michal Čihař
8f25926174 Need to fill in all things as associative array, otherwise user prefs fail 2011-02-08 13:56:27 +01:00
Michal Čihař
874e0ab8da Make some strings in preferences translatable 2011-02-08 13:30:58 +01: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