nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,856 Commits 1 Branch 0 Tags
ac430ea21d6f49b781a9cda9940a5675d56f168e
Commit Graph

76 Commits

Author SHA1 Message Date
Madhura Jayaratne
58b48a3d45 bug #3367986 [navi] Drop field -> lost active table 2011-07-21 08:55:57 +05:30
Marc Delisle
f56619e482 Use correct icon for database in serverinfo div 2011-05-10 05:59:53 -04:00
Marc Delisle
67339bab2a Current code has problems with Ajax, for example when creating a user. 
There are missing headers and this commit is an attempt to fix this
situation.
 2011-02-19 07:49:49 -05:00
Michal Čihař
439a24c6a2 bug #3183548 [ajax] AJAX response needs HTTP header as well. 
Otherwise we would use default charset from PHP insted of utf-8 we use.
 2011-02-17 10:08:18 +01:00
Michal Čihař
33b4d9fb5c Use correct arrow for rtl languages 2011-02-08 09:45:07 +01:00
Michal Čihař
148e35da06 This might not be defined when login fails 2011-02-07 18:49:58 +01:00
Herman van Rink
f57daa0a59 Fix XSS problem, regression in the 3.4 branch. 
Dev releases until -beta2 are vulnerable.
Thanks to Aung Khant from YGN Ethical Hacker Group (http://yehg.net/) for reporting this issue.
 2011-01-26 11:36:10 +01:00
Marc Delisle
586279a0af missing title 2010-11-26 12:48:03 -05:00
Marc Delisle
c5ab6175cd table name should be displayed on top 2010-08-30 13:28:51 -04: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
43c18c50b8 Incorrect resolution of merge conflict was causing the database name to not show up on the serverinfo div. Fixed it 2010-08-26 20:19:51 +05:30
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
ninadsp
e1f319eef1 Trailing } left while resolving merge conflict. Removed it 2010-08-19 00:45:50 +05:30
ninadsp
c0ee037c59 Resolved a Merge Conflict 2010-08-17 18:25:03 +05:30
Marc Delisle
bda213a5ac bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-11 10:48:05 -04:00
ninadsp
5996773bf7 Removed the duplicate table link being shown in the serverinfo div. Most probably caused due to an incorrect merge resolution 2010-07-30 20:34:06 +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ř
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +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
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
7a5fd62810 allow users to easily work with preferences stored in session (when pmadb is disabled): after logging in, user is presented with a message asking whether settings from localStorage should be loaded 2010-07-14 21:28:24 +02:00
ninadsp
5ab3a60612 Header and Footr output is suppressed if it is an Ajax request 2010-05-26 11:38:58 +05:30
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
632211d065 gettext conversion 2010-05-09 16:24:32 -04: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ř
7b754395e9 Provide way for vendors to easily change paths to config files. 2010-03-31 12:29:21 +02:00
Marc Delisle
9785bbc561 remove author names 2010-03-26 17:44:10 -04:00
Herman van Rink
cac4384a8c Minor cleanup 2010-01-23 11:34:43 +00:00
Marc Delisle
443fa4db58 undefined variable 2010-01-22 16:27:36 +00:00
Michal Čihař
ae03cd3b5f Show functional link when creating new table, not to the name of future table. 2010-01-22 15:42:36 +00:00
Marc Delisle
7fbae85888 this require_once() was never executed 2009-07-10 14:36:05 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Marc Delisle
f0cd8feebe undefined $server 2008-05-04 12:41:26 +00:00
Marc Delisle
bd232679f5 main page reorganization (work in progress) 2008-02-05 12:48:39 +00:00
Sebastian Mendel
26d96b8fc0 make use of PMA_Message 2007-10-17 13:33:32 +00:00
Sebastian Mendel
4355a564d5 refactored tooltip handling (please test!) 2007-10-05 13:18:04 +00:00
Sebastian Mendel
98c8a7719e refactored JavaScript handling 2007-10-05 11:45:55 +00:00
Sebastian Mendel
ba662b78f6 use array for JavaScript messages 2007-10-04 15:03:44 +00:00
Sebastian Mendel
27fd48d8fa forgot to remove 2007-10-04 14:14:35 +00:00
Sebastian Mendel
26127353bf make use of checkPassword() in server_privileges.js instead of own function 2007-10-04 11:08:23 +00:00
Sebastian Mendel
40b3ce9fd1 use array to define included JavaScript libraries 2007-10-04 09:22:50 +00:00
Sebastian Mendel
640becedc4 make use of PMA_getDbComment() 2007-10-02 14:16:39 +00:00
Marc Delisle
47a6cbb783 bug 1791568 part 2 2007-09-12 09:25:24 +00:00
Sebastian Mendel
b4c5dda95d bug #1699772 Visual space bug in table name (in browser) 2007-05-14 12:13:44 +00:00
Sebastian Mendel
573a6161bd fixed code indention 2007-05-09 12:18:57 +00:00