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

108303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
db2e3f392a Merge remote-tracking branch 'origin/QA_4_6' 2016-12-14 15:31:01 +01:00
Domen
a05dc97218 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-14 15:30:45 +01:00
Phillip Rohmberger
b8eecfed8f Translated using Weblate (German) 
Currently translated at 99.2% (3215 of 3239 strings)

[CI skip]
 2016-12-14 15:30:43 +01:00
Παναγιώτης Παπάζογλου
92d41e4d7f Translated using Weblate (Greek) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-14 15:29:34 +01:00
Phillip Rohmberger
30bfba75da Translated using Weblate (German) 
Currently translated at 99.5% (3206 of 3222 strings)

[CI skip]
 2016-12-14 15:29:34 +01:00
Domen
16c72323d1 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-14 10:30:30 +01:00
Παναγιώτης Παπάζογλου
3f26112698 Translated using Weblate (Greek) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-14 09:11:13 +01:00
Michal Čihař
c20474b5c5 Properly set Response mock for testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 17:35:15 +01:00
Michal Čihař
d393505ce1 Avoid using define() for PMA_IS_IIS in tests 
It is not used anywhere in the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 17:34:42 +01:00
Michal Čihař
66ac1a3053 Remove unused variable safari_browser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 17:30:00 +01:00
Michal Čihař
d8c80afae9 Always set global settings for testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 17:29:05 +01:00
Michal Čihař
9e93ba5b48 Merge remote-tracking branch 'origin/pull/12793' into tmp 2016-12-13 17:21:03 +01:00
Weblate
9f775e4b0b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-13 16:50:22 +01:00
Stefano Martinelli
ceec247a20 Translated using Weblate (Italian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-13 16:50:20 +01:00
Giovanni Sora
e40d0439fd Translated using Weblate (Interlingua) 
Currently translated at 74.7% (2408 of 3222 strings)

[CI skip]
 2016-12-13 16:50:20 +01:00
monicagrau
fd897920d7 Translated using Weblate (Catalan) 
Currently translated at 99.2% (3199 of 3222 strings)

[CI skip]
 2016-12-13 16:50:19 +01:00
Michal Čihař
f0d3aaa5c0 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-12-13 16:49:52 +01:00
Weblate
d379d7f568 Merge remote-tracking branch 'origin/master' 2016-12-13 16:32:46 +01:00
Giovanni Sora
fc28c39efb Translated using Weblate (Interlingua) 
Currently translated at 74.8% (2426 of 3239 strings)

[CI skip]
 2016-12-13 16:32:44 +01:00
monicagrau
642ad9a549 Translated using Weblate (Catalan) 
Currently translated at 98.7% (3199 of 3239 strings)

[CI skip]
 2016-12-13 16:32:43 +01:00
Michal Čihař
0522bb784a Merge pull request #12809 from nijel/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2016-12-13 16:32:38 +01:00
Scrutinizer Auto-Fixer
58b16e73c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-12-13 15:16:11 +00:00
Michal Čihař
ef4e584eea Fix return value documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 16:13:18 +01:00
osaid
800975a73c PMA_sendHeaderLocation called after actually sending headers 2016-12-13 20:33:37 +05:30
Stefano Martinelli
cde3ec1d8c Translated using Weblate (Italian) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-13 15:14:48 +01:00
Michal Čihař
9b04a6d293 Fix rendering of language selector 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 12:59:41 +01:00
Burak Yavuz
e73a59f18e Translated using Weblate (Turkish) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-13 11:30:05 +01:00
Weblate
a1fa82f39b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-13 11:24:18 +01:00
Giovanni Sora
ca1abc679c Translated using Weblate (Interlingua) 
Currently translated at 74.7% (2407 of 3222 strings)

[CI skip]
 2016-12-13 11:24:16 +01:00
Weblate
8d3354b15e Merge remote-tracking branch 'origin/master' 2016-12-13 11:24:13 +01:00
Giovanni Sora
9ec783a180 Translated using Weblate (Interlingua) 
Currently translated at 74.6% (2419 of 3239 strings)

[CI skip]
 2016-12-13 11:24:10 +01:00
Michal Čihař
d7ea170950 Merge branch 'QA_4_6' 2016-12-13 11:23:58 +01:00
Giovanni Sora
98d4b2eca4 Translated using Weblate (Interlingua) 
Currently translated at 74.6% (2418 of 3239 strings)

[CI skip]
 2016-12-13 11:23:18 +01:00
Michal Čihař
15f63f3d96 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-12-13 11:23:06 +01:00
Michal Čihař
a86450728a Translated using Weblate (Czech) 
Currently translated at 93.8% (3023 of 3222 strings)

[CI skip]
 2016-12-13 11:22:56 +01:00
Michal Čihař
719cb1f309 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-12-13 11:22:43 +01:00
Weblate
bddb5500e6 Merge remote-tracking branch 'origin/master' 2016-12-13 11:19:05 +01:00
Michal Čihař
c9a67a4d5e Translated using Weblate (Czech) 
Currently translated at 93.0% (3014 of 3239 strings)

[CI skip]
 2016-12-13 11:19:01 +01:00
Michal Čihař
c5b879c745 Merge branch 'QA_4_6' 2016-12-13 11:18:26 +01:00
Michal Čihař
2b134240b8 Share code for session cache key calculation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 11:17:58 +01:00
Burak Yavuz
2e561a296e Translated using Weblate (Turkish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-13 11:04:48 +01:00
Michal Čihař
8ef66ace36 Merge branch 'QA_4_6' 2016-12-13 10:54:59 +01:00
Michal Čihař
8d5939348e Use current user in session cache key 
This makes it automatically valid only for current user.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:54:08 +01:00
Michal Čihař
91dd60e6ad Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:42:21 +01:00
Michal Čihař
0ddcd3c372 Merge branch 'QA_4_6' 2016-12-13 10:41:29 +01:00
Michal Čihař
f18e02b16d Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:40:52 +01:00
Weblate
f87a5e7654 Merge remote-tracking branch 'origin/master' 2016-12-13 10:39:56 +01:00
Michal Čihař
7c737eeb72 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-12-13 10:39:55 +01:00
Laura Arjona Reina
2fdfb642b0 Translated using Weblate (Spanish) 
Currently translated at 99.1% (3205 of 3232 strings)

[CI skip]
 2016-12-13 10:39:55 +01:00
Michal Čihař
49a20101e2 Merge branch 'QA_4_6' 2016-12-13 10:39:42 +01:00