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

102662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
f40f5d10f4 Merge branch 'QA_4_5' 2015-09-18 21:09:16 +10:00
Madhura Jayaratne
4acfae901c Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-09-18 21:07:32 +10:00
Madhura Jayaratne
16d7261d38 ChangeLog for issue #11491 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 21:06:55 +10:00
Madhura Jayaratne
deb78cf3af Merge branch 'QA_4_5' 2015-09-18 20:59:26 +10:00
Weblate
be82ece981 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-18 12:57:30 +02:00
Andrey Aleksanyants
b033ec41e3 Translated using Weblate (Armenian) 
Currently translated at 67.0% (2151 of 3209 strings)

[CI skip]
 2015-09-18 12:57:27 +02:00
Madhura Jayaratne
74dcc98f11 Merge branch 'QA_4_4' into QA_4_5 2015-09-18 20:57:01 +10:00
Madhura Jayaratne
89d10fcbb6 Fix #11487 Warning when entering Query page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 20:55:13 +10:00
Madhura Jayaratne
e11f848074 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 20:50:10 +10:00
Madhura Jayaratne
d466b3d3fe Add plugin icon 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 17:21:47 +10:00
Madhura Jayaratne
f99c7db844 Add page name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 17:17:46 +10:00
Madhura Jayaratne
f38b11c175 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-09-18 17:11:01 +10:00
Madhura Jayaratne
74b183add4 Add server plugins page. Recovered partially from Drizzle support 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 17:09:51 +10:00
Weblate
645e2795fb Merge remote-tracking branch 'origin/master' 2015-09-18 08:56:28 +02:00
Andrey Aleksanyants
d4ce46a645 Translated using Weblate (Armenian) 
Currently translated at 67.0% (2151 of 3209 strings)

[CI skip]
 2015-09-18 08:56:24 +02:00
Madhura Jayaratne
bf0808513f Consistently use a small note rather than a hint 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 15:14:56 +10:00
Madhura Jayaratne
352194895f Merge branch 'QA_4_5' 2015-09-18 14:21:57 +10:00
Weblate
aa65bfac6c Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-18 06:19:03 +02:00
Michal Čihař
c7572267cb Translated using Weblate (Malay) 
Currently translated at 10.4% (336 of 3209 strings)

[CI skip]
 2015-09-18 06:19:00 +02:00
Madhura Jayaratne
e03a656061 Fix #11491 Propose table structure broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 14:18:40 +10:00
Madhura Jayaratne
cb55cdfe39 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-09-18 08:21:32 +10:00
Madhura Jayaratne
071a26de7f Use the local variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 08:19:19 +10:00
Weblate
b8c6fdff58 Merge remote-tracking branch 'origin/master' 2015-09-18 00:10:27 +02:00
Michal Čihař
3114240f9c Translated using Weblate (Malay) 
Currently translated at 10.4% (336 of 3209 strings)

[CI skip]
 2015-09-18 00:10:21 +02:00
Madhura Jayaratne
c5d05559d2 ChangeLog for issue #11479 Allow setting routine wise privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 08:10:00 +10:00
Marc Delisle
95f6edeaa2 Merge branch 'QA_4_5' 2015-09-17 09:11:09 -04:00
Marc Delisle
8213a607a9 Merge commit 'b54ada4' 2015-09-17 09:11:00 -04:00
Weblate
6d9bffe16a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-17 15:10:34 +02:00
Xosé Calvo
d50248a393 Translated using Weblate (Galician) 
Currently translated at 82.5% (2650 of 3209 strings)

[CI skip]
 2015-09-17 15:10:31 +02:00
Michal Čihař
312853c40c Translated using Weblate (Danish) 
Currently translated at 94.6% (3037 of 3209 strings)

[CI skip]
 2015-09-17 15:10:29 +02:00
Andrey Aleksanyants
127dfddc80 Translated using Weblate (Armenian) 
Currently translated at 66.5% (2136 of 3209 strings)

[CI skip]
 2015-09-17 15:10:27 +02:00
Marc Delisle
5b4559b369 Merge branch 'MAINT_4_5_0' into QA_4_5 2015-09-17 09:10:02 -04:00
Marc Delisle
369c411ed0 Fixes #11489 Cannot copy a database under certain conditions 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-17 09:09:09 -04:00
Weblate
7b0d05ce23 Merge remote-tracking branch 'origin/master' 2015-09-17 14:39:52 +02:00
Andrey Aleksanyants
6dd522cf0f Translated using Weblate (Armenian) 
Currently translated at 66.5% (2136 of 3209 strings)

[CI skip]
 2015-09-17 14:39:47 +02:00
Marc Delisle
ecfba93919 Merge pull request #11488 from jublonet/feature/bookmark-form-a11y 
Browse table bookmark form: Clickable labels
 2015-09-17 08:39:43 -04:00
Joshua Atkins
0aa5c847dd Browse table bookmark form: Clickable labels 
Make text field and check box labels clickable in the Browse table page,
create SQL bookmark form.

Signed-off-by: Joshua Atkins <support@jublo.net>
 2015-09-17 11:05:40 +02:00
Weblate
1665282cb8 Merge remote-tracking branch 'origin/master' 2015-09-16 23:43:56 +02:00
Xosé Calvo
d4494f744f Translated using Weblate (Galician) 
Currently translated at 82.6% (2651 of 3209 strings)

[CI skip]
 2015-09-16 23:43:51 +02:00
Michal Čihař
224b88436b Translated using Weblate (Danish) 
Currently translated at 94.6% (3037 of 3209 strings)

[CI skip]
 2015-09-16 23:43:47 +02:00
Andrey Aleksanyants
c0b2bafe6a Translated using Weblate (Armenian) 
Currently translated at 64.7% (2077 of 3209 strings)

[CI skip]
 2015-09-16 23:43:45 +02:00
Madhura Jayaratne
ae7877af56 Merge pull request #11485 from madhuracj/issue11479 
Implement issue #11479 - routine wise privileges
 2015-09-17 07:43:42 +10:00
Madhura Jayaratne
fcaf6e360a Fix #11479 Allow setting routine wise privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-17 07:36:51 +10:00
Weblate
5d66102326 Merge remote-tracking branch 'origin/master' 2015-09-16 14:27:30 +02:00
Aputsiaĸ Niels Janussen
608ab74a26 Translated using Weblate (Danish) 
Currently translated at 94.6% (3036 of 3209 strings)

[CI skip]
 2015-09-16 14:27:24 +02:00
Michal Čihař
85d8a644bb Merge remote-tracking branch 'origin/QA_4_5' 2015-09-16 14:27:12 +02:00
Weblate
b54ada4335 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-16 14:26:57 +02:00
Aputsiaĸ Niels Janussen
4637bb6201 Translated using Weblate (Danish) 
Currently translated at 94.6% (3036 of 3209 strings)

[CI skip]
 2015-09-16 14:26:55 +02:00
Michal Čihař
5eeda62772 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_5 2015-09-16 14:26:01 +02:00
Michal Čihař
959679ab5e Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-16 14:25:25 +02:00