gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,339 Commits 12 Branches 481 Tags 2.4 GiB
076ec61952
Commit Graph

277 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Aris Feryanto
e9c055c5bc Column reordering: remember the last column order 2011-06-07 18:22:22 +07:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Aris Feryanto
e1d0b67af6 Fix merge conflict caused by new syntax highlighter 2011-06-03 09:59:35 +07:00
Aris Feryanto
3b7f35d5c9 Add makegrid triggering in other files 2011-06-01 12:46:12 +07:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Aris Feryanto
9ae87854ed Add ability to resize column when browsing tables 2011-05-27 14:05:45 +07:00
Aris Feryanto
cc7eade6a5 Remember table sorting: Fix for table_ref error 2011-05-25 09:01:07 +07:00
Aris Feryanto
96a253bfcc Remove debugging message 2011-05-24 16:51:30 +07:00
Aris Feryanto
c1cd10a14f Only remember sorting in Browse tab, modify the so SQL pretty printer works 2011-05-24 16:41:51 +07:00
Aris Feryanto
07de5495c4 RememberSorting: add some checking before retrieving/remembering sorting 2011-05-24 15:11:39 +07:00
Aris Feryanto
be32b88ec0 Remember table sorting in session variable 2011-05-24 13:49:00 +07:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
b2b1953db1 Start to replace warning level with error level 2011-05-03 18:52:37 -04:00
Madhura Jayaratne
e13f033d95 These are strings. 2011-04-14 07:17:53 +05:30
Madhura Jayaratne
cc05f48f3c Bug #3207730 [AJAX] Inline edit and Relational display column 2011-04-11 10:55:58 +05:30
Marc Delisle
5d147c25af Bug #3281316 Loading message stays on screen for too long 2011-04-10 09:01:31 -04:00
Atul Pratap Singh
6acf4acd25 auto get back to the Table Operations tab 2011-03-28 14:22:36 +02:00