gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,437 Commits 12 Branches 481 Tags 2.4 GiB
e5f1555e1b
Commit Graph

267 Commits

Author SHA1 Message Date
Marc Delisle
3fc3194bce - Bug #3383572 Cannot execute saved query 
- Remove bookmark from the list after deletion (Ajax)
 2011-09-23 08:14:42 -04:00
Marc Delisle
ff56cbf5d9 Fix bug 3411523 (SQL query tab broken) which was introduced when 
applying the fix for bug #3383572 (Cannot execute saved query), which
works for the 3.4 branch.
 2011-09-22 10:48:29 -04:00
Madhura Jayaratne
2de2e87af7 Adding missing semicolons 2011-09-21 10:05:32 +05:30
Madhura Jayaratne
ddd80be1cb Typo 2011-09-21 10:00:47 +05:30
Marc Delisle
369c9c550a Ajax and bookmark delete 2011-09-20 12:45:19 -04:00
Marc Delisle
516891a6b8 View only bookmark did not work with CodeMirror 2011-09-20 08:47:18 -04:00
Marc Delisle
5e83631469 Fix merge conflicts 2011-09-18 08:26:47 -04:00
Marc Delisle
6ac29b4791 bug #3383572 [interface] Cannot execute saved query 
When the Go button related to the "Run SQL query" section is pressed,
avoid transmitting the value of id_bookmark from the "Bookmarked SQL
query" section; otherwise import.php would think that it needs to
do a bookmark action instead of executing the query.
 2011-09-18 08:11:15 -04:00
Herman van Rink
2f28ce9c80 [security] Fixed XSS in Inline Edit on save action 2011-09-02 13:00:33 -04:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS 
Conflicts:
	tbl_select.php
 2011-08-13 14:12:46 +05:30
Aris Feryanto
ba5598a190 Refactor makegrid.js 2011-08-11 13:35:51 +08:00
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Madhura Jayaratne
0e84927693 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/common.lib.php
 2011-08-08 07:45:53 +05:30
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Aris Feryanto
28a18c1727 Grid edit: fix bug - not working if AjaxEnable set to false 2011-08-03 11:58:56 +08:00
Rouslan Placella
c17add38ed Fixed bug #3374802 - Comment on a column breaks inline editing 2011-08-02 16:15:39 +02:00
Madhura Jayaratne
516557716a Remove the content when AJAX dialog closes 2011-07-31 16:10:51 +05:30
Aris Feryanto
1e2f73c6e9 Fix bug: PMA_urlencode didn't encode space character correctly 2011-07-29 16:14:06 +08:00
Michal Čihař
f34dfda0fe Merge remote-tracking branch 'tyron/master' 
Conflicts:
	js/functions.js
	js/server_status.js
	js/sql.js
	libraries/common.lib.php
	server_status.php
	themes/pmahomme/css/theme_left.css.php
 2011-07-25 11:32:22 +02:00
Tyron Madlener
ace73f25bb - Added missing CSS Sprites, Icon sprites now also for PMA_linkOrButton() 
- Rewrote PMA_linkOrButton() to rely on Javascript, making the code way less complicated
- Removed legacy support of Javascript 1.1 or lower
- Fixed a bug in cases where PMA_linkOrButton() creates a form, which when clicked required a js confirm, the confirm is being displayed a second time after the form is submitted.
 2011-07-23 09:23:18 +03:00
Tyron Madlener
9f343e6ead Merge remote-tracking branch 'origin/master' 
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
 2011-07-21 17:41:06 +03:00
Michal Čihař
ba395f545e Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 16:14:47 +02:00
Michal Čihař
4720ed20fd Whitespace cleanup 2011-07-21 16:05:23 +02:00
Michal Čihař
0f9de30479 Coding style 2011-07-21 16:05:18 +02:00
Marc Delisle
47dd2a0143 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 09:54:28 -04:00
Marc Delisle
33b48269a5 Streamline jQuery usage 2011-07-21 09:54:09 -04: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
Tyron Madlener
c30d209146 Query Analyzer Dialog v0.1 2011-07-21 13:38:51 +03:00
Michal Čihař
97daa89610 Remove double spaces around else 2011-07-21 11:32:52 +02:00
Tyron Madlener
40ccdcb236 Remove duplicate intialization 2011-07-19 15:04:26 -04:00
Tyron Madlener
97b1375605 Remove duplicate intialization 2011-07-19 21:44:53 +03:00
Marc Delisle
964664525c Streamline jQuery usage 2011-07-19 12:16:16 -04:00
Marc Delisle
7a40f19f8a Streamline jQuery usage 2011-07-19 12:02:56 -04:00
Michal Čihař
dce30ddee1 Merge branch 'master' into integration 2011-07-19 14:23:11 +02:00
Marc Delisle
87306f1377 Merge commit '2dfd913e2b9ef792224fba5e37306e58a464ba4e' 2011-07-15 08:29:14 -04:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Tyron Madlener
a5df22ced5 Merge remote-tracking branch 'origin/master' 
Conflicts:
	ChangeLog
	Documentation.html
	db_events.php
	db_routines.php
	db_structure.php
	db_triggers.php
	js/db_structure.js
	js/functions.js
	js/indexes.js
	js/makegrid.js
	js/messages.php
	js/sql.js
	js/tbl_structure.js
	libraries/Table.class.php
	libraries/common.lib.php
	libraries/config.default.php
	libraries/config/messages.inc.php
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
	libraries/database_interface.lib.php
	libraries/db_events.inc.php
	libraries/db_links.inc.php
	libraries/display_tbl.lib.php
	libraries/tbl_links.inc.php
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/br.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/ml.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/phpmyadmin.pot
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
	server_status.php
	tbl_triggers.php
	themes/original/css/theme_right.css.php
	themes/original/jquery/jquery-ui-1.8.override.css
	themes/pmahomme/css/theme_right.css.php
	themes/pmahomme/jquery/jquery-ui-1.8.override.css
 2011-07-14 17:23:35 +03:00
Tyron Madlener
bf23143424 Merge remote-tracking branch 'origin/master' 
Conflicts:
	ChangeLog
	Documentation.html
	db_events.php
	db_routines.php
	db_structure.php
	db_triggers.php
	js/db_structure.js
	js/functions.js
	js/indexes.js
	js/makegrid.js
	js/messages.php
	js/sql.js
	js/tbl_structure.js
	libraries/Table.class.php
	libraries/common.lib.php
	libraries/config.default.php
	libraries/config/messages.inc.php
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
	libraries/database_interface.lib.php
	libraries/db_events.inc.php
	libraries/db_links.inc.php
	libraries/display_tbl.lib.php
	libraries/tbl_links.inc.php
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/br.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/ml.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/phpmyadmin.pot
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
	server_status.php
	tbl_triggers.php
	themes/original/css/theme_right.css.php
	themes/original/jquery/jquery-ui-1.8.override.css
	themes/pmahomme/css/theme_right.css.php
	themes/pmahomme/img/s_sortable.png
	themes/pmahomme/jquery/jquery-ui-1.8.override.css
 2011-07-14 15:56:31 +03:00
Aris Feryanto
26e20d8da3 Fixed qTip conflict with column highlighting in horizontal mode 2011-07-14 00:20:17 +07:00
Marc Delisle
0131d16548 Merge commit '010f19912460c8e3b925ff7b19f7e2f37361a339' 2011-07-13 09:04:51 -04:00
Aris Feryanto
010f199124 Remove vertical support for inline edit 2011-07-11 15:15:24 +08:00
Madhura Jayaratne
4ae5cb0799 Merge branch 'QA_3_4' 2011-07-10 18:00:46 +05:30
Madhura Jayaratne
58d25ddcb8 Typo 2011-07-10 17:58:35 +05:30
Madhura Jayaratne
a546479680 bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL 2011-07-10 17:55:56 +05:30
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Thilanka Kaushalya
311804dd72 Removed the modification for the multi row Export in Table Browse 2011-07-03 10:52:16 +05:30
Thilanka Kaushalya
d33590a544 Resolved conflicts 2011-07-01 23:50:58 +05:30
Tyron Madlener
7f9797bc6a Hides the bookmarkoptions checkboxes when the bookmark label is empty 2011-06-27 13:53:55 +02:00
Thilanka Kaushalya
6104ef1ba4 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-24 14:57:34 +05:30
Thilanka Kaushalya
045499bd75 Ajaxify the multi row export in table 2011-06-24 14:54:46 +05:30
Tyron Madlener
a08bfa3964 Hides the bookmarkoptions checkboxes when the bookmark label is empty 2011-06-22 20:45:14 +02:00
Marc Delisle
cf3930d29f Complete the code change for form renaming (rowsDeleteForm to resultsForm) 2011-06-20 16:25:11 -04:00
Thilanka Kaushalya
bdea8c332b Added ajax dialog for change in vertical rows 2011-06-19 23:23:10 +05:30
Thilanka Kaushalya
59dfaee0d7 Added the update resultsForm when there in single pageination 2011-06-19 11:30:43 +05:30
Thilanka Kaushalya
0f1a038b2d Fixed the bugs at table multi row change option 2011-06-19 10:42:43 +05:30
Thilanka Kaushalya
8604ba0303 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-18 22:38:44 +05:30
Thilanka Kaushalya
a8f258cb8d Added ajax dialog for table row change 2011-06-18 22:36:54 +05:30
Madhura Jayaratne
4338b70d9f Merge branch 'QA_3_4' 
Conflicts:
	js/sql.js
 2011-06-16 21:23:12 +05:30
Madhura Jayaratne
9d2269d297 bug #3317293 [edit] Inline edit places HTML line breaks in edit area 2011-06-16 21:05:54 +05:30
Aris Feryanto
d28d7daba1 Fix merge conflict with origin/master 2011-06-15 07:23:06 +07:00
Tyron Madlener
f08b7d52ff 3 more bugfixes 2011-06-13 18:00:33 +02:00
Tyron Madlener
2816b427ab Merge remote-tracking branch 'origin/master' 2011-06-13 15:00:11 +02:00
Tyron Madlener
f4fa0d9f79 - Dynamic chart with for the server status chart 
- Table chart replaced with a Highcharts generated chart that also behaves somewhat more intellegently
 2011-06-09 00:53:32 +02:00
Aris Feryanto
082345bdfa Merge remote-tracking branch 'origin/master' into aris 2011-06-08 13:59:38 +07:00
Tyron Madlener
fcb3273c64 -Tabs +Spaces 2011-06-08 01:53:21 +02:00
Tyron Madlener
902fc1d95d - Replaced pChart profiling chart with highchart chart 
- Moved PMA_profilingResults() function code inline in sql.php as its used at only one place
 2011-06-07 21:32:05 +02:00
Marc Delisle
31bbba5e76 Merge branch 'QA_3_4' 2011-06-07 11:44:31 -04:00
Marc Delisle
2d56821c0f Improved fix for bug #3313210 2011-06-07 11:43:30 -04:00
Marc Delisle
b5e733a2e3 Merge branch 'QA_3_4' 2011-06-07 11:10:18 -04:00
Marc Delisle
82ac1e8028 bug #3313210 [interface] Columns class sometimes changed for nothing 2011-06-07 11:06:38 -04:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Aris Feryanto
04fbe12ac7 Merge branch 'colresize' into aris 2011-06-06 14:58:27 +07:00
Aris Feryanto
1a66a483cf Merge remote-tracking branch 'origin/master' into aris 2011-06-06 14:58:24 +07:00
Aris Feryanto
b0717ff8d5 Inline edit: fix compatibility with custom 'action column' (RowActionLinks) position 2011-06-06 14:54:07 +07:00
Marc Delisle
1e0cff6161 Merge branch 'QA_3_4' 2011-06-05 06:30:23 -04:00
Jo Michael
7996a36575 patch #3311539 Inline Edit does not escape backslash 2011-06-05 06:29:46 -04:00
Marc Delisle
82823d67fe Merge branch 'QA_3_4' 2011-06-05 06:14:33 -04:00
Marc Delisle
86d3b7e58c bug #3307616 [edit] Inline edit updates multiple duplicate rows 2011-06-05 06:13:11 -04:00
Madhura Jayaratne
75091e52fd Merge branch 'QA_3_4' 
Conflicts:
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/ml.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
 2011-06-04 00:36:51 +05:30
Madhura Jayaratne
612f8f3d67 Partial fix for bug #3291306 - Inline edit does not honor bit fields. Works with mysqli extension. 2011-06-04 00:02:11 +05:30
Aris Feryanto
e1d0b67af6 Fix merge conflict caused by new syntax highlighter 2011-06-03 09:59:35 +07:00
Michal Čihař
961f170b51 Whitespace cleanup 2011-06-02 16:09:21 +02:00
Michal Čihař
d5f18d4e7f Merge branch 'integration' 
Conflicts:
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
 2011-06-02 11:41:31 +02:00
Rouslan Placella
860250f020 Fix bug #3302961 - Row check boxes missing when table row links are disabled 2011-06-02 11:39:57 +02:00
Aris Feryanto
211d76b012 Added new feature: column reordering. Some fixes in column resizing 2011-06-01 17:59:09 +07:00
Aris Feryanto
c4c57b86c3 Column resize: fix compatibility with inline edit 2011-06-01 09:25:36 +07:00
Aris Feryanto
566851d210 Add trigger to remake the resizable column when an ajax request is done 2011-05-31 09:46:25 +07:00
Aris Feryanto
9ae87854ed Add ability to resize column when browsing tables 2011-05-27 14:05:45 +07:00
Madhura Jayaratne
e936257d44 bug #3305883 [interface] Table is dropped regardless of confirmation 2011-05-22 22:01:47 +05:30
Madhura Jayaratne
b091f91f92 bug #3301249 [interface] Iconic table operations does not remove inline edit label 2011-05-17 22:15:58 +05:30
Madhura Jayaratne
8bad4aea1e Bug #3302457 - Inline edit and $cfg['PropertiesIconic'] 2011-05-15 21:15:35 +05:30
Madhura Jayaratne
626477ac8f Bug #3295529 - SQL tab multiple AJAX requests on one click 2011-05-01 11:31:55 +05:30
Marc Delisle
8f16bfbc53 Move common code into a function 2011-04-24 08:56:54 -04:00
Piotr Przybylski
10867bb1fc fix column highlighting for cases where big T is not displayed (eg. in information_schema tables) 2011-04-16 21:23:24 +02:00
Madhura Jayaratne
b64abd63f8 Bug #3286111 Inline edit save hides mysql message 2011-04-14 07:06:45 +05:30
Madhura Jayaratne
cc05f48f3c Bug #3207730 [AJAX] Inline edit and Relational display column 2011-04-11 10:55:58 +05:30
Madhura Jayaratne
63dd25baac Code formatting to improve readability. 2011-04-10 20:33:17 +05:30
Marc Delisle
5d147c25af Bug #3281316 Loading message stays on screen for too long 2011-04-10 09:01:31 -04:00
Madhura Jayaratne
e083d8438a Bug #3281333 AJAX response does not remove old contents 2011-04-09 12:03:56 +05:30