gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,891 Commits 12 Branches 481 Tags 2.4 GiB
047cb6845f
Commit Graph

100 Commits

Author SHA1 Message Date
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Michal Čihař
73fb08d3d8 Revert "Feature idea: Collapsible navigation frame" 
This reverts commit 5fb7f9cd17.

Conflicts:

	js/common.js
 2011-08-04 14:41:29 +02:00
Aris Feryanto
0e39df6ca4 add configuration in 'user preferences' and 'setup' to show/hide the Hint created with PMA_createqTip function 2011-08-04 16:27:47 +08:00
Tyron Madlener
5fb7f9cd17 Feature idea: Collapsible navigation frame 2011-07-27 12:56:40 +03:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Michal Čihař
9730a6b3d7 Merge commit '97b1375605f241481a953e2c78eb42d43f84fa9d' 
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
 2011-07-21 15:51:05 +02:00
Madhura Jayaratne
167d10385d Merge branch 'QA_3_4' 2011-07-21 08:59:35 +05:30
Madhura Jayaratne
58b48a3d45 bug #3367986 [navi] Drop field -> lost active table 2011-07-21 08:55:57 +05:30
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Aris Feryanto
ad6e109e0e Fix RecentTable class -> PMA_RecentTable, some fix on documentation 2011-05-27 19:03:47 +07:00
Aris Feryanto
c2edb0a165 Remove inline javascript and use jQuery instead 2011-05-24 08:31:50 +07:00
Aris Feryanto
963d77e3be Ajaxification of recent tables list 2011-05-14 02:46:15 +07:00
Aris Feryanto
b49922c14b Merge remote-tracking branch 'origin/master' into browsemode 2011-05-10 20:29:18 +07:00
Marc Delisle
7698df1520 Use correct icon for database in serverinfo div 2011-05-10 06:00:34 -04:00
Marc Delisle
f56619e482 Use correct icon for database in serverinfo div 2011-05-10 05:59:53 -04:00
Aris Feryanto
0c0b437679 Not refresh the navigation if the recent tables is not configured, added some checking 2011-05-10 09:20:17 +07:00
Aris Feryanto
48092de206 Merge remote-tracking branch 'origin/master' into browsemode 2011-05-10 01:55:59 +07:00
Aris Feryanto
c468705538 Add PMA_addRecentTable function, jQuery for recent tables 'onchange' event 2011-05-10 01:55:02 +07:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Aris Feryanto
04bbe91b52 Recently used tables (fix bug & add pma_recent in /setup) 2011-05-08 22:40:46 +07:00
Aris Feryanto
23021911b1 Recently used tables (class, configuration, remember in pma database) 2011-05-08 02:42:38 +07:00
Aris Feryanto
21bceed414 Recently used tables (now with configuration) 2011-05-07 14:52:07 +07:00
Aris Feryanto
4b7e65e610 Recently used tables (works, but only in temporary session variable) 2011-05-02 10:09:05 +07: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