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

108399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
830a7b332b Merge remote-tracking branch 'origin/master' 2016-12-21 19:01:17 +01:00
Daniel Miloca
bca84af8bd Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.5% (2999 of 3239 strings)

[CI skip]
 2016-12-21 19:01:16 +01:00
Michal Čihař
4befa5c4fc Fix object name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 19:01:01 +01:00
dingo thirteen
abf70b9230 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-21 18:44:09 +01:00
Burak Yavuz
6fe9e68e76 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-21 17:29:51 +01:00
Michal Čihař
67dd7facc5 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 17:07:07 +01:00
Michal Čihař
65e245a184 Merge branch 'QA_4_6' 2016-12-21 17:06:42 +01:00
Daniel Miloca
a5f9c0273b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.0% (2997 of 3222 strings)

[CI skip]
 2016-12-21 17:06:16 +01:00
Michal Čihař
a950a5952b Translated using Weblate (German) 
Currently translated at 99.5% (3206 of 3222 strings)

[CI skip]
 2016-12-21 17:06:15 +01:00
dingo thirteen
2e8c8af9b8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-21 17:06:14 +01:00
Michal Čihař
19ff794893 Translated using Weblate (Czech) 
Currently translated at 93.8% (3024 of 3222 strings)

[CI skip]
 2016-12-21 17:06:14 +01:00
Michal Čihař
aea2a28974 Make the string look like an error message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 17:05:45 +01:00
Daniel Miloca
700ad1ee88 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.3% (2992 of 3239 strings)

[CI skip]
 2016-12-21 17:05:35 +01:00
Michal Čihař
69be32050a Translated using Weblate (German) 
Currently translated at 99.2% (3215 of 3239 strings)

[CI skip]
 2016-12-21 17:05:33 +01:00
dingo thirteen
29875ef785 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-21 17:05:33 +01:00
Michal Čihař
729a1d423e Translated using Weblate (Czech) 
Currently translated at 93.0% (3015 of 3239 strings)

[CI skip]
 2016-12-21 17:05:32 +01:00
Lou Master la vida
cd63028042 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.3% (2990 of 3239 strings)

[CI skip]
 2016-12-21 17:01:09 +01:00
Rogerio Marques
8973db0651 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.9% (2995 of 3222 strings)

[CI skip]
 2016-12-21 17:00:58 +01:00
Michal Čihař
3a7cb1072a Update jquery.fullscreen to 1.1.5 
Also changed API calls to it.

Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 14:47:24 +01:00
Michal Čihař
33f8d3d3f8 Update jQuery Timepicker Addon to 1.6.3 
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 14:32:34 +01:00
Michal Čihař
dfb06c4433 Update jQuery Validation Plugin to 1.15.1 
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 14:31:03 +01:00
Michal Čihař
1008ed1bbc Update jQuery Mousewheel to 3.1.13 
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 14:29:23 +01:00
Michal Čihař
c77d8cff25 Do not use deprecated $.parseJSON 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 14:27:39 +01:00
Michal Čihař
5f9ce26268 Add jQuery Migrate to support some older code 
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 14:19:37 +01:00
Michal Čihař
8f3f988cbd Properly quote href selectors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 14:15:50 +01:00
Michal Čihař
a0a0a04404 Update jQuery UI to 1.12.1 
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 14:14:36 +01:00
Michal Čihař
c1b803efe6 Update jQuery to 3.1.1 
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 14:03:35 +01:00
Michal Čihař
58a7e77811 Update CodeMirror to 5.22.1 
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 13:56:45 +01:00
Michal Čihař
c37ef0dfc7 Update jqPlot to 1.0.9 
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 13:45:54 +01:00
Michal Čihař
621804f211 Merge branch 'QA_4_6' 2016-12-21 10:46:07 +01:00
Michal Čihař
6f01864e89 Fixed moving of columns with whitespace in name 
Fixes #12841

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 10:45:52 +01:00
Michal Čihař
c4fcd6c7dd Changelog for issues #12838 and #12069 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 10:23:34 +01:00
Michal Čihař
6a84202981 Use existing filtering template for table filtering 
Issue #12838, #12069

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 10:22:35 +01:00
Michal Čihař
00b718397c Unbind event on page unload 
Issue #12838, #12069

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 10:16:57 +01:00
Michal Čihař
03a1fe3e1a Merge remote-tracking branch 'origin/pull/12838' 2016-12-21 10:14:48 +01:00
Yunus Çağrı
041cd61820 Tab spaces are removed. 
Signed-off-by: Yunus Çağrı <ycagriyurdakul@gmail.com>
 2016-12-21 00:15:24 +03:00
Yunus Çağrı
9aaf3126b8 Update db_structure.js 2016-12-20 22:57:19 +02:00
Yunus Çağrı
f256391545 Inline javascript codes are removed. Each is used for table search 
Signed-off-by: Yunus Çağrı <ycagriyurdakul@gmail.com>
 2016-12-20 23:53:00 +03:00
Michal Čihař
b1ad3826b5 Merge branch 'QA_4_6' 2016-12-20 16:44:58 +01:00
Michal Čihař
c8a15f2212 Merge remote-tracking branch 'origin/pull/12815' into QA_4_6 2016-12-20 16:44:44 +01:00
Osaid Rehman Nasir
73c6a7eb9f Use Header class for headers manipulation 
* Added mocking of response object
* Rectified mistake of calling method once
* implemented mock properly
* replaced header with response header 

Issue #12079

Signed-off-by: Osaid osaid.nasir@gmail.com
 2016-12-20 16:37:11 +01:00
Michal Čihař
92aa487c54 Merge branch 'QA_4_6' 2016-12-20 14:44:03 +01:00
Michal Čihař
09da5eb49f Test both with and without phpseclib 
This ensures we generate compatible data in both cases.

Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:40:31 +01:00
Michal Čihař
30cd5fc358 Use same encryption key with openssl and phpseclib 
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:38:34 +01:00
Michal Čihař
03bc52f6dc Correctly report OpenSSL errors from cookie encryption 
Without calling openssl_error_string() we pollute openssl global state
and some other library might report this as failure (eg. mysqlnd driver
when connecting to SSL enabled server).

Fixes #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:38:03 +01:00
Michal Čihař
b866371b9a Determine whether to use openssl just once 
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:30:51 +01:00
Yunus Çağrı
b19085b37b Feature: #12069: Filtering tables on table listing of particular database. 
Signed-off-by: Yunus Çağrı <ycagriyurdakul@gmail.com>
 2016-12-19 23:19:06 +03:00
Yunus Çağrı
ec4ef65f36 Feature: #12069: Filtering tables on table listing of particular database. 
Signed-off-by: Yunus Çağrı <ycagriyurdakul@gmail.com>
 2016-12-19 22:56:15 +03:00
Michal Čihař
5cbcb202b8 Merge branch 'QA_4_6' 2016-12-19 17:14:15 +01:00
Michal Čihař
d730db1259 Add some missing html encoding 
Issue #12804

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 17:13:43 +01:00