nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,466 Commits 1 Branch 0 Tags
d17fba309c11bcda59d74f238d75a56c543393f0
Commit Graph

112 Commits

Author SHA1 Message Date
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
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Michal Čihař
a384bef30b Let's remove mootools. 
There still might be some uses of it, but I'm not aware of anything
right now and it's better to break things earlier so that somebody
notices and it can be fixed.
 2010-04-15 10:47:50 +02:00
Michal Čihař
71ff89c2fe Include non minified version in Git. 
The JS compression will happen on release.
 2010-04-13 11:52:33 +02:00
Marc Delisle
3ca82375d5 continue removing author names in code 2010-04-05 09:16:36 -04:00
Michal Čihař
12482d58eb Separate logic for loading messages to javascript. 
This way they can be cached in browser and not loaded on each request.
 2010-04-01 15:02:23 +02:00
Michal Čihař
5ecbd6941d Better name for javascript file. 2010-04-01 11:24:38 +02:00
Michal Čihař
7b754395e9 Provide way for vendors to easily change paths to config files. 2010-03-31 12:29:21 +02:00
Michal Čihař
e20e693316 Update generating of bookmarkable url to jQuery. 2010-03-30 13:45:18 +02:00
Marc Delisle
783892518c Replace MooRainbow with a jQuery color picker 2010-03-25 13:27:58 -04:00
Michal Čihař
ecc4913a8c Reenable bookmarking code. 
Just disable it for webkit based browsers, because they do not allow to
update any part of location without reload.

bug#2937481
 2010-01-25 11:50:48 +00:00
Michal Čihař
df1671d1c4 Include mootools as first script. 2010-01-25 11:50:14 +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
729d965a04 optimization: do not verify each time the presence of blobstreaming plugins; coding standard 2009-11-07 12:00:19 +00:00
Michal Čihař
a378720684 Convert active check to variable. 
We need to disable tracker for calling PMA_getRelationsParam. Well there
should be rather way to skip all queries done by control user, but this
information is not passed down to the DBI layer where tracker catches the SQL
queries.
 2009-08-25 13:44:14 +00:00
Michal Čihař
ffa02fb26d Delay tracker activation till all our parts are ready. 
Otherwise it can lead to some strange effect while trying to track queries
used for finding out whether tracking is enabled.
 2009-08-25 13:16:32 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Marc Delisle
60536d78e1 patch #2798592 [import] Progress bar 2009-07-02 12:12:06 +00:00
Marc Delisle
38fea0cc9e in SESSION, userconf renamed to tmp_user_values to avoid confusion with the future db-based user preferences 2009-06-20 16:36:58 +00:00
Marc Delisle
c7e897b1e5 [core] Compatibility with PHP 5.3.0RC2 2009-05-08 14:15:55 +00:00
Michal Čihař
49036e6003 rfe #1694104 Allow logging of user status with Apache. 2009-03-03 16:20:41 +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
Marc Delisle
842ed504d2 bug #2414056 [auth] AllowNoPasswordRoot error message is too vague 2009-02-10 18:15:18 +00:00
Marc Delisle
5ed0400bdd patch #2520747 [core] E_DEPRECATED compatibility for PHP 5.3 2009-01-20 18:04:20 +00:00
Marc Delisle
30bda361bf patch #2478940 [core] PHP 5.2+ warning does not work 2009-01-01 23:37:14 +00:00
Marc Delisle
0de70e7d79 bug #2397877 [core] ForceSSL and http auth_type 2008-12-28 14:50:07 +00:00