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

99812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
d6793673dc Translated using Weblate (French) 
Currently translated at 99.7% (3090 of 3098 strings)

[CI skip]
 2015-05-19 19:24:46 +02:00
Balázs Úr
0ec7faf436 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3096 of 3096 strings)

[CI skip]
 2015-05-19 18:01:06 +02: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
3ee7b63f6f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-19 19:02:23 +05:30
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
Kristjan Räts
37bba9e04b Translated using Weblate (Estonian) 
Currently translated at 100.0% (3099 of 3099 strings)

[CI skip]
 2015-05-19 15:04:09 +02:00
Weblate
20d7af1bc6 Merge remote-tracking branch 'origin/master' 2015-05-19 15:00:56 +02:00
Marc Delisle
bb1dcb88d1 Translated using Weblate (French) 
Currently translated at 99.2% (3076 of 3098 strings)

[CI skip]
 2015-05-19 15:00:53 +02:00
Kristjan Räts
0d91366f32 Translated using Weblate (Estonian) 
Currently translated at 99.7% (3092 of 3099 strings)

[CI skip]
 2015-05-19 15:00:50 +02:00
Kristjan Räts
75bd00a04f Translated using Weblate (Estonian) 
Currently translated at 99.7% (3091 of 3099 strings)

[CI skip]
 2015-05-19 15:00:48 +02:00
Marc Delisle
6806ccbd2d Merge branch 'QA_4_4' 2015-05-19 09:00:35 -04:00
Marc Delisle
d90ee5d49c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-19 09:00:10 -04:00
Marc Delisle
c548513505 Merge branch 'QA_4_4' 2015-05-19 08:12:26 -04:00
Marc Delisle
808bcf8ebf Merge pull request #1678 from Tithugues/b4893_qa44 
Bug 4893: Fix X position in fast_filter input and vertical line of fast_filter input.
 2015-05-19 08:11:51 -04:00
Marc Delisle
3d4a3894e4 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-19 07:59:27 -04:00
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
f7d50335bc Changelog for rfe 657 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-05-18 23:43:52 -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
Marc Delisle
dc7ba8da4c Merge pull request #1682 from nisargjhaveri/page_settings 
Page-related settings, rfe#1559
 2015-05-18 12:28:16 -04: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
Marc Delisle
b483118e38 Merge branch 'QA_4_4' 2015-05-18 07:56:31 -04:00
Marc Delisle
a5ecef4d08 Merge pull request #1680 from Tithugues/htmlIssue_qa44 
Fix HTML issue.
 2015-05-18 07:55:50 -04:00
Marc Delisle
b69b481612 Merge pull request #1679 from Tithugues/addReturns_master 
Add missing return.
 2015-05-18 07:48:34 -04:00
Madhura Jayaratne
6c52f2318c Merge branch 'QA_4_4' 2015-05-18 10:30:00 +05:30
Madhura Jayaratne
34f318e52d Allow accessing visual query builder when pmadb is not configured 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 10:28:57 +05:30
Madhura Jayaratne
f9a1590ab6 Organize table chart JavaScript code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 07:30:24 +05:30
Madhura Jayaratne
6a8e2ce9a1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-18 07:26:39 +05:30
Madhura Jayaratne
6dc5ec5085 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 07:25:33 +05:30
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
3e1e67a19a Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:23:52 +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