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

105498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
a3eb37b5d7 Move token check to PMA_generateToken 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-03 08:23:19 +01:00
Isaac Bennetch
89e4d79d09 Fix typo 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-02 09:47:44 -05:00
Michal Čihař
3344412381 Merge branch 'QA_4_6' 2016-03-02 14:51:08 +01:00
Michal Čihař
f76ddbe7ab Update SQL parser to ad0e75faa6f6943d013f23d0d1ca31b4781e7b79 
- issue #12041 Fixed exporting tables with fields DEFAULT and COMMENT

Fixes #12041

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-02 14:50:21 +01:00
Michal Čihař
baaedf0b74 Merge branch 'QA_4_6' 2016-03-02 14:04:45 +01:00
Michal Čihař
fe4a3e8727 Fixed processing of queries with escaped quotes 
Imported SQL parser d2e37de1dbec251556f35712bddcd61d24baaee6

Fixes #12054

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-02 14:04:00 +01:00
Madhura Jayaratne
dd5662977b Merge branch 'QA_4_6' 
Conflicts:
	README
	doc/conf.py
	libraries/Config.php
 2016-03-02 21:22:27 +11:00
Isaac Bennetch
5125fc3bc0 Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 2016-03-01 14:43:17 -05:00
Isaac Bennetch
a0df0f15c1 Merge remote-tracking branch 'upstream/master' 2016-03-01 14:28:50 -05:00
Michal Čihař
b71aeefa3a Disable sending referer 
We don't use it and this can help us get rid of url.php once the browser
support is good enough (as usual, there is no support in IE and broken
support in Edge right now).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 16:09:51 +01:00
Michal Čihař
b856502d64 Prefer phpseclib if avaible 
It does better decisions about which backend to use than simply using
openssl.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:49:05 +01:00
Michal Čihař
380deb4f39 Share code for generating token 
There is no need to have two copies of that.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:47:20 +01:00
Michal Čihař
4efb1c8a59 Merge branch 'QA_4_6' 2016-03-01 15:43:28 +01:00
Michal Čihař
9eee3353a6 Merge branch 'QA_4_5' into QA_4_6 2016-03-01 15:43:18 +01:00
Michal Čihař
eb536f2c76 Merge branch 'QA_4_6' 2016-03-01 15:41:36 +01:00
Michal Čihař
12bf06e016 Add changelog for issue #12055 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:41:19 +01:00
Michal Čihař
4dce6ec2db Merge branch 'QA_4_6' 2016-03-01 15:39:45 +01:00
Michal Čihař
02aa0729dc Make PMA_fatalError work even early 
The messaging framework can not make assumptions about available objects
as this doesn't have to be satisfied in early PMA_fatalError case.

Issue #12056

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:36:05 +01:00
Michal Čihař
a6b3a9ce51 Fix error when we can not generate random string 
Fixes #12056

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:35:53 +01:00
Isaac Bennetch
0fc00c0ab8 4.6.0-rc2 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-01 09:32:07 -05:00
Isaac Bennetch
9f07c1c8ba Merge branch 'QA_4_6' 2016-03-01 09:30:43 -05:00
Isaac Bennetch
ebaeaf9a5b 4.5.5.1 release date in ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-01 09:30:30 -05:00
Michal Čihař
faa1229ed7 Merge branch 'QA_4_6' 2016-03-01 08:07:27 +01:00
Michal Čihař
8eee22be3a Lint templates as well 
This will help us spotting syntax errors even in files which are not
covered by tests.

Fixes #12055

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 08:06:48 +01:00
Michal Čihař
35becb00ee Fix duplicate function call 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 08:06:06 +01:00
Michal Čihař
85972d3529 Merge branch 'QA_4_6' 2016-03-01 08:01:06 +01:00
Michal Čihař
ed5a8307c7 Fix wrong merge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 08:00:54 +01:00
Michal Čihař
4e5b08e26c Fix errors introduced by wrongly merging 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 07:55:46 +01:00
Weblate
a7a475b67c Merge remote-tracking branch 'origin/master' 2016-03-01 07:46:24 +01:00
Kenzo Martins Matuzawa
27e68b1cf1 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.0% (2954 of 3208 strings)

[CI skip]
 2016-03-01 07:46:23 +01:00
Michal Čihař
9a656ad21f Merge remote-tracking branch 'origin/QA_4_6' 2016-03-01 07:46:10 +01:00
Michal Čihař
2c256da5e8 Merge commit '73fd0dc2a8f5471c717a887aae22bde97bc5498f' 2016-03-01 07:45:58 +01:00
Weblate
d280e53aaa Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-29 21:36:45 +01:00
Kenzo Martins Matuzawa
8563303004 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.2% (2963 of 3211 strings)

[CI skip]
 2016-02-29 21:36:44 +01:00
Atul Pratap Singh
39fd5888be Merge pull request #12050 from 007durgesh219/Issue#12049 
Fix Enable statistics link is not displaying correctly, Issue #12049
 2016-02-29 21:29:06 +05:30
Isaac Bennetch
73fd0dc2a8 4.6.0-rc1 pre-release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-29 08:56:32 -05:00
Michal Čihař
ed17d3c450 Merge branch 'QA_4_6' into QA_4_6-security 2016-02-29 19:06:23 +01:00
Isaac Bennetch
51a0d2f25a 4.5.5.1 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-29 08:45:21 -05:00
Durgesh
e0f4128d76 Fix Enable statistics link is not displaying correctly, Issue #12049 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-29 17:41:42 +05:30
Michal Čihař
317eb54abd Silent errors from git cat-file 
There doesn't seem to be better way to check for existence of file in
branch, so let's just ignore the errors from it.

Fixes #12015

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-29 13:09:25 +01:00
Michal Čihař
d5650a757a Merge branch 'QA_4_6' 2016-02-29 12:14:12 +01:00
Michal Čihař
2ebabd11fd Merge branch 'QA_4_5' into QA_4_6 2016-02-29 12:13:45 +01:00
Michal Čihař
3c583b86d4 Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-security 2016-02-29 12:13:02 +01:00
Michal Čihař
88e0944cfd Honor vendor configuration for gettext inclusion 
Fixes #12048

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-29 12:12:34 +01:00
Michal Čihař
805cede33e Update sprites for new icons (see #12032) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-29 11:52:56 +01:00
Michal Čihař
c5934574f2 Fix tests after #12032 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-29 11:51:24 +01:00
Michal Čihař
238a87903b Merge remote-tracking branch 'origin/pull/12032' 2016-02-29 11:49:55 +01:00
Michal Čihař
e0709eea56 Merge pull request #12044 from nisargjhaveri/patch-1 
Fix example in `test/README.rst`
 2016-02-29 11:42:03 +01:00
Michal Čihař
a29f154f37 Merge branch 'MAINT_4_5_5-security' into QA_4_6-security 2016-02-29 10:35:47 +01:00
Michal Čihař
2925d6468b Merge pull request #29 from phpmyadmin/escape 
A better way of escaping
 2016-02-29 10:32:56 +01:00