gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,062 Commits 12 Branches 481 Tags 2.4 GiB
18cfc24743
Commit Graph

217 Commits

Author SHA1 Message Date
Marc Delisle
86769cafaa Use more modern statement 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-12 07:40:58 -05:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00
Hugues Peccatte
f04a678bad Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:16:13 +01:00
Madhura Jayaratne
05a2e0305e Pass the engine to the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 11:06:18 +11:00
Madhura Jayaratne
45f11c4bb5 Template engine details page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 10:32:42 +11:00
Madhura Jayaratne
9a40624d17 Template engines list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 09:02:38 +11:00
Madhura Jayaratne
aa2f9c444a Add a controller for server engines page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 08:50:18 +11:00
Michal Čihař
3da8853467 Merge branch 'QA_4_5' 2015-12-07 16:39:31 +01:00
Michal Čihař
b96aa8ff94 Avoid duplicite fetching of table information 
We already have that, so there is no need to issue the query
again.

Fixes #11714

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:39:11 +01:00
Madhura Jayaratne
bfcd37b84f Fix #11710 Unable to add/remove on update CURRENT_TIMESTAMP option while editing a timestamp field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 17:16:50 +11:00
Madhura Jayaratne
090a7e4323 Use templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 20:14:28 +11:00
Madhura Jayaratne
2692af32d9 Use a controller for server_collations page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 19:54:29 +11:00
Madhura Jayaratne
ced43af95d More style violations in controllers fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-26 19:48:37 +11:00
Madhura Jayaratne
9416ff7c3f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-26 19:28:41 +11:00
Madhura Jayaratne
cd6e5b0025 Fix coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-26 19:26:26 +11:00
Marc Delisle
9334a2d356 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-24 10:18:58 -05:00
Madhura Jayaratne
ba8859d7df Merge branch 'master' into refactor 
Conflicts:
	db_create.php
 2015-11-24 21:07:09 +11:00
Madhura Jayaratne
8e282a3f6e Merge build_html_for_db.lib.php into ServerDatabasesController 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 20:56:04 +11:00
Madhura Jayaratne
0a2b037706 merge db_create.php into ServerDatabasesController 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 20:41:40 +11:00
Madhura Jayaratne
677ea758ca Template display_create_database.lib.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 20:12:33 +11:00
Madhura Jayaratne
3cf75085d6 Merge pull request #11676 from madhuracj/refactor 
Refactoring server databases page
 2015-11-24 08:56:43 +11:00
Madhura Jayaratne
534b13faf5 Do not pass around the generated html unnecessarily 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 14:41:40 +11:00
Madhura Jayaratne
db66f026b5 Make methods more cohesive 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 14:36:25 +11:00
Madhura Jayaratne
d11e0275ed Move tr tag to template 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 14:25:42 +11:00
Madhura Jayaratne
7e800ba504 Template database row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 14:16:30 +11:00
Madhura Jayaratne
02c1e556ae Use templating for table footer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 12:24:57 +11:00
Hugues Peccatte
54053550fd Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-21 15:04:31 +01:00
Madhura Jayaratne
bbdccfc760 Use templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-20 11:56:22 +11:00
Madhura Jayaratne
a734a1452a Wrap some long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-20 10:51:47 +11:00
Madhura Jayaratne
44dad0c15f More parameters moved to instance variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-20 10:48:43 +11:00
Madhura Jayaratne
0827e97249 Move some variables to instance level 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-20 10:40:59 +11:00
Madhura Jayaratne
0ad313540c No longer used parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-20 10:15:04 +11:00
Madhura Jayaratne
d6c1f9030a Simplify database dropping 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-20 09:50:21 +11:00
Madhura Jayaratne
0b0877829b Reduce the number of parameters being passed around 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-19 21:24:33 +11:00
Madhura Jayaratne
f40060ef3b Use local DBI 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-19 20:09:44 +11:00
Madhura Jayaratne
b930848e44 New controller for server databases page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-19 20:07:37 +11:00
Madhura Jayaratne
2fb291bbb0 Move packages for better organization 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-18 12:29:00 +11:00
Madhura Jayaratne
c8eefbeac5 Fix style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-18 10:56:05 +11:00
Madhura Jayaratne
8c1ed92460 Move to a sub package for better organization 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-18 10:49:32 +11:00
Madhura Jayaratne
21b6ca3756 Move escaping to view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-18 10:29:39 +11:00
Madhura Jayaratne
605727d961 Better method name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-18 08:17:12 +11:00
Madhura Jayaratne
399363c9b0 DocLinks can be an instance variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-18 08:13:56 +11:00
Madhura Jayaratne
c7302a09e8 More templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-18 08:00:49 +11:00
Madhura Jayaratne
26eb7c7b36 More templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-17 22:21:38 +11:00
Madhura Jayaratne
6991fe762b Use own dbi instance, Use templating 2015-11-17 21:40:50 +11:00
Madhura Jayaratne
fd098ff80e Refactor server variables page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-17 18:59:17 +11:00
Deven Bansod
e2d0d2703a Include with correct filename 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-17 03:34:48 +05:30
Marc Delisle
ea2a7a324f Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-15 06:10:12 -05:00
Deven Bansod
c62672edd0 Merge branch 'QA_4_5' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	po/cs.po
	po/fi.po
	po/it.po
	po/nb.po
	po/nl.po
	po/sv.po
 2015-11-12 23:49:31 +05:30
Deven Bansod
99be092325 Fixes issue 11661 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-12 20:05:19 +05:30