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

298 Commits

Author SHA1 Message Date
Aris Feryanto
3f10465d71 Fix merge conflict with origin/master 2011-08-12 15:56:26 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Dieter Adriaenssens
45aac8dbf4 coding style 2011-08-11 21:37:36 +02:00
Marc Delisle
a84fd8e151 Merge commit 'e3d069f6536e90dd743fb85b0ee5003efea5d9ca' 2011-08-11 07:57:30 -04:00
Michal Čihař
0829162550 Merge remote-tracking branch 'tyron/master' into integration 
Conflicts:
	js/functions.js
 2011-08-11 11:25:18 +02:00
Aris Feryanto
ba5598a190 Refactor makegrid.js 2011-08-11 13:35:51 +08:00
Aris Feryanto
e65fc63e71 Incomplete inline edit feature removal 2011-08-10 22:49:23 +08:00
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Tyron Madlener
e4924833c7 Load flashcanvas.js only for IE version below 9 2011-08-10 10:51:42 +03:00
Tyron Madlener
8cdfa37d46 Merge remote-tracking branch 'origin/master' 
Conflicts:
	js/functions.js
	js/server_status.js
	js/server_variables.js
	libraries/advisory_rules.txt
	server_status.php
 2011-08-08 16:35:10 +03:00
Tyron Madlener
666732baf2 - Merged rgbcolor.js into canvg.js 
- Status monitor now loads on demand (when tab is clicked)
 2011-08-08 14:05:55 +03:00
Michal Čihař
38d99b4e17 Use PMA_getIcon instead of duplicating logic 2011-08-08 10:05:22 +02:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Tyron Madlener
01e185831e Merge remote-tracking branch 'origin/master' 
Conflicts:
	js/functions.js
	js/server_status.js
	server_status.php
 2011-07-27 11:18:46 +03:00
Tyron Madlener
bbd1d9f26e Added documentation link to profiling status names 2011-07-26 13:35:35 +03: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
Marc Delisle
7e197b695e Fix merge conflicts 2011-07-23 08:25:49 -04:00
Marc Delisle
3534dda30a Fix merge conflicts 2011-07-23 08:16:00 -04:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Michal Čihař
36298932e2 Spacing around if 2011-07-22 09:07:57 +02: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ř
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ř
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +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
Marc Delisle
f63e1bb42a Local file inclusion vulnerability 2011-07-07 14:50:37 -04:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Aris Feryanto
60a0334661 Fix merge conflict with origin/master 2011-06-28 09:50:54 +08:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Aris Feryanto
66cb04ead5 Add new feature: show/hide column(s) while browsing a table 2011-06-24 18:18:43 +08:00
Rouslan Placella
61329e5c87 Merge branch 'master' into rte 2011-06-20 18:26:50 +01:00
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
Rouslan Placella
a0504f47d6 Merge branch 'master' into rte 2011-06-17 17:12:36 +01:00
Aris Feryanto
b3faf9cf42 Merge branch 'tablesort' into aris 2011-06-15 07:23:37 +07:00
Aris Feryanto
ff5e4c8361 Merge branch 'colresize' into aris 2011-06-15 07:23:32 +07:00
Aris Feryanto
d28d7daba1 Fix merge conflict with origin/master 2011-06-15 07:23:06 +07:00
Aris Feryanto
5bf8536831 Fix bug in 'Remember Sorting': modified caused error in PHP 2011-06-15 07:10:16 +07:00
Rouslan Placella
dda7ce9c39 Merge branch 'master' into rte 2011-06-14 19:44:09 +01:00
Aris Feryanto
2d8932b95e Better column order remembering AJAX 2011-06-14 23:38:30 +07:00
Michal Čihař
4b73c39775 Always use long <?php tags 2011-06-14 14:21:48 +02:00
Aris Feryanto
8a87d944a5 Merge branch 'tablesort' into aris 2011-06-14 09:44:10 +07:00
Aris Feryanto
916db6a936 Remember sorting: Fix criteria for browsing, following PMA_isBrowsing 2011-06-14 09:41:32 +07:00
Rouslan Placella
ebfa1dd506 Fixed "Commands out of sync" error when calling a stored routine from sql.php 2011-06-13 18:10:22 +01:00
Tyron Madlener
f08b7d52ff 3 more bugfixes 2011-06-13 18:00:33 +02:00
Aris Feryanto
cf64d5282b Remember column order only in 'Browse' tab 2011-06-13 12:08:17 +07:00
Aris Feryanto
eb7c64dfad Merge remote-tracking branch 'origin/master' into colresize 2011-06-11 10:19:10 +07:00
Aris Feryanto
0b933d2614 Fix more bug: Reordering not work correctly if table structure changed 2011-06-09 14:43:34 +07:00