Commit Graph

103246 Commits

Author SHA1 Message Date
Marc Delisle
ae77949f39 Fixes #11472 Tiny translation issue in French
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-10 18:10:07 -04:00
Hugues Peccatte
f08bc1a79c Merge branch 'master' into useNamespaces_master 2015-09-10 21:27:59 +02:00
Marc Delisle
bf311efef6 Merge branch 'QA_4_5' 2015-09-10 10:26:51 -04:00
Marc Delisle
22e927e912 Merge commit 'a9cd33e' 2015-09-10 10:26:16 -04:00
Weblate
441dc1bde9 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-10 16:25:55 +02:00
Andrey Aleksanyants
946a939b98 Translated using Weblate (Armenian)
Currently translated at 62.8% (2016 of 3209 strings)

[CI skip]
2015-09-10 16:25:50 +02:00
Marc Delisle
d2475b6f8b Merge branch 'QA_4_4' into QA_4_5 2015-09-10 10:25:21 -04:00
Weblate
90a4e112fa Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-09-10 16:25:02 +02:00
Andrey Aleksanyants
c0954475bb Translated using Weblate (Armenian)
Currently translated at 62.3% (1895 of 3040 strings)

[CI skip]
2015-09-10 16:24:58 +02:00
Marc Delisle
cff9058c36 Another instance of "Invalid argument supplied for foreach()"
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-10 10:24:45 -04:00
Weblate
4459969b78 Merge remote-tracking branch 'origin/master' 2015-09-10 12:01:34 +02:00
Andrey Aleksanyants
6d103cdec9 Translated using Weblate (Armenian)
Currently translated at 62.8% (2016 of 3209 strings)

[CI skip]
2015-09-10 12:01:28 +02:00
Madhura Jayaratne
a134c074cf Merge pull request #11430 from madhuracj/rfe6297
Fix #6297 Use GET only for read only operations
2015-09-10 20:01:23 +10:00
Hugues Peccatte
42169e0258 Fix merge.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-10 08:09:51 +02:00
Hugues Peccatte
72dd9426ef Add require needed to get GLOBALS.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-09 22:16:12 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
6a163eaa46 Merge pull request #11460 from madhuracj/drizzle
Removing Drizzle support from master branch
2015-09-10 01:09:56 +10:00
Madhura Jayaratne
80f5322fe2 Remove server plugin page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:07:00 +10:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:06:58 +10:00
Madhura Jayaratne
439fc3035c Remove create_tables_drizzle.sql
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:06:56 +10:00
Madhura Jayaratne
3c17f2c3b0 Remove references to Drizzle from documentation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:06:55 +10:00
Madhura Jayaratne
e4fcf439f9 Remove references to data_dictionary
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:06:54 +10:00
Madhura Jayaratne
42d9d155e1 Remove Drizzle types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:06:52 +10:00
Madhura Jayaratne
9790a0bd47 Remove Drizzle support from DBI
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:06:50 +10:00
Madhura Jayaratne
6126c67e52 Remove Drizzle support from table class
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:47 +10:00
Madhura Jayaratne
d2e03853e8 Remove Drizzle support from operations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:45 +10:00
Madhura Jayaratne
c196b189af Remove Drizzle support from table related functionalities
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:44 +10:00
Madhura Jayaratne
902872a94b Remove Drizzle support from storage engines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:42 +10:00
Madhura Jayaratne
98372481bb Remove Drizzle from database level functions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:40 +10:00
Madhura Jayaratne
f3ff8403f2 Remove more Drizzle support
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:39 +10:00
Madhura Jayaratne
7fadb9e37f Remove Drizzle support from import and export
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:37 +10:00
Madhura Jayaratne
81b54ee423 Remove Drizzle support from navigation and menu
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:36 +10:00
Madhura Jayaratne
8dcb93c631 More server level Drizzle functions removed
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:35 +10:00
Madhura Jayaratne
d16bc93ff1 Remove Drizzle support from functionalities in server level
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:33 +10:00
Madhura Jayaratne
256be5b859 Remove tests related to Drizzle specific functionalities
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:32 +10:00
Madhura Jayaratne
6401ad9b54 Merge branch 'QA_4_5' 2015-09-10 00:55:48 +10:00
Weblate
a9cd33e4d0 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-09 16:53:30 +02:00
Andrey Aleksanyants
14e0db03af Translated using Weblate (Armenian)
Currently translated at 62.7% (2015 of 3209 strings)

[CI skip]
2015-09-09 16:53:28 +02:00
Madhura Jayaratne
b333793375 Merge branch 'QA_4_4' into QA_4_5 2015-09-10 00:53:15 +10:00
Madhura Jayaratne
0bc6f30f5d Change value for lower_case_table_names
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 00:47:30 +10:00
Madhura Jayaratne
08ac7e630d Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-09-10 00:44:24 +10:00
Madhura Jayaratne
ef5177f555 Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 00:43:26 +10:00
Weblate
fc58d4518f Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-09-09 16:35:18 +02:00
Andrey Aleksanyants
eca6bc5864 Translated using Weblate (Armenian)
Currently translated at 62.3% (1894 of 3040 strings)

[CI skip]
2015-09-09 16:35:13 +02:00
Madhura Jayaratne
9131b59936 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 00:34:47 +10:00
Madhura Jayaratne
dbf9ff2723 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 00:31:52 +10:00
Weblate
c4f47e4f46 Merge remote-tracking branch 'origin/master' 2015-09-09 15:27:33 +02:00
Andrey Aleksanyants
9d4aa40498 Translated using Weblate (Armenian)
Currently translated at 62.7% (2015 of 3209 strings)

[CI skip]
2015-09-09 15:27:28 +02:00
Marc Delisle
23361fd2c5 Improve wording
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-09 09:27:20 -04:00
Marc Delisle
7ab576930b 4.5.0-rc1
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-09 06:03:45 -04:00