Rouslan Placella
75fd7df711
Merge branch 'master' into rte
2011-06-24 13:49:55 +01:00
Piotr Przybylski
2399c8a784
Remove PMA_MULTIBYTE_ENCODING constant
2011-06-23 23:28:05 +02:00
Rouslan Placella
67c5b63a4a
Merge branch 'master' into rte
2011-06-23 14:10:19 +01:00
Marc Delisle
929cb3d63f
Typo
2011-06-23 06:33:39 -04:00
Marc Delisle
c911e891a1
Typo
2011-06-23 06:32:09 -04:00
Rouslan Placella
4f4efd231d
Better "event scheduler" functionality
2011-06-22 18:27:32 +01:00
Michal Čihař
ee0b2fee37
Better error message when config file can not be parsed
...
- shorter text
- directly show errors in iframe instead saying user to load other page
2011-06-22 09:29:14 +02:00
Marc Delisle
723e51dfdb
Merge commit 'ede177c577668a712e0d89a8c895c1d0c200f42f'
2011-06-21 08:13:41 -04:00
Aris Feryanto
7e5fddf4ae
Recent table: Add support for browser without javascript
2011-06-20 13:21:07 +07:00
Rouslan Placella
58c4ab431f
Fixed bug where with JS disabled sql.php did not redirect the user back to list of routines after a DROP operation.
2011-06-14 15:51:25 +01: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
Thilanka Kaushalya
0598d99925
Ajaxify the create table option in navigation panel - have bugs
2011-05-21 16:45:51 +05:30
Michal Čihař
b3a79a9344
Merge remote-tracking branch 'origin/QA_3_4'
2011-05-20 09:02:28 +02:00
Michal Čihař
ecfc8ba4f7
Make redirector require valid token
2011-05-20 09:01:20 +02:00
Marc Delisle
5f4a8e6a97
Update to jQuery 1.6.1
2011-05-14 08:26:00 -04:00
Marc Delisle
13b31956ae
For easier reading, replace "!isset" with "! isset"
2011-05-09 12:49:05 -04:00
Piotr Przybylski
5c39c5511f
Comments formatting and PHPDoc fixes
2011-05-02 20:50:16 +02:00
Marc Delisle
b2d9121f18
Remove the custom color picker feature
2011-04-22 07:00:45 -04:00
Michal Čihař
dc0c6938b2
[security] Redirect external links to avoid Referer leakage.
2011-01-28 13:22:41 +01:00
Marc Delisle
b923bb3fbb
Upgrade to jQuery 1.4.4
2011-01-02 08:00:25 -05:00
Michal Čihař
70bc1761c3
Drop translators.html and all references to it.
...
The list is absolutely not up to date and it makes no sense in
maintaining it in addition to history of po files in git.
2010-12-31 15:51:34 +01:00
Michal Čihař
aa6fec0532
Remove error.php
...
Redirecting to other script introduces possibility of inject custom
messages to it. Though there is no clear security issue in this, it
might confuse users and mistake them to go to external site as it allows
to include links.
2010-12-07 12:24:21 +01:00
Marc Delisle
621d851c5f
zend.ze1_compatibility_mode removed in PHP 5.3
2010-12-04 07:02:06 -05:00
Marc Delisle
79f320e951
remove author names
2010-12-04 06:41:10 -05:00
Crack
3a5f08f32d
load LoginCookieValidity from user prefereces cache to make it usable in auth plugins
2010-09-21 13:10:59 +02:00
Michal Čihař
f47e0933c3
[core] Force generating of new session on login
...
This improves security because session ID and token are generated fresh
for each user.
2010-09-16 15:19:46 +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
a2f78a6d38
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
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ř
5f88219d18
Included only from single place, no need for require_once.
2010-07-26 16:40:43 +02:00
Michal Čihař
81a4fdf0c9
No need for require_once for once included code.
2010-07-26 16:35:24 +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
ninadsp
e646a2760c
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
Marc Delisle
56ebe05af7
blob streaming code cleanup (work in progress)
2010-07-22 13:15:27 -04:00
Barry Leslie
f8653e5803
Update blob streaming to match the current API and use the PBMS PHP extension.
2010-07-22 11:23:37 -04:00
ninadsp
7b99e3b0e4
Added a parameter for inline edit requests where truncated and transformed values are retrieved
2010-07-21 00:10:46 +05:30
Michal Čihař
318dc4b650
Drop @version tag from docblocks.
2010-07-20 13:59:17 +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ř
df4a6efe47
Drop convcharset/pma_charset handling.
...
This code had no real use, it was used for converting strings from MySQL
to browser encoding.
2010-07-20 11:46:11 +02:00
ninadsp
bcbf327139
Merge remote branch 'origin/master'
2010-06-29 23:54:01 +05:30
Crack
83f1397f0f
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-06-28 16:42:29 +02:00
Marc Delisle
4986ee0174
lang directory no longer exists; I guess this mechanism is no longer needed
2010-06-28 09:25:45 -04:00
Crack
e842432c7e
User preferences:
...
- add icons to category tabs
- user overrides were unavailable in CSS files
- apply saved configuration immediately after save, reload navigation frame if it's affected
- disabled overrides marked in user preferences forms
2010-06-26 01:04:17 +02:00
Crack
9f44d864b6
user preferences saving and integration
2010-06-20 21:34:13 +02: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
b05a903dc3
gettext conversion
2010-05-14 07:47:50 -04:00
Michal Čihař
c415e5d03b
Reenable kanji encoding feature.
...
Language names are now slightly different.
2010-05-10 09:26:17 +02:00
Michal Čihař
5c2a111011
Fix format strings.
2010-05-05 11:44:55 +02:00
Michal Čihař
142c0b5f84
Convert pcre warning to generic message.
2010-05-05 11:35:49 +02:00