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

108562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2de8a2d476 Merge branch 'master' into 12536 2017-01-18 09:51:06 +01:00
Michal Čihař
eafd5a5d93 Simplify mysqli database connection 
- there is no need for _realConnect here as we call just one
  function in all cases (compared to mysql) backend
- properly pass connection flags (see #12898)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:47:47 +01:00
Michal Čihař
bda844474b Merge pull request #12902 from ibennetch/old-xls-master 
Remove dead code and strings relating to xls/xlsx import and export.
 2017-01-18 09:38:02 +01:00
Michal Čihař
9503e0f6aa Store query data in data attribute instead of HTML 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:35:54 +01:00
Michal Čihař
9b4642af62 Merge remote-tracking branch 'origin/pull/12823' 2017-01-18 09:33:08 +01:00
Michal Čihař
70c3918a6e Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:30:55 +01:00
Weblate
c6d6924016 Merge remote-tracking branch 'origin/master' 2017-01-18 04:30:20 +01:00
Giovanni Sora
c99e070642 Translated using Weblate (Interlingua) 
Currently translated at 76.1% (2465 of 3239 strings)

[CI skip]
 2017-01-18 04:30:17 +01:00
Isaac Bennetch
9356565840 Archive 2016 ChangeLog entries to the history repository 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 22:28:04 -05:00
Isaac Bennetch
583e5e660a Remove dead code and strings relating to xls/xlsx import and export. 
This code was removed in 3.4.5.0 but some strings and tests remained.

Fixes #12742

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 22:01:45 -05:00
Weblate
179a86b2d3 Merge remote-tracking branch 'origin/master' 2017-01-17 20:14:15 +01:00
Sevdimali İsa
ca2b056229 Translated using Weblate (Azerbaijani) 
Currently translated at 52.8% (1711 of 3239 strings)

[CI skip]
 2017-01-17 20:14:11 +01:00
Isaac Bennetch
e1276e8eb4 Fix merge conflicts removing dead code 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 14:13:07 -05:00
Isaac Bennetch
f1375a26a3 Remove dead code related to 4a2695c 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 14:10:24 -05:00
Michal Čihař
5c3f74d875 Merge branch 'QA_4_6' 2017-01-17 17:22:53 +01:00
Michal Čihař
dfa8b7e9d8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-01-17 17:22:42 +01:00
Michal Čihař
eb2898527f Changelog entry for #12495 and #12875 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-17 17:22:21 +01:00
Michal Čihař
e21b4f998e Merge remote-tracking branch 'origin/pull/12875' into QA_4_6 2017-01-17 17:21:52 +01:00
Isaac Bennetch
9f2b39258a Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 11:06:52 -05:00
Isaac Bennetch
5fe0010c4e Merge commit 'a0e0eea' 2017-01-17 11:05:26 -05:00
Isaac Bennetch
986035a716 Add ChangeLog entry for issue 12831 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 10:51:47 -05:00
Shreyas Sinha
4a2695cf5b Row coloring issue and incorrect table code 
Fixes issue #12831

Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
 2017-01-17 10:51:47 -05:00
Michal Čihař
2eed93afee Merge branch 'QA_4_6' 2017-01-17 13:36:52 +01:00
Ariel Alonso
6fd207e15c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.1% (3051 of 3239 strings)

[CI skip]
 2017-01-17 13:36:36 +01:00
Manuela Silva
4db42028af Translated using Weblate (Portuguese) 
Currently translated at 53.5% (1734 of 3239 strings)

[CI skip]
 2017-01-17 13:36:35 +01:00
Ariel Alonso
a0e0eea03d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.6% (3049 of 3222 strings)

[CI skip]
 2017-01-17 13:35:25 +01:00
Manuela Silva
4233fbc874 Translated using Weblate (Portuguese) 
Currently translated at 53.9% (1738 of 3222 strings)

[CI skip]
 2017-01-17 13:35:24 +01:00
Isaac Bennetch
77c33d0444 Rename Relations to Relationships in many places; Fixes issue #12536 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-13 18:20:30 -05:00
Yungu Kim
95956f011d Translated using Weblate (Korean) 
Currently translated at 81.1% (2616 of 3222 strings)

[CI skip]
 2017-01-09 18:45:31 +01:00
Critiano Lancelotti
f683adfd5a Merge branch 'issue_12262' of https://github.com/clancelotti/phpmyadmin into issue_12262 2017-01-08 08:34:58 -02:00
Critiano Lancelotti
2c11b650ec Exchange jQuery.parseJSON() for JSON.parse() 2017-01-08 08:30:59 -02:00
Michal Čihař
b40e9c13f2 Avoid checking whole HTML for theme manager 
This way it will work even with additional themes installed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-08 11:02:33 +01:00
Michal Čihař
8633f44db0 Remove code for PMA_TEST_HEADERS 
It's no longer necessary.

Issue #12079

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-08 10:58:19 +01:00
Michal Čihař
3c2867c02a Use shared response mock in cookie auth tests 
Issue #12079

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-08 10:51:25 +01:00
Michal Čihař
234f93efff Various coding style and visibility fixes for #12852 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-08 10:51:25 +01:00
Weblate
b6fc24a56c Merge remote-tracking branch 'origin/master' 2017-01-08 10:28:23 +01:00
Kyeong Su Shin
11311c8b41 Translated using Weblate (Korean) 
Currently translated at 80.7% (2615 of 3239 strings)

[CI skip]
 2017-01-08 10:28:21 +01:00
Michal Čihař
71a2f600e7 Merge pull request #12852 from ragnerok/patch 
Removed PMA_TEST_HEADERS checking as they have been defined
 2017-01-08 10:28:11 +01:00
Cristiano Lancelotti
d3d973f782 Merge branch 'master' into issue_12262 2017-01-08 05:44:15 -02:00
osaid
fd6a02b215 moved tearDown method to PMATestCase 
Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-01-08 13:03:28 +05:30
Critiano Lancelotti
0972666fb2 Fix the problem of chart is not rendered 
Signed-off-by: Critiano Lancelotti <lancelot.info@gmail.com>
 2017-01-08 05:30:12 -02:00
Lee Joon Haeng
0a8d384556 Translated using Weblate (Korean) 
Currently translated at 80.7% (2615 of 3239 strings)

[CI skip]
 2017-01-07 16:53:56 +01:00
Yungu Kim
9521e399c0 Translated using Weblate (Korean) 
Currently translated at 80.7% (2615 of 3239 strings)

[CI skip]
 2017-01-07 16:50:56 +01:00
Michal Čihař
4abbe78a07 Remove unused entries from goto whitelist 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 16:09:57 +01:00
Michal Čihař
055e393955 Implement loading of settings using FileReader API 
Fixes #12398

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 16:07:31 +01:00
Michal Čihař
f2c5ecf311 Implement monitor configuration download using Blob API 
This way we no longer need round trip to the server.

Issue #12398

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 16:07:26 +01:00
Michal Čihař
4ba0eb88d7 Do not try to add profiling to reponses not handled by Response 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 15:08:26 +01:00
Michal Čihař
f9a27d5008 Simplify zeroconf code 
Check if phpmyadmin database exists rather than looping over all
databases.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 14:59:59 +01:00
Michal Čihař
fdbef2dcc8 Add warning about enabling phpinfo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 14:30:37 +01:00
Michal Čihař
1089a7d67e Limit what we display in phpinfo 
- general information
- configuration
- modules

This way we avoid displaying sensitive things (such as httpOnly cookies
from environment of variables).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 14:23:28 +01:00