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

99840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Weblate
8297dd684d Merge remote-tracking branch 'origin/master' 2015-05-20 16:49:46 +02:00
dingo thirteen
e933372dd3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3100 of 3100 strings)

[CI skip]
 2015-05-20 16:49:43 +02: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
4c361d1e0f Show column types inline 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 16:12:14 +05:30
Madhura Jayaratne
aa78a54803 Add back phpMyAdmin specific colors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 16:00:55 +05:30
Madhura Jayaratne
52f8f6080e ChangeLog entry for bug #4913 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 16:00:27 +05:30
Madhura Jayaratne
c943771434 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-20 15:50:53 +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
Weblate
49fe9d4196 Merge remote-tracking branch 'origin/master' 2015-05-20 09:10:45 +02:00
Burak Yavuz
364be7787e Translated using Weblate (Turkish) 
Currently translated at 99.9% (3097 of 3098 strings)

[CI skip]
 2015-05-20 09:10:41 +02:00
Madhura Jayaratne
f2720fa1fc Not required since page_contents is replaced 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 12:40:08 +05:30
Madhura Jayaratne
c4517f98c9 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 09:16:43 +05:30
Madhura Jayaratne
9294bf9ce1 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 09:11:05 +05:30
Madhura Jayaratne
af08e1417e bug #4911 Lock page icon is not shown after fresh reload 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 09:08:49 +05:30
Weblate
565ee39527 Merge remote-tracking branch 'origin/master' 2015-05-20 03:46:43 +02:00
Burak Yavuz
87725eefa5 Translated using Weblate (Turkish) 
Currently translated at 99.2% (3074 of 3098 strings)

[CI skip]
 2015-05-20 03:46:39 +02:00
Giovanni Sora
db07101640 Translated using Weblate (Interlingua) 
Currently translated at 69.4% (2151 of 3099 strings)

[CI skip]
 2015-05-20 03:46:36 +02:00
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
Παναγιώτης Παπάζογλου
eda8de7df7 Translated using Weblate (Greek) 
Currently translated at 100.0% (3100 of 3100 strings)

[CI skip]
 2015-05-19 22:44:53 +02:00
Marc Delisle
b5161977e7 Translated using Weblate (French) 
Currently translated at 100.0% (3098 of 3098 strings)

[CI skip]
 2015-05-19 20:12:46 +02:00
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
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
Weblate
a0ad7c112f Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-19 15:00:23 +02:00
Kristjan Räts
7460322f1c Translated using Weblate (Estonian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-19 15:00:19 +02: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