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

109956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
c8d7fc4024 Merge commit '2dee421a72824a5493bcf816d6baeb74bc3584c9' 2017-06-15 16:27:21 +02:00
Weblate
d3e7ebff2e Merge remote-tracking branch 'origin/master' 2017-06-15 11:59:49 +02:00
Burak Yavuz
c42427cf17 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-15 11:59:48 +02:00
Michal Čihař
ab7531810c Merge pull request #13381 from mauriciofauth/js-vendor 
Move third-party js libraries to js/vendor
 2017-06-15 11:59:34 +02:00
Weblate
38c6c4278d Merge remote-tracking branch 'origin/master' 2017-06-15 08:51:12 +02:00
Burak Yavuz
7d0ca5fffe Translated using Weblate (Turkish) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-15 08:51:12 +02:00
Viktar Vauchkevich
9139a61f6a Translated using Weblate (Belarusian) 
Currently translated at 62.4% (2007 of 3212 strings)

[CI skip]
 2017-06-15 08:51:03 +02:00
Deven Bansod
a270570e82 ChangeLog for #13384 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-06-15 12:20:42 +05:30
Deven Bansod
059ffe64ed Use better way to form the Database link URLs 
Fix #13384

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-06-15 12:18:59 +05:30
Domen
59d35f63c5 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 22:11:15 +02:00
Володимир Бриняк
46a15c7fbf Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 20:12:17 +02:00
Weblate
ea5421bcab Merge remote-tracking branch 'origin/master' 2017-06-14 17:32:00 +02:00
Māris
a324c88940 Translated using Weblate (Latvian) 
Currently translated at 17.3% (557 of 3212 strings)

[CI skip]
 2017-06-14 17:31:58 +02:00
Stefano Martinelli
364b51a2e4 Translated using Weblate (Italian) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 17:31:57 +02:00
Giovanni Sora
1c9487b2e7 Translated using Weblate (Interlingua) 
Currently translated at 75.4% (2425 of 3212 strings)

[CI skip]
 2017-06-14 17:31:57 +02:00
dingo thirteen
96963916e3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 17:31:56 +02:00
Viktar Vauchkevich
cd8f4f2951 Translated using Weblate (Belarusian) 
Currently translated at 62.0% (1992 of 3212 strings)

[CI skip]
 2017-06-14 17:31:54 +02:00
Maurício Meneghini Fauth
d853b60762 Change octal escape with hexadecimal escape 
Octal escape sequences are not allowed in strict mode.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 12:31:43 -03:00
Maurício Meneghini Fauth
3770adbba3 Move js/codemirror to js/vendor/codemirror 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 02:15:29 -03:00
Maurício Meneghini Fauth
44929a3e7b Move js/sprintf.js to js/vendor/sprintf.js 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 02:06:55 -03:00
Maurício Meneghini Fauth
0c77c43782 Move js/js.cookie.js to js/vendor/js.cookie.js 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 02:04:29 -03:00
Maurício Meneghini Fauth
3f632ef7bc Move js/zxcvbn.js to js/vendor/zxcvbn.js 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 02:01:11 -03:00
Maurício Meneghini Fauth
47865ee3bb Move jqPlot to js/vendor 
Move js/jqplot to js/vendor/jqplot

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 01:57:26 -03:00
Maurício Meneghini Fauth
555156c85f Move openlayers to js/vendor 
Move js/openlayers to js/vendor/openlayers

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 01:57:26 -03:00
Maurício Meneghini Fauth
774150e54d Move tracekit.js to js/vendor 
Move js/tracekit/tracekit.js to js/vendor/tracekit.js

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 01:57:25 -03:00
Maurício Meneghini Fauth
61b7d5dfd8 Move js/jquery to js/vendor/jquery 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 01:57:25 -03:00
Burak Yavuz
a09ce953ba Translated using Weblate (Turkish) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-13 18:32:43 +02:00
dingo thirteen
2dee421a72 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]
 2017-06-13 18:13:34 +02:00
Stefano Martinelli
274ef03d42 Translated using Weblate (Italian) 
Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]
 2017-06-13 18:07:55 +02:00
Michal Čihař
0cbe90430c Merge branch 'QA_4_7' 2017-06-13 17:35:44 +02:00
Michal Čihař
1ecf2561a1 Unmark field as required 
Otherwise the hidden field blocks form submission.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:35:27 +02:00
Michal Čihař
4f30297d38 Cache tracker enabled per table 
This can be executed quite a lot of times during import and there is no
reason to query database again during that.

Fixes #13318

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:34:55 +02:00
Michal Čihař
5fd7b2c9de Avoid getting tracking version for non tracked tables 
We won't use it anyway, so it's better to avoid that query.

Issue #13318

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:31:43 +02:00
Michal Čihař
c218e5e025 Merge branch 'QA_4_7' 2017-06-13 17:06:16 +02:00
Michal Čihař
c0d841c50f Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:06:08 +02:00
Michal Čihař
7af85633c4 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:05:20 +02:00
Weblate
3e7c083c91 Merge remote-tracking branch 'origin/master' 2017-06-13 17:05:03 +02:00
Alpix
8a98f20c14 Translated using Weblate (German) 
Currently translated at 98.3% (3152 of 3206 strings)

[CI skip]
 2017-06-13 17:05:00 +02:00
Weblate
89e3820bae Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-13 17:04:25 +02:00
Alpix
5f4903bb4a Translated using Weblate (German) 
Currently translated at 98.8% (3161 of 3198 strings)

[CI skip]
 2017-06-13 17:04:22 +02:00
Michal Čihař
b372e0d554 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-06-13 17:04:19 +02:00
Michal Čihař
c065224d1c Merge branch 'QA_4_7' 2017-06-13 17:03:42 +02:00
Michal Čihař
30d509238a Merge remote-tracking branch 'origin/QA_4_7' 2017-06-13 17:03:19 +02:00
Michal Čihař
358d2fd1f1 Rewrite export alias defining 
The old code did load all colums for all tables in all databases in
export. This can easily explode for server wide exports or exports on
database with lot of tables.

It has been rewritten in a way to load required data on demand from
server. This will make aliases defining slightly slower, but I think
it's acceptable price for making the export work on larger databases.

Fixes #13008

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:02:45 +02:00
Madhura Jayaratne
f0f9311cf5 Fix div id. Use the jQuery UI dialog for index creation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-06-13 22:06:32 +10:00
Madhura Jayaratne
522f1a714e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-06-13 21:50:24 +10:00
Madhura Jayaratne
16aa30cd56 Fix #13350 Add Index issue 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-06-13 21:49:54 +10:00
Michal Čihař
40fb31f460 Remove unused code 
The url_params and args seems to be used in same way, but I could not
find any user of url_params.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 13:02:31 +02:00
Michal Čihař
44975e7e0a Simplify code for generating URL 
There is no need to build it manually

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 12:43:38 +02:00
Michal Čihař
45640d5e0f Remove unused request parameter for Util::checkParameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 12:34:43 +02:00