Commit Graph

102682 Commits

Author SHA1 Message Date
Madhura Jayaratne
611222d414 Only RANGE and LIST type partitions allow having subpartitions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-27 20:44:22 +10:00
Madhura Jayaratne
7c325469d5 Fix #11490 UI for defining partitioning in create table window
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-25 14:44:28 +10:00
Madhura Jayaratne
12307045c0 Merge branch 'QA_4_5' 2015-09-22 21:57:08 +10:00
Madhura Jayaratne
2da36e93b2 Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 21:35:05 +10:00
Madhura Jayaratne
5f55156c81 Fix doc comments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 21:17:42 +10:00
Madhura Jayaratne
7ec4bcdbea Use include for files being included conditionally
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 21:11:11 +10:00
Madhura Jayaratne
f1ca1c97e5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-09-22 21:04:31 +10:00
Madhura Jayaratne
3d192002bb Expected 1 space after FUNCTION keyword
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 21:03:16 +10:00
Marc Delisle
84a49947e5 Merge pull request #11471 from madhuracj/issue11464
Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
2015-09-22 07:02:43 -04:00
Weblate
3968a723ab Merge remote-tracking branch 'origin/master' 2015-09-22 13:01:37 +02:00
Martin Lacina
9901aeddd0 Translated using Weblate (Slovak)
Currently translated at 82.8% (2659 of 3209 strings)

[CI skip]
2015-09-22 13:01:32 +02:00
Madhura Jayaratne
45c05e3ad6 Fix coding style violations related to function calls
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 21:00:47 +10:00
Madhura Jayaratne
f70add88d6 Return the MySQL version
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 17:27:55 +10:00
Madhura Jayaratne
75d7927604 Do not suggest upgrading when there is no compatible versions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-21 21:37:55 +10:00
Marc Delisle
7a2b16dc30 Merge branch 'QA_4_5' 2015-09-20 06:24:24 -04:00
Marc Delisle
f18ac85048 4.4.15 release date
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-20 06:23:57 -04:00
Marc Delisle
0b87f93fec Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-19 13:21:17 -04:00
Marc Delisle
ced0d39979 Use function parameter instead of global
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-18 18:05:59 -04:00
Marc Delisle
5d008acb33 Fix param doc
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-18 13:56:25 -04:00
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