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

212 Commits

Author SHA1 Message Date
Madhura Jayaratne
f889561c59 Get default_fk_check_value on demand rather than checking the value in every script 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 08:36:46 +05:30
Isaac Bennetch
cad0eda2c7 Merge pull request #1720 from devenbansod/rfe1594 
RFE#1594: Use plain English descriptors instead of script names for Browse, SQL, Privileges, etc links
 2015-06-12 15:13:34 -04:00
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-13 04:41:54 +05:30
Nisarg Jhaveri
620600f3b9 Foreign key check checkbox for empty/drop in db_structure 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 19:40:23 +05:30
Deven Bansod
359ca5d787 Fixed a small error in PR#1708 for RFE#701 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-02 12:12:56 +05:30
Deven Bansod
aeae86d7cc RFE#701 - Print View using CSS - Rewrite 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-01 03:57:50 +05:30
Marc Delisle
2d6cfdd700 Merge pull request #1685 from nisargjhaveri/navi_settings 
Navigation panel settings
 2015-05-22 07:57:28 -04:00
Nisarg Jhaveri
9c77ec694e Navigation panel settings 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-22 17:15:03 +05:30
Madhura Jayaratne
f0838d4080 Upgrade CodeMirror to version 5.3.0 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 15:49:40 +05:30
Nisarg Jhaveri
05fd631ed8 Some fixes in page-related settings 
- Update 'original' theme
- Fix lock icon location when settings icon is not available

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-19 18:49:37 +05:30
Nisarg Jhaveri
e115adb533 Page-related settings, rfe#1559 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-18 20:38:07 +05:30
Marc Delisle
f4a2dce952 Merge branch 'QA_4_4' 2015-05-11 07:58:51 -04:00
Marc Delisle
1b96621d1b Missing title on link 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-11 07:58:17 -04:00
Madhura Jayaratne
fb52e6af04 Closing parenthesis of a multi-line function call must be on a line by itself 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 17:57:36 +05:30
Madhura Jayaratne
927b95bc23 Merge branch 'QA_4_4' 2015-04-03 12:29:43 +05:30
Madhura Jayaratne
744e9f42e4 bug #4834 Do not attach token to css requests to improve caching 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 12:28:50 +05:30
Madhura Jayaratne
96c4bd58d2 Merge branch 'QA_4_4' 2015-04-02 22:50:44 +05:30
Madhura Jayaratne
8f1700d1eb Add additional allowed urls for recaptcha 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 22:48:44 +05:30
Madhura Jayaratne
1a2fee8fbb Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 11:06:48 +05:30
Madhura Jayaratne
57e21caab1 bug #4828 JavaScript is loaded in wrong order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 11:01:23 +05:30
Madhura Jayaratne
efa4cdc1d3 Merge branch 'QA_4_4' 2015-03-24 08:22:26 +05:30
Madhura Jayaratne
c5eb730041 Merge branch 'QA_4_3' into QA_4_4 2015-03-24 08:21:35 +05:30
Madhura Jayaratne
f4ddd75bfc Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 08:19:33 +05:30
Madhura Jayaratne
eb73dee7c9 Fix tests; auth_type might not be defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 08:16:49 +05:30
Madhura Jayaratne
1001a39e4f Merge branch 'QA_4_4' 2015-03-24 08:05:31 +05:30
Madhura Jayaratne
c560f47f8d Merge branch 'QA_4_3' into QA_4_4 2015-03-24 08:02:15 +05:30
Madhura Jayaratne
db738687c6 bug #4815 Infinite calls to index.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 07:58:28 +05:30
Dan Ungureanu
5f8f7ba88e RFE #1570, part 2. Added the possibility of permanently using Enter instead of Ctrl+Enter in console. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-03-09 01:25:28 +02:00
Atul Pratap Singh
fc257c9904 Rename configuration option as ShowDatabasesNavigationAsTree with default true 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-27 11:31:03 +05:30
Atul Pratap Singh
2b79586343 Modify the configuration option ShowNavigationAsTree to NavigationDatabasesSelector 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-24 19:18:46 +05:30
Atul Pratap Singh
2abe91a499 Add configuration option ShowNavigationAsTree with true as default 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-15 23:45:35 +05:30
Hugues Peccatte
44b4f7f7eb Update setup and documentation. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-11 16:19:42 +01:00
Madhura Jayaratne
743a528835 rfe #1590 Recaptcha API v2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-08 15:49:24 +05:30
Marc Delisle
423a8f9d49 Merge branch 'QA_4_3' 2015-01-02 09:33:58 -05:00
Marc Delisle
d95356e1dd bug #4655 Undefined index: collation_connection (second patch) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-02 09:32:19 -05:00
Madhura Jayaratne
982a5bce73 Update jquery-ui to version 1.11.2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 13:12:54 +05:30
Madhura Jayaratne
80f4bb9782 Update jquery to version 1.11.1 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 08:09:02 +05:30
Madhura Jayaratne
88089a76a7 Merge branch 'master' into Performance 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 05:06:49 +05:30
Atul Pratap Singh
d4cbccd78b Merge branch 'QA_4_2' 2014-11-02 14:09:09 +05:30
Atul Pratap Singh
e743305764 Fix bug#4574 Blank/white page when JavaScript disabled 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-11-02 13:57:48 +05:30
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues. 
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-01 22:07:18 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances. 
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 17:40:09 +01:00
Madhura Jayaratne
72b6d68d34 Do not check for the validity of all recent tables on initial loading. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-20 12:29:48 +05:30
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:39 +02:00
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02:00
Hugues Peccatte
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Nisarg Jhaveri
bf63a462cc Basic autocomplete in SQL Query editor 
- Autocomplete SQL keywords using CodeMirror hint addon
- Inline, footer SQL editors are not included
- Table/Database names completion is not implemented
- Added autocompletion to console, inline SQL editor, create view dialogue
- Autocomplete on `inputRead` instead of `change` event.

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-06 12:37:14 -04:00
Atul Pratap Singh
c70e109bd6 Feature#1546 Replace js sprintf library with a better one 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-03 17:08:25 +05:30
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Marc Delisle
c85c9fd417 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:39:21 -04:00