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

192 Commits

Author SHA1 Message Date
Tyron Madlener
cf95fbdcb5 server status page using new qtip function 2011-08-08 16:16:53 +03:00
Aris Feryanto
ca0aa169c0 Fix merge conflict with grid branch 2011-08-08 15:48:51 +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
Ammar Yasir
33ad955596 Merge remote branch 'phpmyadmin/master' 2011-08-07 10:55:41 +05:30
Michal Čihař
cf004d89ca Move PMD scripts to js directory. 
We should have all scripts in single place and this will include them in
compression on release.
 2011-08-05 14:52:47 +02:00
Tyron Madlener
f4afe963b6 Advisor: 
- l10n in php/js code
 - code style improvements
 - ui style improvements
 - syntax/run errors in advisory_rules.txt are now displayed in advisor tab
 2011-08-05 15:50:06 +03:00
Aris Feryanto
8eff621a15 Fix bug - duplicate ID in some data and text for makegrid.js 2011-08-02 10:20:41 +08:00
Tyron Madlener
b04ca6294a Merge remote-tracking branch 'origin/master' 
Conflicts:
	server_status.php
 2011-07-31 16:00:15 +03:00
Madhura Jayaratne
ed5c01dc44 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-31 16:13:26 +05:30
Ammar Yasir
e83f3acd26 Added to 'How to use' message content, strings are converted into integers for plotting purpose. 2011-07-31 12:35:07 +05:30
Ammar Yasir
32969f3d42 Merge remote branch 'phpmyadmin/master' 2011-07-31 07:14:01 +05:30
Marc Delisle
7180596152 Typo 2011-07-30 14:13:08 -04:00
Madhura Jayaratne
aed7270cb9 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-30 22:53:07 +05:30
Marc Delisle
99b68dff9e Better wording 2011-07-30 07:36:14 -04:00
Tyron Madlener
a2b6df6fb7 Merge remote-tracking branch 'origin/master' 2011-07-29 18:18:26 +03:00
Marc Delisle
d29674f9b1 Better wording 2011-07-29 10:06:49 -04:00
Marc Delisle
b2613f3495 Typo 2011-07-29 09:55:39 -04:00
Tyron Madlener
0017203945 Chart Grid importing and exporting feature. 2011-07-28 19:59:17 +03:00
Tyron Madlener
29168e1a0a Monitor: Chart title and series names now editable 2011-07-27 17:38:15 +03: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
Madhura Jayaratne
b48a250ca8 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-26 21:45:43 +05:30
Tyron Madlener
74ef217ffd Query Analyzer Dialog: 
- Show all explains
- Mark bad explain values as red
 2011-07-26 16:03:17 +03:00
Tyron Madlener
6d7244eeea - Live charting: Error message on invalid server response 
- Fixed bugged CPU chart not displaying anything
 2011-07-25 22:10:52 +03:00
Ammar Yasir
9388cd35b6 Re:Validations for input form submit (missed addidng messages.php file) 2011-07-25 19:50:02 +05:30
Ammar Yasir
d9486e2597 Validations for input form submit 2011-07-25 19:45:00 +05:30
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
Ammar Yasir
18a6f0b070 Merge remote branch 'phpmyadmin/master' 2011-07-25 04:49:22 +05:30
Marc Delisle
57e0b321f1 Typos 2011-07-24 14:41:46 -04:00
Madhura Jayaratne
ec7feea9b0 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
	libraries/zip_extension.lib.php
 2011-07-24 23:05:35 +05:30
Ammar Yasir
7c66a8bed5 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/highcharts/highcharts.js
 2011-07-22 16:50:30 +05:30
Thilanka Kaushalya
3a2d3e3c4e Ajaxified add columns option in table structure 2011-07-21 23:53:37 +05:30
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
Tyron Madlener
c30d209146 Query Analyzer Dialog v0.1 2011-07-21 13:38:51 +03:00
Madhura Jayaratne
6f35aaa8e4 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
 2011-07-20 23:15:01 +05:30
Piotr Przybylski
75bb94f923 Fix strings 2011-07-20 18:52:28 +02:00
Michal Čihař
fbc2bbdc49 Unlock session while serving JS messages 2011-07-20 15:04:52 +02:00
Tyron Madlener
5022829ae6 Monitor Logs Feature: Grouping of Queries, ignoring variable data in WHERE Statements 2011-07-20 12:08:05 +03:00
Madhura Jayaratne
ba93a625b9 Make JS messages translatable. 2011-07-16 13:14:29 +05:30
Ammar Yasir
811996e92a Merge remote branch 'phpmyadmin/master' 2011-07-15 00:38:31 +05:30
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
Madhura Jayaratne
c97bb57925 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/madhuracj into OpenGIS 2011-07-14 19:45:16 +05:30
Madhura Jayaratne
b1634f80fd GIS data editor extended for JS enabled browsers 2011-07-14 19:39:39 +05:30
Tyron Madlener
e2dae437e1 - No CPU,Memory & Swap Charts for DB servers that are not localhost 
- Everything now internationalized (phew, this took a while)
 2011-07-11 20:42:19 +03:00
Ammar Yasir
12c1471c9b Changed text for 'How to use?' link 9$js_messages['strDisplayHelp']) 2011-07-08 02:26:56 +05:30
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Rouslan Placella
15ad6605b1 Set 'maxlength' of input fields in HTML, instead of validating against a maximum length in JS. 2011-07-05 11:38:46 +01:00
Ammar Yasir
03a1a84b78 Test 2011-07-05 05:21:16 +05:30
Ammar Yasir
78f93fdd3c Merge remote branch 'phpmyadmin/master' 2011-07-04 21:58:47 +05:30
Thilanka Kaushalya
311804dd72 Removed the modification for the multi row Export in Table Browse 2011-07-03 10:52:16 +05:30
Thilanka Kaushalya
05519a2bca Changed the link name in show hide indexes 2011-07-02 21:17:37 +05:30
Thilanka Kaushalya
71bb5415d8 Added show hide option for index table in table structure 2011-07-02 15:16:00 +05:30
Ammar Yasir
2a4c47c0a2 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	tbl_select.php
 2011-07-01 15:34:39 +05:30
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
Piotr Przybylski
0e535038a1 Allow to drop database when AllowUserDropDatabase is true 2011-06-23 23:28:04 +02:00
Tyron Madlener
c7cf7574e4 - Status page now displaying server variable Questions instead of the sum of the Com_ statements. 'Questions' is an established performance measure, the sum of the Com_ statements is not 
- Query pie chart displays always at least 7 statement types
- Live charts now use the server time on the x-axis, making them independent of time-zones
 2011-06-22 10:22:22 +02:00
Ammar Yasir
fb8a4956a8 Merge remote branch 'phpmyadmin/master' 2011-06-21 04:35:24 +05:30
Rouslan Placella
61329e5c87 Merge branch 'master' into rte 2011-06-20 18:26:50 +01:00
Thilanka Kaushalya
bdea8c332b Added ajax dialog for change in vertical rows 2011-06-19 23:23:10 +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
Rouslan Placella
a0504f47d6 Merge branch 'master' into rte 2011-06-17 17:12:36 +01:00
Rouslan Placella
6ba8170aab Validation for fields that can be too long in routine ditor. 2011-06-17 15:08:13 +01:00
Marc Delisle
edf3e1ad32 Should use kibibytes here, see http://en.wikipedia.org/wiki/Kibibyte 2011-06-17 08:16:13 -04:00
Ammar Yasir
9498f5d4cd Merge remote branch 'phpmyadmin/master' 2011-06-17 01:06:38 +05:30
Tyron Madlener
ab5d9b278a Cleaned up code 2011-06-16 15:03:04 +02:00
Rouslan Placella
dda7ce9c39 Merge branch 'master' into rte 2011-06-14 19:44:09 +01:00
Rouslan Placella
279ef37298 Warn the user if the definition of a stored function does not contain a return statement. 2011-06-14 15:45:39 +01:00
Tyron Madlener
d26cace15b Traffic charting for traffic tab on status page 2011-06-13 23:36:07 +02:00
Tyron Madlener
2816b427ab Merge remote-tracking branch 'origin/master' 2011-06-13 15:00:11 +02:00
Ammar Yasir
763fa66d72 Merge remote branch 'phpmyadmin/master' 2011-06-09 02:54:33 +05:30
Rouslan Placella
3a6a30d5ba Merge brach 'master' into 'rte' 2011-06-08 12:07:43 +01:00
Tyron Madlener
855532ea2e replace pChart with highchart for the query statistics 2011-06-07 14:54:51 +02:00
Marc Delisle
ce65b14ced Change redundant message 2011-06-07 06:29:32 -04:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Rouslan Placella
c27b2e776b Merge branch 'master' into rte 2011-06-06 12:44:15 +01:00
Ammar Yasir
a4fda9e8f9 Merge remote branch 'phpmyadmin/master' 2011-06-06 04:16:55 +05:30
Tyron Madlener
207bfd47e3 - Fix: Hide refresh button only for current tab 
- Fix: Tablesorter sorts thousands-seperated values correctly
 2011-06-02 15:22:28 +02:00
Tyron Madlener
71cc8fec3d - Query chart: 
- Point tooltip now shows what type of queries have been issued
 - Changed data from 'Seconds per Query' to 'Seconds since last refresh'
 2011-06-01 17:49:27 +02:00
Rouslan Placella
5f9fed0b5c Refactored JS used to drop Routines, Triggers and Events. 2011-06-01 16:11:06 +01:00
Thilanka Kaushalya
b1c12a0b74 Added Ajax behaviour to Add a new user in database privileges 2011-05-31 23:15:24 +05:30
Ammar Yasir
459b57ca57 Merge remote branch 'phpmyadmin/master' 2011-05-27 17:46:30 +05:30
Ammar Yasir
ae44636606 Made some changes on the tbl_select.php page to add a link for Zoom Search. 
Please dont mind the coding, I just coded very quickly to get back comments. If the flow of the interface is ok I'll code it properly.
 2011-05-23 21:26:07 +05:30
Madhura Jayaratne
8590dc5a7f Merge branch 'QA_3_4' 2011-05-17 22:20:54 +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
Marc Delisle
43b9ae2025 Activate new messages in db search 2011-05-17 12:35:25 -04:00
Yuichiro
e53fa42980 Patch #3302354 Add gettext wrappers around a message 2011-05-15 13:40:11 -04:00
Thilanka
4d3d5eb46d Patch #3256122 [search] Show/hide db search results 2011-05-15 13:07:32 -04:00
Marc Delisle
ecd28686b8 "up to date" message on main page when current version is up to date 2011-05-13 06:37:15 -04:00
Atul Pratap Singh
9210f44a61 When leaving the designer page without saving layout, it now asks for user confirmation 2011-05-11 13:44:06 +02:00
Benoit Dumesnil
b37d10c3f1 Feature Request #3187076 
This patch transforms the old-style pop-up of truncate and drop table
to a ajax style pop-up
 2011-05-11 13:38:41 +02:00
Marc Delisle
8d2531d658 In Synchronize panel, make image changes independant from the original theme 2011-03-11 13:16:36 -05:00
Marc Delisle
0242446e46 Localize hide/submit messages 
Replace submit with Save (an existing message)
 2011-03-05 07:13:43 -05:00
Marc Delisle
efa8e3421b Deactivate these messages as we are currently in message freeze for 3.4 2011-02-28 12:50:02 -05:00
Thilanka
a994e13c33 Ajaxify browse and delete criteria in DB search 2011-02-28 12:44:44 -05:00
Michal Čihař
011d87f39a Better message. 
We will announce only stable versions this way.
 2011-02-02 14:39:55 +01:00
Michal Čihař
5b28e356aa Display notification if newer version is available. 
This is done using asynchronous javascript so it should not block any
actions.
 2011-02-02 14:22:11 +01:00
Marc Delisle
9adcdc08d9 Replace inline Javascript by a function that attaches a date/time picker to the elements which need it 2011-01-16 11:36:29 -05:00