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

85532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
ba993f8a2d Merge pull request #549 from xmujay/serverview_refactor 
refactor server_status_queries.php
 2013-07-30 04:47:31 -07:00
Michal Čihař
2dc9dc978a Use valid function names 2013-07-30 13:43:47 +02:00
Michal Čihař
c4041eaeba Use standard charset conversion inside DBI 2013-07-30 13:42:31 +02:00
Michal Čihař
d5b2f8daca Add mb_convert_encoding support to charset conversion 2013-07-30 13:42:31 +02:00
Michal Čihař
ed9c8595a2 Spacing around if 2013-07-30 13:42:31 +02:00
Michal Čihař
6c3099cae1 Remove double ; 2013-07-30 13:42:31 +02:00
Michal Čihař
1e33a3b5a6 Fix multi function indent 2013-07-30 13:42:31 +02:00
Michal Čihař
eebdc0ce06 This test takes sometimes longer 2013-07-30 13:42:31 +02:00
Michal Čihař
20a0b158b1 Reindent 2013-07-30 13:42:31 +02:00
Weblate
e95aea7945 Merge remote-tracking branch 'origin/master' 2013-07-30 13:27:21 +02:00
Tony Chen
95f569e3cc Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2708 of 2708)
 2013-07-30 13:25:52 +02:00
Anders Jonsson
a2e3565a14 Translated using Weblate (Swedish) 
Currently translated at 99.2% (2686 of 2708)
 2013-07-30 13:25:05 +02:00
Michal Čihař
9310e76a0e Fix indentation 2013-07-30 13:23:51 +02:00
Michal Čihař
659156aeba Wrap long line 2013-07-30 13:19:32 +02:00
Michal Čihař
2f38880f41 Function isset already returns boolean, no need to process it again 2013-07-30 13:19:32 +02:00
Michal Čihař
750c090249 Separete checks for numeric and all and directly convert value 2013-07-30 13:19:32 +02:00
Michal Čihař
8dcdd6de7a Better variable name 2013-07-30 13:19:31 +02:00
Michal Čihař
c09a7e5345 Reindent some lines 2013-07-30 13:19:31 +02:00
Michal Čihař
0bf3f009ab Simplify params processing by using local variable 2013-07-30 13:19:31 +02:00
Michal Čihař
cb1c893934 Fixed indentation 2013-07-30 13:19:31 +02:00
Tony Chen
ac1b040d7a Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2708.0 of 2708)
 2013-07-30 11:01:00 +02:00
Michal Čihař
637ce0ced0 Fix number of user prefs 
I wonder whether it really makes sense to test against count of
configurable properties...
 2013-07-30 10:23:02 +02:00
Michal Čihař
285a9a0f3f Merge remote-tracking branch 'origin/QA_4_0' 2013-07-30 10:18:05 +02:00
Michal Čihař
d56df11886 Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-30 10:17:38 +02:00
Michal Čihař
4da684e7b6 Fixed escaping in error message asking for translations 2013-07-30 10:17:32 +02:00
Michal Čihař
386217ebd1 Merge remote-tracking branch 'origin/QA_4_0' 2013-07-30 09:41:48 +02:00
Michal Čihař
dcd39bc57b Merge commit '7cb3344f4560609d8080c891b190ec170f364504' 2013-07-30 09:41:41 +02:00
Michal Čihař
41e06a48fd Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-30 09:41:13 +02:00
Michal Čihař
da4042fb6c Display none only if protection is enabled 2013-07-30 09:40:56 +02:00
Michal Čihař
7dc178ce49 Avoid double saving of version into session cache 2013-07-30 09:14:54 +02:00
Michal Čihař
a283c38a96 Translated using Weblate (Czech) 
Currently translated at 100.0% (2708.0 of 2708)
 2013-07-30 07:59:13 +02:00
Panagiotis Papazoglou
7903415bfa Translated using Weblate (Greek) 
Currently translated at 100.0% (2708.0 of 2708)
 2013-07-30 07:54:44 +02:00
Kristjan Räts
8476f94f6c Translated using Weblate (Estonian) 
Currently translated at 100.0% (2708.0 of 2708)
 2013-07-30 07:13:22 +02:00
Isaac Bennetch
0174f102aa Merge pull request #546 from kasunchathuranga/exportView 
Export views as if they were tables
 2013-07-29 21:14:21 -07:00
Kasun Chathuranga
94ff649d0d Fix undefined index notices on sql_views_as_tables 2013-07-30 07:20:35 +05:30
Weblate
459d2f8502 Merge remote-tracking branch 'origin/master' 2013-07-29 22:54:53 +02:00
Marcelo Camargo
99dc84f233 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.1% (2683 of 2707)
 2013-07-29 22:54:31 +02:00
Marc Delisle
1ad632c6df Fix merge conflicts 2013-07-29 16:52:35 -04:00
Rodrigo Souza
8ead0163ec Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.0% (2679 of 2707)
 2013-07-29 22:46:48 +02:00
Marc Delisle
36a22d282b Merge pull request #542 from xmujay/server_refactor2 
refactor server_import and related files
 2013-07-29 13:46:15 -07:00
Weblate
7cb3344f45 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-07-29 22:35:58 +02:00
Burak Yavuz
fda943a924 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2609 of 2609)
 2013-07-29 22:35:42 +02:00
Marc Delisle
30c1ed99cb Merge branch 'QA_4_0' 2013-07-29 16:34:46 -04:00
Marc Delisle
072d193af4 Merge commit '965105c' 2013-07-29 16:34:31 -04:00
Marc Delisle
5d946eaf57 Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-29 16:32:03 -04:00
Marc Delisle
66fe475d4f ChangeLog entry for Improved protection against cross framing 2013-07-29 16:31:44 -04:00
Matías Bellone
e8d465618d Translated using Weblate (Spanish) 
Currently translated at 100.0% (2708.0 of 2708)
 2013-07-29 22:30:12 +02:00
Matías Bellone
5ff68783cb Translated using Weblate (Spanish) 
Currently translated at 99.7% (2699 of 2708)
 2013-07-29 22:22:55 +02:00
Marc Delisle
4243170951 Fix merge conflicts 2013-07-29 16:20:15 -04:00
Matías Bellone
c0b40b2710 Translated using Weblate (Spanish) 
Currently translated at 99.3% (2689 of 2708)
 2013-07-29 22:05:33 +02:00