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

4397 Commits

Author SHA1 Message Date
Michal Čihař
afbe065bde Use ellipsis instead of three dots 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-04 14:18:20 +02:00
Madhura Jayaratne
9c0a2b2837 Merge branch 'QA_4_4' into QA_4_5 2015-09-02 19:27:47 +10:00
Madhura Jayaratne
aa858ae736 #11451 Designer-Bug in move.js on multiple server configuration 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-02 19:25:12 +10:00
Madhura Jayaratne
80ae3f2e58 Fix #11450 Validation fails when using functions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-02 16:54:00 +10:00
Madhura Jayaratne
d3e8dac98c Fix #11445 MySQL 5.7 and Status page for an unprivileged user 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-31 21:23:51 +10:00
Atul Pratap Singh
6074ee5afc Merge pull request #11425 from Tithugues/improveJquerySelectors_master 
Improve jQuery selectors
 2015-08-25 17:42:43 +05:30
Madhura Jayaratne
4c968434e5 Use sentence case for these as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-25 21:41:27 +10:00
Madhura Jayaratne
8d22e3ab76 Use a proper dialog for instructions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-25 13:40:39 +10:00
Madhura Jayaratne
5e170382df groupPanel may not be there is the editor is already closed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-25 12:03:55 +10:00
Hugues Peccatte
a190826020 Improve jQuery selectors. 
Remove duplicated selectors.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 21:06:27 +02:00
Marc Delisle
68767c0ce6 Merge branch 'QA_4_4' 2015-08-23 15:16:13 -04:00
Andrea Pezzino
95c8f9fd84 Fixes #11411 Undefined "replace" function on numeric scalar 
Signed-off-by: Andrea Pezzino <haxormail@gmail.com>
 2015-08-23 15:13:43 -04:00
Hugues Peccatte
3b50d8156d Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-23 13:12:05 +02:00
Hugues Peccatte
00dee1085c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-08-23 13:04:46 +02:00
Hugues Peccatte
42ee7ceb3d Add missing ";". 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-23 12:49:42 +02:00
Madhura Jayaratne
769a8aa15f Fix #11414 Unclear export options / organization / hierarchy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:06:38 +05:30
Madhura Jayaratne
c5252a32a2 Set initial values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 16:22:02 +05:30
Madhura Jayaratne
962fa4b73c Fix searching using unary geometry functions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 10:33:05 +05:30
Madhura Jayaratne
af75d2c825 Backport fix #11404 "Switch to copied table" doesn't work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 17:52:24 +05:30
Madhura Jayaratne
55c9f0f22a Fix #11404 "Switch to copied table" doesn't work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 08:44:30 +05:30
Madhura Jayaratne
e545540052 Bug remove unnecessary title after slider initialization 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 07:40:50 +05:30
Madhura Jayaratne
00f7d5ea7a Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-14 15:47:09 +05:30
Madhura Jayaratne
46f2d752a0 Confirm partition actions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-14 07:43:20 +05:30
Madhura Jayaratne
24991614e2 Fix #11382 Selecting values for set field throws JS error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 15:42:15 +05:30
Madhura Jayaratne
238b1c5e80 Use purge parameter when dropping columns as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 13:16:49 +05:30
Madhura Jayaratne
43e4e5d2f2 Clear internal cache at script handler upon version upgrade 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 13:31:03 +05:30
Madhura Jayaratne
e35450746b Merge branch 'QA_4_4' 
Conflicts:
	js/server_databases.js
 2015-08-07 07:35:41 +05:30
Madhura Jayaratne
e21c3c90b1 Fix #11364 JS error while trying to auto navigate to db structure page when db creation has failed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 07:32:17 +05:30
Madhura Jayaratne
1b96c9120c Remove tabs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 22:04:02 +05:30
Madhura Jayaratne
65269fa9ad Merge branch 'QA_4_4' 2015-08-06 22:00:04 +05:30
Madhura Jayaratne
fe12f2f9e2 Table list in navigation collapses when entering into a table in another page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 21:53:13 +05:30
Madhura Jayaratne
a60987cee1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-06 09:44:17 +05:30
Madhura Jayaratne
34a484ec96 Fix #11345 Token mismatch error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 09:40:28 +05:30
Isaac Bennetch
9ad20e82d5 Merge pull request #11330 from devenbansod/1396C 
Fixed some errors in SHA256 implementation
 2015-08-05 22:42:00 -04:00
Marc Delisle
db19812acf Merge branch 'QA_4_4' 2015-08-05 09:46:18 -04:00
Dan Ungureanu
bbd581a906 Fixes #11320. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-05 09:43:14 -04:00
Hugues Peccatte
2114cd490b Improve jQuery selector 
replace $("#name-panel").find("#page_name") by $("#page_name")
 2015-08-01 17:53:38 +02:00
Hugues Peccatte
e8e70358d3 revert jQuery selector modification 
revert $('#pma_console_options input[name=always_expand]') modification
 2015-08-01 17:52:40 +02:00
Hugues Peccatte
13e43c82bd Replace inefficient jQuery selectors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-30 21:56:22 +02:00
Marc Delisle
c30271da7a Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-30 08:33:37 -04:00
Deven Bansod
7fbb06c1c5 Fixed some errors in SHA256 implementation 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-30 03:31:02 +05:30
Isaac Bennetch
7b1765f1fd Merge pull request #1792 from devenbansod/rfe1396 
RFE #1396 : Add support for MySQL 5.6.6+ SHA256 Auth plugin
 2015-07-27 14:04:51 -04:00
Marc Delisle
5bddfec5c5 Merge pull request #11323 from madhuracj/cache 
Avoid caching JS and CSS files across phpMyAdmin versions
 2015-07-27 12:50:16 -04:00
Madhura Jayaratne
cd76cb6acc Avoid caching JS and CSS files across phpMyAdmin versions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 21:52:20 +05:30
Madhura Jayaratne
11d8de1ca9 Fix #11324 JS error while opening a new page in Desginer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 18:35:45 +05:30
Madhura Jayaratne
805b0d7860 Fix #11322 Missing null checkbox when grid editing a null cell 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 12:29:26 +05:30
Deven Bansod
56b4352719 RFE#1396 : Support MySQL 5.6.6+ SHA256 Auth Plugin 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-23 21:49:05 +05:30
Nisarg Jhaveri
7655b267e3 Remove dead comments 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-23 21:45:15 +05:30
Marc Delisle
35981069da Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-23 08:47:11 -07:00
Nisarg Jhaveri
31199faff9 Fix #1813, Delete rows using "Check All" is broken 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-23 20:03:47 +05:30