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

299 Commits

Author SHA1 Message Date
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
Crack
fab6eb09ea Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-20 12:30:03 +02:00
Crack
52550eff13 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Resolved conflicts:
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
 2010-07-20 12:19:21 +02:00
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable. 
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
 2010-07-20 12:05:07 +02:00
Michal Čihař
a4055b4773 [core] RecodingEngine now accepts none as valid option. 2010-07-20 11:56:21 +02:00
Michal Čihař
d7192b3a95 DefaultCharset is not used anywhere. 2010-07-20 11:52:33 +02:00
lorilee
7786d9421e Changed the default CSV column separator from a comma to a semi-colon 2010-07-16 00:12:13 -07:00
lorilee
27bc09c939 Merge branch 'master' of http://repo.or.cz/r/phpmyadmin 2010-07-12 12:40:27 -07:00
ninadsp
f06bb69bb8 Merge remote branch 'origin/master' 2010-07-12 22:47:17 +05:30
Crack
74eb921e68 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-12 14:04:16 +02:00
lorilee
edc8846de8 Changed the default CSV column separator from a comma to a semi-colon 2010-07-08 13:41:15 -07:00
ninadsp
020dac8c89 Merge remote branch 'origin/master' 2010-07-07 18:53:41 +05:30
Marc Delisle
d4f6b5c4ba Merge branch 'QA_3_3' 2010-07-07 06:13:38 -04:00
Marc Delisle
8a153086a1 revert to previous value and add a comment in default configuration file 2010-07-07 06:13:06 -04:00
Marc Delisle
bd09ef50ff Merge branch 'QA_3_3' 2010-07-06 16:58:50 -04:00
Marc Delisle
9903c5f3d0 bug #3025975 [auth] Odd LoginCookieValidity default value 2010-07-06 16:58:13 -04:00