gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,368 Commits 12 Branches 481 Tags 2.4 GiB
48d599e99b
Commit Graph

107368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
48d599e99b Merge branch 'QA_4_6' 
Conflicts:
	po/ru.po
 2016-10-05 13:49:05 +05:30
Deven Bansod
7d2760cec5 ChangeLog entry for #12362 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-05 13:48:21 +05:30
Deven Bansod
f6d2804aba Merge branch 'QA_4_6' 2016-10-05 11:36:04 +05:30
Deven Bansod
889cd31618 Prevent leaving an orphaned file while importing preferences 
Fix #12362

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-05 11:33:44 +05:30
Weblate
c4a2e1b6f2 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-05 08:02:30 +02:00
Val Bancer
39f4a595b2 Translated using Weblate (Russian) 
Currently translated at 98.2% (3156 of 3213 strings)

[CI skip]
 2016-10-05 08:02:29 +02:00
Weblate
262eb1acf7 Merge remote-tracking branch 'origin/master' 2016-10-04 17:26:36 +02:00
Val Bancer
30c52d57c2 Translated using Weblate (Russian) 
Currently translated at 97.3% (3135 of 3219 strings)

[CI skip]
 2016-10-04 17:26:35 +02:00
Michal Čihař
db4a2e11f4 Add suggestion for AllowRoot as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 17:26:24 +02:00
Michal Čihař
3f0122b6f4 Merge branch 'QA_4_6' 2016-10-04 12:17:21 +02:00
Michal Čihař
a7786dd93a Changelog for #12582 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:17:02 +02:00
Michal Čihař
686db2039d Merge pull request #12582 from devenbansod/fix_12569 
Use Response instead of Message's display method to print error
 2016-10-04 12:16:06 +02:00
Michal Čihař
82158f4c48 Merge branch 'QA_4_6' 2016-10-04 12:02:07 +02:00
Michal Čihař
ddf580c51b Fix OmniWeb version match (issue #12615) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:02:02 +02:00
Michal Čihař
1a23eccd2b Remove code for MSIE 6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:01:27 +02:00
Michal Čihař
f006408ffa Remove code for MSIE < 8 
It's not supported anyway by jQuery.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 11:58:12 +02:00
Michal Čihař
ae6eb57652 Remove browser specific class from root element 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 11:56:11 +02:00
Michal Čihař
53d60c0235 Remove (unused) browser specific style 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 11:55:42 +02:00
Michal Čihař
7f35b62c06 Merge branch 'QA_4_6' 2016-10-04 11:51:46 +02:00
Michal Čihař
cd4c8374b1 Fixed regexp for matching browser versions 
Fixes #12615

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 11:51:29 +02:00
Deven Bansod
f04aa22cc6 Merge branch 'QA_4_6' 2016-10-04 10:59:31 +05:30
Deven Bansod
46ae500508 ChangeLog entry for #12419 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-04 10:59:05 +05:30
Deven Bansod
f14ad58d69 Merge branch 'QA_4_6' 2016-10-04 10:57:53 +05:30
Deven Bansod
26c7a58533 Merge pull request #12440 from rpv-tomsk/grant-option-description-12419 
Fix #12419 wrong description on GRANT option of table/routine privileges
 2016-10-04 10:54:21 +05:30
Michal Čihař
fc5bb4a278 Merge branch 'QA_4_6' 2016-10-03 19:38:40 +02:00
Michal Čihař
4ba041720f Changelog entry for #12584 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:36:33 +02:00
Michal Čihař
5071b8a016 Merge remote-tracking branch 'origin/pull/12584' into QA_4_6 2016-10-03 19:35:56 +02:00
Michal Čihař
0292b89c4a Merge remote-tracking branch 'origin/pull/12596' into QA_4_6 2016-10-03 19:35:07 +02:00
Michal Čihař
200a92b738 Merge remote-tracking branch 'origin/pull/12601' into QA_4_6 2016-10-03 19:33:48 +02:00
Michal Čihař
d24848400d Merge branch 'QA_4_6' 2016-10-03 19:28:01 +02:00
Michal Čihař
0a5ab3bfe9 Remove unused script 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:27:53 +02:00
Michal Čihař
e1d5a1338d Remove outdated script 
This is not used on the demo, there is separate one in scripts repo.

Fixes #12605

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:27:03 +02:00
Michal Čihař
73fb08a7aa Use stable version for demo links 
Fixes #12606

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:24:03 +02:00
Michal Čihař
c8200e1fa4 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-10-03 18:29:56 +02:00
Michal Čihař
48baca47b3 Merge branch 'QA_4_6' 2016-10-03 18:29:50 +02:00
Michal Čihař
4e020dea6b Update SQL parser to 3.4.10 
Fixes #12612

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 18:29:05 +02:00
Michal Čihař
9927c37f8d Merge pull request #12595 from nijel/remove-pow 
Remove Util::pow
 2016-10-03 16:45:34 +02:00
Michal Čihař
333ada932d Merge branch 'QA_4_6' 2016-10-03 16:06:42 +02:00
Michal Čihař
aa19ffde32 Update SQL parser to 3.4.9 
- issue #12316 Correct export of complex SELECT statements
- issue #12080 Fixed parsing of subselect queries
- issue #11740 Fixed handling DELETE ... USING queries
- issue #12100 Fixed handling of CASE operator

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 16:06:10 +02:00
Deven Bansod
9419526304 Merge branch 'QA_4_6' 
Conflicts:
	po/id.po
	po/zh_CN.po
 2016-10-03 14:20:10 +05:30
Deven Bansod
c202b7a87c Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-03 14:17:23 +05:30
Deven Bansod
6a53b89cb7 Escape database name properly to be used in MySQL wildcard statements 
Fix #12602

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 14:14:11 +05:30
Deven Bansod
b2d337814a Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-03 10:52:03 +05:30
Weblate
be1adf18e4 Merge remote-tracking branch 'origin/master' 2016-10-03 07:21:39 +02:00
Deven Bansod
77d1adcc47 Merge branch 'QA_4_6' 
Conflicts:
	po/id.po
	po/mk.po
 2016-10-03 10:53:28 +05:30
Dadan Setia
8e684a1947 Translated using Weblate (Indonesian) 
Currently translated at 68.4% (2204 of 3219 strings)

[CI skip]
 2016-10-03 07:21:37 +02:00
an wei
6de8fad985 Translated using Weblate (Chinese (China)) 
Currently translated at 87.6% (2820 of 3219 strings)

[CI skip]
 2016-10-03 07:21:36 +02:00
Deven Bansod
4fb7d73401 Don't assume justBrowsing if there is a Join in the query 
Fix #12189

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 10:50:32 +05:30
Weblate
b9adbff762 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-03 07:20:15 +02:00
Dadan Setia
cc161ba310 Translated using Weblate (Indonesian) 
Currently translated at 68.8% (2207 of 3206 strings)

[CI skip]
 2016-10-03 07:20:13 +02:00