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

13808 Commits

Author SHA1 Message Date
Marc Delisle
d248f77458 Fix issues 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-21 15:03:24 -04:00
Marc Delisle
b3b2360c75 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-05-21 14:27:39 -04:00
Marc Delisle
8d4f2cb4b0 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-21 14:27:36 -04:00
Atul Pratap Singh
319285f13b Merge pull request #1671 from gzzhanghao/template 
Updates on PMA\Template class
 2015-05-21 23:13:44 +05:30
Madhura Jayaratne
6e69012eb4 #4912 "Highlight pointer" and "Row marker" doesn't work properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:01:57 +05:30
Madhura Jayaratne
a4651f896c Navi legacy - Do not show database dropdown when no database is selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 11:16:22 +05:30
Isaac Bennetch
a9cd7d5604 Merge pull request #1683 from devenbansod/657corrections 
'Realign Privileges' should be shown only when EDITING
 2015-05-20 11:24:44 -04:00
Isaac Bennetch
ff169e51ef Merge pull request #1681 from devenbansod/1485Corrections 
Fixed some issues in Pull#1662 commit for RFE#1485
 2015-05-20 11:15:43 -04:00
Marc Delisle
834c35044d Remove a loose comparison warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-20 10:49:36 -04:00
Marc Delisle
9c42b7796d Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-20 09:02:04 -04:00
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
Madhura Jayaratne
4033127277 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-20 07:16:13 +05:30
Madhura Jayaratne
88b3401c15 Allow providing a callback function to retrieve value if it is not already set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 07:15:07 +05:30
Deven Bansod
e0de033b4f Realign Privileges should be shown only when EDITING 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-05-19 23:28:29 +05:30
Jason
c6dfa49e60 Improve template system 
- Introduce `trim` method for templates
- Complete template of the designer module
- Update tests for template system
- Use phtml as template files extension

Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-20 01:34:33 +08:00
Marc Delisle
aa57d15ca7 Merge pull request #1684 from nisargjhaveri/page_settings_fix 
Some fixes in page-related settings
 2015-05-19 10:36:29 -04:00
Madhura Jayaratne
d465bc0e5f Fix collation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 19:00:04 +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
Madhura Jayaratne
114581e97f lower_case_table_names is read only and can be cached 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 16:58:49 +05:30
Madhura Jayaratne
535c1a4cb5 Adhere to DisableIS here as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 16:19:19 +05:30
Madhura Jayaratne
9323bd5044 Allow avoiding querying information_schema for listing routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 16:10:55 +05:30
Madhura Jayaratne
f2fc6b335d There is a comment field for routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 15:29:45 +05:30
Madhura Jayaratne
7d9222fbfc Match column names returned by SHOW query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 12:44:09 +05:30
Madhura Jayaratne
1b968b4e87 Respect DisableIS directive when fetching events 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 12:43:12 +05:30
Madhura Jayaratne
5abed64ae1 Remove unused parameter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 12:08:07 +05:30
Madhura Jayaratne
75d5890022 bug #4910 Slowness due to large number of routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 12:00:13 +05:30
Isaac Bennetch
b4f477377c Merge branch 'QA_4_4' 2015-05-18 23:55:16 -04:00
Isaac Bennetch
a8e32997d4 Fix documentation referring to obsolete vertical display mode 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-05-18 23:52:28 -04:00
Isaac Bennetch
46ba4603ac Merge pull request #1664 from devenbansod/rfe657 
RFE 657 : Realigning privileges after DB/Tbl/Col/Proc Rename/Copy/Move
 2015-05-18 23:39:29 -04:00
Deven Bansod
5b8e97ce80 RFE 657 : Realigning privileges after DB/Tbl/Col/Proc Rename/Copy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Changed some Variable-names and
Fixed an error with procs_priv insert.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-05-19 13:21:48 +05:30
Hugues Peccatte
c7e7089a7b Update PHPDoc. 
Remove unused variable.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-18 22:20:32 +02:00
Nisarg Jhaveri
e115adb533 Page-related settings, rfe#1559 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-18 20:38:07 +05:30
Madhura Jayaratne
74a9200c60 rfe #1671 Directly show table comments in structure view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 19:31:50 +05:30
Madhura Jayaratne
9929ef129b Fix comments, Fix column count 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 18:37:31 +05:30
Deven Bansod
59889243ff Fixed some issues in Pull#1662 commit 
Checks for LINEAR HASH and LINEAR KEY partition types were missing.
These can not be DROPped, should be COALESCEd instead.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-05-18 18:10:35 +05:30
Marc Delisle
b483118e38 Merge branch 'QA_4_4' 2015-05-18 07:56:31 -04:00
Marc Delisle
b69b481612 Merge pull request #1679 from Tithugues/addReturns_master 
Add missing return.
 2015-05-18 07:48:34 -04:00
Hugues Peccatte
f3a7f4e6d1 Fix HTML issue. 
A <a> tag wasn't closed.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:42:57 +02:00
Hugues Peccatte
8fc71be95c Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:31:55 +02:00
Hugues Peccatte
5130e854d5 Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:26:35 +02:00
Hugues Peccatte
071e78a64f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-05-17 15:24:38 +02:00
Hugues Peccatte
f305c14d1d PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:12:32 +02:00
Hugues Peccatte
f0792503e9 Update to fix tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 14:24:31 +02:00
Hugues Peccatte
18625f3bbf Update PHPDoc and minor coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 13:15:08 +02:00
Hugues Peccatte
d3dd47217e Add missing return. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 12:54:37 +02:00
Marc Delisle
b4d432f7f3 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-17 06:44:38 -04:00
Marc Delisle
0f3d104d0f Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-17 06:17:34 -04:00
Marc Delisle
95ac6b46dd 4.4.8-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-16 06:57:15 -04:00
Marc Delisle
857f8fce46 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 14:29:11 -04:00
Marc Delisle
bb8a420d8c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 13:56:39 -04:00