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

105189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atul Pratap Singh
7344528757 Merge commit '50f1603' 2016-02-17 00:02:14 +05:30
Michal Čihař
3e74102b12 Log authentication attempts to syslog 
Fixes #6146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 12:30:36 +01:00
Weblate
50f160363b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-16 10:21:35 +01:00
Weblate
c0f667e17b Merge remote-tracking branch 'origin/master' 2016-02-16 10:21:34 +01:00
Michal Čihař
f6572e0fa5 Translated using Weblate (Czech) 
Currently translated at 94.4% (3036 of 3214 strings)

[CI skip]
 2016-02-16 10:21:33 +01:00
Michal Čihař
b3f9f6fabd Translated using Weblate (Czech) 
Currently translated at 94.4% (3036 of 3214 strings)

[CI skip]
 2016-02-16 10:21:31 +01:00
Michal Čihař
edc46f02e9 Merge branch 'QA_4_6' 2016-02-16 10:21:19 +01:00
Michal Čihař
67b681d63e Merge branch 'QA_4_5' into QA_4_6 2016-02-16 10:21:07 +01:00
Michal Čihař
50af85cf34 Fix export of index comments in SQL 
Fixes #11968

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 10:20:09 +01:00
Madhura Jayaratne
5e24aca023 Merge branch 'QA_4_6' 2016-02-16 20:03:38 +11:00
Madhura Jayaratne
25f7f1a6f9 Update to match the namespace usage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 20:03:13 +11:00
Madhura Jayaratne
18587cf21c Merge branch 'QA_4_6' 2016-02-16 19:54:33 +11:00
Madhura Jayaratne
b050df847e Merge branch 'QA_4_5' into QA_4_6 2016-02-16 19:52:39 +11:00
Madhura Jayaratne
36e3b337de ChangeLog entry for #11969 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 19:51:46 +11:00
Madhura Jayaratne
49bfc5b744 Merge branch 'QA_4_5' into QA_4_6 2016-02-16 19:48:38 +11:00
Madhura Jayaratne
7881a461a3 Fix #11969 Missing confirmation while dropping a view in view_operations.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 19:47:12 +11:00
Madhura Jayaratne
97174847eb More escaping on confirmation messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 19:35:38 +11:00
Madhura Jayaratne
5ee4695bbc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-16 19:30:52 +11:00
Madhura Jayaratne
b783d818b5 Use back quotes around table names in confirmation messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 19:29:40 +11:00
Michal Čihař
7c249478dc Remove check for libxml_disable_entity_loader 
It's there since PHP 5.2.11 and we require 5.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 09:16:55 +01:00
Michal Čihař
d8482d1644 Merge branch 'QA_4_6' 2016-02-16 09:00:56 +01:00
Michal Čihař
9a590a0b76 Merge branch 'QA_4_5' into QA_4_6 2016-02-16 09:00:41 +01:00
Michal Čihař
310fd4b2c1 Fix PHP error on loading invalid XML or ODS file 
Fixes #11967

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 09:00:32 +01:00
Madhura Jayaratne
566caa5143 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-16 15:28:48 +11:00
Madhura Jayaratne
eb7b999293 Merge branch 'QA_4_6' 2016-02-16 15:28:13 +11:00
Madhura Jayaratne
39559ddca5 Merge branch 'QA_4_5' into QA_4_6 2016-02-16 15:27:46 +11:00
Madhura Jayaratne
a80124d6fd Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2016-02-16 15:26:05 +11:00
Madhura Jayaratne
6e6e40a775 Fix #11964 Undefined index: TABLE_COMMENT in database structure page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 15:24:12 +11:00
Michal Čihař
004598527a Document new docker settings 
See https://github.com/phpmyadmin/docker/pull/22

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-15 17:30:26 +01:00
Isaac Bennetch
c856ad73f4 Archive 2015 ChangeLog to history repository 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-15 09:07:21 -05:00
Michal Čihař
c2bfb7449c Merge branch 'QA_4_6' 2016-02-15 08:51:50 +01:00
Michal Čihař
729abb0f3c Merge branch 'QA_4_5' into QA_4_6 2016-02-15 08:51:40 +01:00
Michal Čihař
9204b85fa5 Move isStorageSupported to config.js 
This way it's included in the setup as well where it's used.

Fixes #11959

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-15 08:50:53 +01:00
Dan Ungureanu
f980812f57 Merge branch 'QA_4_6' 2016-02-12 23:47:22 +02:00
Dan Ungureanu
e21fbe665d Merge branch 'QA_4_5' into QA_4_6 2016-02-12 23:46:57 +02:00
Dan Ungureanu
85dd699364 Updated sql-parser to phpmyadmin/sql-parser@66b528dc0f (v3.3.1). 
Fixes #11956. unrecognized keyword interval
Fixes issues regarding field names and aliases.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-12 23:45:41 +02:00
Michal Čihař
6d73ee1e4d Merge pull request #11957 from ibennetch/release 
Improve release instructions
 2016-02-12 18:20:57 +01:00
Michal Čihař
edd264c91f Remove compatibility code with MySQL < 5.0 
It doesn't seem to be needed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 17:20:44 +01:00
Michal Čihař
fd5dd9ea8f Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 17:09:04 +01:00
Isaac Bennetch
696556b34b Improve release instructions 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-12 11:03:19 -05:00
Michal Čihař
5417dd57dc Merge branch 'QA_4_6' 2016-02-12 15:54:13 +01:00
Michal Čihař
bc2990d5bd Merge branch 'QA_4_5' into QA_4_6 2016-02-12 15:53:59 +01:00
Michal Čihař
3bacb68305 Make sure format is always defined 
Fixes #11955

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:53:50 +01:00
Michal Čihař
84ef9083b4 Merge branch 'QA_4_6' 2016-02-12 15:44:50 +01:00
Michal Čihař
c90e01f4ce Merge branch 'QA_4_5' into QA_4_6 2016-02-12 15:44:39 +01:00
Michal Čihař
073b85e1ee Avoid matching of date 
This causes random failures as time can be one second further when
generating output.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:43:43 +01:00
Michal Čihař
910813de08 Avoid naming provider as test*, it isn't test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:40:41 +01:00
Michal Čihař
c7824a9be3 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:39:08 +01:00
Michal Čihař
74174ed6eb Test dynamic javascripts 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:38:35 +01:00
Michal Čihař
b5b869419f Avoid nested output buffer problems in test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:28:22 +01:00