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

102211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
2c4b083810 Merge commit 'c7342b7' 2015-08-31 08:46:05 -04:00
Marc Delisle
63680d4514 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-31 08:45:42 -04:00
Marc Delisle
e9c515b96d Merge commit '087fe8a' 2015-08-31 08:43:32 -04:00
Marc Delisle
b945a50293 Merge commit '6df17fd' 2015-08-31 08:43:00 -04:00
Marc Delisle
c7342b7ffd Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-31 08:37:58 -04:00
Marc Delisle
1438aa881b Merge commit '6df17fd' into QA_4_5 2015-08-31 08:33:30 -04:00
Marc Delisle
9642af4ed5 Fixes #11447 MySQL 5.5 and the language system variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-31 08:32:50 -04:00
Madhura Jayaratne
087fe8a72f Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-31 22:26:11 +10:00
Madhura Jayaratne
dbb4dceeaa Merge branch 'QA_4_5' 2015-08-31 21:25:11 +10:00
Madhura Jayaratne
d3e8dac98c Fix #11445 MySQL 5.7 and Status page for an unprivileged user 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-31 21:23:51 +10:00
Marc Delisle
02adcde835 Merge branch 'QA_4_5' 2015-08-31 07:02:05 -04:00
Marc Delisle
ca917746b6 Merge pull request #11444 from madhuracj/show 
Fix #11442 MySQL 5.7 and SHOW VARIABLES
 2015-08-31 07:01:36 -04:00
Madhura Jayaratne
788c96e8c7 Fix #11442 MySQL 5.7 and SHOW VARIABLES 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-31 17:10:32 +10:00
Isaac Bennetch
b703e9a84c Add Deven (GSoC 2015) to credits 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-08-30 22:19:58 -04:00
Marc Delisle
0351229274 Merge branch 'QA_4_5' 2015-08-30 08:44:04 -04:00
Marc Delisle
993134cacd Missing column comments in table Structure 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-30 08:43:44 -04:00
Marc Delisle
41f58ca580 Clarify explanation for directives 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-30 08:35:18 -04:00
Marc Delisle
16c5137ee7 Remove unneeded code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-30 08:25:09 -04:00
Marc Delisle
04b31e14f9 Use braces 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-30 07:53:47 -04:00
Amir Hamzah
6df17fd222 Translated using Weblate (Malay) 
Currently translated at 11.6% (355 of 3040 strings)

[CI skip]
 2015-08-29 19:44:41 +02:00
Chien Wei Lin
333f5551ed Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.7% (3032 of 3040 strings)

[CI skip]
 2015-08-29 19:44:41 +02:00
Marc Delisle
5817df125c Fix type declaration 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-29 09:39:27 -04:00
Marc Delisle
8b09b1be81 Merge branch 'QA_4_5' 2015-08-29 07:36:42 -04:00
monojp
6b75c5a43d Fix irregular length (different from the inputs) of select element on login form 
Signed-off-by: Martin Herndl <martin.herndl@world4you.com>

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-29 07:33:56 -04:00
monojp
de3e32fe27 Avoid caching theme sprites CSS across phpMyAdmin versions analogue to cd76cb6acc 
Signed-off-by: Martin Herndl <martin.herndl@world4you.com>

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-29 07:33:20 -04:00
Marc Delisle
2192acf343 Merge pull request #11440 from monojp/w4y-patches 
login form style fix, sprites css caching fix and extended security-related HTTP headers
 2015-08-29 07:31:50 -04:00
Madhura Jayaratne
2a5a3784ed Merge branch 'QA_4_5' 2015-08-29 17:25:48 +10:00
Madhura Jayaratne
ab00a2af65 Add missing 'sql_create_database' to setup and user preferences. Organize export relation options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-29 17:24:30 +10:00
Madhura Jayaratne
6362e031c9 ChangeLog entry for issue #11436 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-29 17:03:20 +10:00
Marc Delisle
f42f9021ae Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-28 16:23:55 -04:00
Marc Delisle
0347149d18 Merge branch 'QA_4_5' 2015-08-28 08:20:22 -04:00
Marc Delisle
c6a3671e6c Fixes #11434 Class 'SqlParser\Lexer' not found 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-28 08:19:40 -04:00
Madhura Jayaratne
1f7b0903f8 Merge branch 'QA_4_5' 2015-08-28 20:32:56 +10:00
Madhura Jayaratne
0753fb86d0 Merge pull request #11441 from madhuracj/issue11436 
Fix #11436 CREATE DATABASE should be enabled by default on server exports
 2015-08-28 20:30:20 +10:00
Weblate
b90912f5f2 Merge remote-tracking branch 'origin/master' 2015-08-28 11:46:55 +02:00
Amir Hamzah
097c97af5a Translated using Weblate (Malay) 
Currently translated at 10.7% (344 of 3207 strings)

[CI skip]
 2015-08-28 11:46:50 +02:00
Madhura Jayaratne
822ff85ff7 Merge branch 'QA_4_5' 2015-08-28 19:46:37 +10:00
Weblate
c545f5d3ee Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-08-28 11:44:46 +02:00
Amir Hamzah
ec1632b45e Translated using Weblate (Malay) 
Currently translated at 10.7% (344 of 3207 strings)

[CI skip]
 2015-08-28 11:44:45 +02:00
Madhura Jayaratne
2c4ef3888d Fix bug - Do not export sys database when exporting server 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-28 19:44:33 +10:00
Madhura Jayaratne
154d62d27d Fix #11436 CREATE DATABASE should be enabled by default on server exports 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-28 18:52:37 +10:00
diprofinfiniti
ee9c505175 Translated using Weblate (Malay) 
Currently translated at 10.7% (344 of 3207 strings)

[CI skip]
 2015-08-28 06:06:51 +02:00
diprofinfiniti
bf3d1574c1 Translated using Weblate (Malay) 
Currently translated at 11.6% (355 of 3040 strings)

[CI skip]
 2015-08-28 06:06:46 +02:00
diprofinfiniti
a3d0f5fdd9 Translated using Weblate (Malay) 
Currently translated at 10.7% (344 of 3207 strings)

[CI skip]
 2015-08-28 06:06:41 +02:00
Marc Delisle
8e3f821eba Remove dead code 
Initialize array

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-27 15:19:47 -04:00
Marc Delisle
c76e7c8c46 Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-27 15:13:58 -04:00
Marc Delisle
571f50ea65 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-27 12:59:24 -04:00
Marc Delisle
12c28e09a9 Merge commit 'd5ee22f' 2015-08-27 12:59:14 -04:00
Weblate
ec717c5b90 Merge remote-tracking branch 'origin/master' 2015-08-27 18:59:06 +02:00
Ann + J.M
a16e0bae7b Translated using Weblate (German) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-27 18:59:02 +02:00