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

161 Commits

Author SHA1 Message Date
Michal Čihař
54dc10a012 Use PMA_fatalError instead of die 2012-05-09 11:58:10 +02:00
Michal Čihař
b846df7033 Empty line between @param and @return 2012-04-27 13:54:13 +02:00
Madhura Jayaratne
3332151859 Fix Checkstyle Warnings - Type: CloseBracketLine (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-14 09:09:21 +05:30
Dieter Adriaenssens
ff5bdcf8bf remove author names 2012-03-14 15:44:42 +01:00
Dieter Adriaenssens
43b41a8cbb cleanup package tags 2012-03-14 15:37:36 +01:00
Michal Čihař
40818833af Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5 2012-02-08 14:23:12 +01:00
Michal Čihař
b4296d6acb Escape in correct places to avoid double escaping sometimes 2012-02-08 14:22:39 +01:00
Michal Čihař
b78bd8e8a4 Avoid specifying database server name 2012-01-31 11:00:41 +01:00
Michal Čihař
304283ce37 This is about MySQL server, not web 2012-01-31 11:00:14 +01: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
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Michal Čihař
85d729ac5f Coding style adjustments 2011-08-02 16:57:32 +02:00
Piotr Przybylski
878cff0205 Comments 2011-07-31 20:41:03 +02:00
Michal Čihař
11937b06bd Merge remote-tracking branch 'origin/QA_3_4' 2011-07-22 15:19:59 +02:00
Jørgen Thomsen
5f9c187010 Fix format parameters 2011-07-22 15:19:31 +02:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Marc Delisle
12fcc270f2 Merge branch 'QA_3_4' 2011-07-02 20:52:10 -04:00
Herman van Rink
0fbedaf5fd Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 2011-06-30 13:21:31 +02:00
Michal Čihař
802b94c0ea Fix order of parameters in doc 2011-06-24 14:09:29 +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
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
baf339f802 Continue to replace warning level with error level 2011-05-04 06:14:28 -04:00
Michal Čihař
9433f4e78f Fix check for latest version to work with versions like -rc1-dev 2011-04-07 14:35:11 +02:00
Michal Čihař
04acac8235 More uses of standard function for PHP doc links 2011-02-17 10:50:59 +01:00
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
Michal Čihař
f5359b393b Yet another subversion notice. 2010-03-30 15:00:00 +02:00
Michal Čihař
15bf3c12db Move setup script messages away to avoid their loading all the time. 2010-03-30 14:54:24 +02:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Marc Delisle
4ad6f11561 patch #2948421 HTTP Basic auth realm name 2010-02-24 16:48:52 +00:00
Michal Čihař
94c2f864ae [core] Remove config data from session as it brings chicken-egg problem. 
Configuration data stores PmaAbsoluteUri, which should be accessible
before initiating session. Otherwise there is no way to make
PmaAbsoluteUri work. PmaAbsoluteUri is needed at least for reverse
proxy setups, for example http webserver running behind https proxy.
 2010-01-21 11:18:18 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
2afc8f0707 bug #2890451 [setup] Inconsistent generated "designer_coords" 2009-11-02 00:18:07 +00:00
Herman van Rink
ac427c1ff4 bug #2809930 [setup] Notice: Undefined variable: k in setup/index.php 2009-06-21 22:49:57 +00:00
Michal Čihař
1325e23873 Fix escaping of server name. 2009-04-10 07:29:13 +00:00
Herman van Rink
f0eb21fba8 patch #2727250 Optimizations for some PHP loops 2009-04-04 12:41:02 +00:00
Michal Čihař
50502ea835 Use official names for wiki (wiki.phpmyadmin.net) and demo server (demo.phpmyadmin.net). 2009-03-24 12:56:58 +00:00
Michal Čihař
e67226a446 Do not output unescaped chars to generated configuration file. 2009-03-24 08:34:23 +00:00
Marc Delisle
4b67c7483f [auth] New setting AllowNoPassword (supercedes AllowNoPasswordRoot) that applies to all accounts (even the anonymous user) 2009-03-02 16:19:36 +00:00
Piotr Przybylski
3bb732703c Setup script: removed useless error handler code, closes bug 2468811 2009-01-18 18:55:00 +00:00
Michal Čihař
7503c9b75d Better support for vendor customisation (based on what Debian needs) 2008-11-30 12:58:55 +00:00
Michal Čihař
2e7ee22e45 setup/lib should be protected same way as libraries 2008-11-30 12:13:30 +00:00
Michal Čihař
256a90dd8c newline at the end... 2008-11-30 11:51:22 +00:00
Michal Čihař
90c3f22fe4 Missing end line. 2008-11-30 11:48:07 +00:00
Michal Čihař
d88067ee54 Add some missing docblocks. 2008-11-24 11:36:33 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Michal Čihař
9561f56875 Fix some phpdoc errors. 2008-11-24 09:55:30 +00:00
Piotr Przybylski
9f9fad1647 Setup script: moved swekey config from signon to server form 2008-11-13 20:02:18 +00:00
Piotr Przybylski
66041b2d89 Setup script: open wiki and docs links in new windows/tabs 2008-11-13 19:21:34 +00:00
Piotr Przybylski
0af24aca43 removed setup script lanuage files 2008-11-03 16:32:38 +00:00
Piotr Przybylski
d78980e151 Setup script: language cookie wasn't updated due to PMA_MINIMUM_COMMON 2008-10-23 17:04:17 +00:00