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

109122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tmtisfree
2ddd85880b Translated using Weblate (French) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-01 21:37:22 +01:00
Παναγιώτης Παπάζογλου
0147569caa Translated using Weblate (Greek) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-01 20:54:53 +01:00
Domen
ec5ff9e263 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-01 20:53:03 +01:00
Burak Yavuz
b17a0f91cc Translated using Weblate (Turkish) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-01 19:13:54 +01:00
Michal Čihař
f2eac37c1e Merge branch 'QA_4_7' 2017-03-01 18:46:22 +01:00
Michal Čihař
16567c6b2b Do not rely on xargs 
It does not work as expected on OSX.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 18:46:17 +01:00
Michal Čihař
d3fe2991d0 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 18:20:06 +01:00
Michal Čihař
67cb11dfd5 Merge branch 'QA_4_7' 2017-03-01 18:19:39 +01:00
Michal Čihař
6ad9436394 Simplify installation 
The upgrade does not seem to work anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 18:19:34 +01:00
Michal Čihař
059685c348 Merge branch 'QA_4_7' 2017-03-01 18:08:35 +01:00
Michal Čihař
3fdf343899 Use installed pip for better caching 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 17:48:08 +01:00
Michal Čihař
a06669d83d Document why we install some packages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:59:46 +01:00
Michal Čihař
2b42777cdf Leverage pip cache instead of using apt packages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:57:26 +01:00
Michal Čihař
2fea612791 Simplify code for skipping not supported PHP versions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:53:23 +01:00
Michal Čihař
db62cf1bf4 There is no phpenv on OSX 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:52:08 +01:00
Michal Čihař
4f37569773 Do not use ant on Travis 
It is just additional overhead without real benefit.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:51:06 +01:00
Michal Čihař
0b0e99cc02 Remove no longer needed exclude 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:50:08 +01:00
Michal Čihař
b4326fcc3d Remove and cleanup from Travis 
It should not be necessary at all as we start with clean environment.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:49:59 +01:00
Michal Čihař
f3425986b5 Generate locales without ant 
Removes ant overhead.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:49:50 +01:00
Michal Čihař
bdaab73967 Squeeze lint into test build 
- the setup costs are quite high, so do both steps at once
- lint only changed files
- always generate locales for tests to simplify code

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:49:40 +01:00
Michal Čihař
6e78d489ee Use unicode for quotes 
There is no need to use html entities.

Issue #12987

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:20:14 +01:00
Michal Čihař
dfa7995451 Include quotes directly in the string 
This makes it easier for tranlators to handle.

Issue #12987

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:19:54 +01:00
Michal Čihař
0a8490f711 Merge remote-tracking branch 'origin/pull/12987' 2017-03-01 16:16:43 +01:00
Michal Čihař
2c55ecc450 Merge branch 'QA_4_7' 2017-03-01 15:57:24 +01:00
Michal Čihař
b7a87ce156 Adjust tests to new column selection code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:57:18 +01:00
Michal Čihař
585967b7e4 Fix columns selection in case of query fails 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:57:09 +01:00
Michal Čihař
19aad41506 Merge branch 'QA_4_7' 2017-03-01 15:53:02 +01:00
Michal Čihař
9d13e3d143 Display first char field for foreign key if nothing is configured 
In most cases this is what users want to see and anyway it is way better
than showing nothing.

Issue #12835

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:52:05 +01:00
Michal Čihař
faffa92f22 Fixed related field selection for native relations 
The PMA_getForeigners handles just fine both situations, so there is no
need to check the configuration in advance.

Fixes #12967

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:43:33 +01:00
Michal Čihař
002c39877e Merge branch 'QA_4_7' 2017-03-01 12:41:32 +01:00
Michal Čihař
cb60b4a750 Fixed displaying of all rows 
Fixes #13031

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 12:41:07 +01:00
Michal Čihař
12f7f6a785 Merge branch 'QA_4_7' 2017-03-01 10:54:44 +01:00
Michal Čihař
a72a048f1e Correctly handle case when CURRENT_USER() fails 
It's not likely, but the code path was obviously returning wrong value.

Maybe it did happen in issue #13037

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 10:53:19 +01:00
Michal Čihař
bb95ecf852 Extend Dummy driver to be able to inject expected queries results 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 10:52:37 +01:00
Michal Čihař
ce49be7e07 Fix condition to activate tracker 
Invoking empty() on the result might work in most cases as false is
empty and false is result from failure, but on the other side empty can
be true for valid results as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 10:45:51 +01:00
Michal Čihař
dee50ad8d1 Reference self as self not using class name 
Issue #13040

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 09:59:58 +01:00
Michal Čihař
4f4667b336 Merge branch 'QA_4_7' 2017-03-01 09:42:13 +01:00
Weblate
6a4a651c44 Merge remote-tracking branch 'origin/master' 2017-03-01 09:36:27 +01:00
Lalith Attanapola
a14c82b2f4 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 57.6% (1841 of 3193 strings)

[CI skip]
 2017-03-01 09:36:25 +01:00
tmtisfree
9679c4257f Translated using Weblate (French) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-03-01 09:36:23 +01:00
Michal Čihař
7881010d8a Merge branch 'QA_4_7' 2017-03-01 09:36:06 +01:00
Michal Čihař
289c86fc92 Merge commit 'ff5f6db32d52a0a5d4db14ec4101dde8fe04ea83' 2017-03-01 09:36:02 +01:00
Weblate
16c8c60034 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-01 09:35:56 +01:00
Lalith Attanapola
0e35120a43 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 57.6% (1841 of 3192 strings)

[CI skip]
 2017-03-01 09:35:55 +01:00
tmtisfree
e2793c36ad Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-01 09:35:54 +01:00
Michal Čihař
248a42af7e Fixed javascript confirmation of dangerous queries 
The confirmations did work properly only in console and not anywhere
else.

- the check function was expecting textarea, while it got text from
  other calls
- the check for empty form was completely outdated, but that seems to
  lead only to dead code and no breakage
- for the inline editor, the form was not properly focused and restored
  on confirmation error

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 09:33:18 +01:00
Weblate
ff5f6db32d Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-27 11:43:03 +01:00
Володимир
cc7d5d5c17 Translated using Weblate (Ukrainian) 
Currently translated at 92.4% (2951 of 3192 strings)

[CI skip]
 2017-02-27 11:43:03 +01:00
tmtisfree
99c8937647 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-02-27 11:43:01 +01:00
Michal Čihař
dcb5a8d926 Merge branch 'QA_4_7' 2017-02-27 11:42:45 +01:00