nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,275 Commits 1 Branch 0 Tags
6e79cb15a5fa25057d8501c51c89a2d2d88ec2b5
Commit Graph

87 Commits

Author SHA1 Message Date
Marc Delisle
c432089db8 Remove author names per our policy 2011-01-30 06:46:15 -05:00
Crack
da0039bb44 fix message 2010-09-21 14:09:57 +02:00
Crack
6a4766f60c Add setup script warning for when LoginCookieStore < LoginCookieValidity 2010-09-21 13:42:37 +02:00
Crack
2524b2588d Setup script front page messages: 
- removed URLs from translatable strings and fixed tab links
- added warning when LoginCookieValidity > 1440
- added error when LoginCookieValidity > session.gc_maxlifetime
 2010-09-21 13:24:42 +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
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Crack
8b78fcec26 remove unneeded file 2010-08-04 14:35:09 +02:00
Crack
4a5ffa7a12 File comments: 
- remove @license and @version from comments
- add vim settings
- change descriptions in form definition files
 2010-08-03 00:55:57 +02:00
Crack
e76b4f8721 fix array definition code 2010-07-31 21:54:38 +02:00
Crack
dcc352a9dc refactor config file generation out of ConfigFile class 2010-07-30 20:25:22 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -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ř
cfc7fd7a2d The linked-tables infrastructure is now called phpMyAdmin configuration storage. 2010-07-26 17:16:55 +02:00
Michal Čihař
639dc7fcf6 Simplify inclusions of vendor_config. 2010-07-26 16:46:37 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
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
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
4434b2c231 Added option in config.inc.php to set the default export method to quick, custom, or custom-no-form 2010-07-13 18:41:15 -07:00
Crack
68d9c40113 moved Import by LOAD DATA settings to CSV category 
moved PMA_array_* functions to core.lib.php
moved PMA_read_userprefs_fieldnames() to user_preferences.lib.php
server/database/table filename templates are saved to pmadb when "remember template" is checked
 2010-07-04 21:56:46 +02:00
Crack
d63fa35c0f finished messages.inc.php cleanup 2010-07-04 00:18:04 +02:00
Crack
7c5a298f27 moved validate.lib.php 2010-07-03 23:27:02 +02:00
Crack
b13dee72f3 Import settings 2010-07-01 22:24:18 +02:00
Crack
9f44d864b6 user preferences saving and integration 2010-06-20 21:34:13 +02:00
Crack
3ff76ffcf5 moved forms definition files 2010-06-18 19:33:24 +02:00
Crack
b2e232b582 Added pmadb table for preferences storage 
Removed some messages from messages.inc.php
 2010-06-18 17:53:53 +02:00
Crack
02bb83cad3 add new settings to setup script 2010-06-16 23:54:57 +02:00
Crack
a90b0a21f2 removed some messages from messages.inc.php (validation, some other error messages) 
User preferences:
added translations and values for some fields
validation for DefaultPropDisplay
 2010-06-13 15:01:37 +02:00
Crack
4572e3ec82 Fix paths in config templates 2010-06-11 22:00:52 +02:00
Crack
3ed3539958 Setup script refactoring: moved ConfigFile, Form, FormDisplay 
Config db overrides and validation info stored in config.values.php
 2010-06-05 19:25:54 +02:00
Crack
6b2f774ba8 Add category tabs to preferences page 
Setup script refactoring
 2010-06-05 15:42:55 +02:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Crack
0f540aca04 Setup script: moved LeftDefaultTabTable, added MainPageIconic 2010-06-01 14:31:11 +02:00
Marc Delisle
caa98445d8 conform to relational terminology regarding columns and rows 2010-05-31 14:33:21 -04:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Marc Delisle
d7181d6911 gettext conversion 2010-05-17 12:42:47 -04:00
Marc Delisle
25f7b89443 gettext conversion 2010-05-14 12:43:23 -04:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Crack
5603e1a683 Setup script: migrate MooTools code to jQuery 2010-04-09 11:11:39 +02:00
Michal Čihař
4086ce69da Add missing message. 2010-04-02 10:10:22 +02:00
Michal Čihař
a31e60356a Add configuration of tracking features (bug #2966752). 2010-04-02 09:59:37 +02:00
Michal Čihař
d77b51803a Allow to configure tracking table (bug #2966752). 2010-04-02 09:55:33 +02:00
Michal Čihař
2691e959c1 Prevent direct execution of some files. 2010-04-02 09:03:46 +02:00
Michal Čihař
0942aca090 Merge branch 'QA_3_3' 2010-04-01 18:05:50 +02:00
Michal Čihař
acb30d5a2a Fix message name. 2010-04-01 18:05:34 +02:00