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

107894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
0349c7c5a3 Merge remote-tracking branch 'origin/pull/12287' 2016-11-18 10:08:02 +01:00
Deven Bansod
6ceaeea125 Merge branch 'QA_4_6' 2016-11-17 09:34:21 +05:30
Deven Bansod
3bced0d02f ChangeLog for #12712 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-17 09:33:43 +05:30
Michal Čihař
483aaa7ee5 Merge branch 'QA_4_6' 2016-11-16 18:15:37 +01:00
Michal Čihař
fab13653a8 Add link to release notes and download on new version notification 
Fixes #12698

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-16 18:15:23 +01:00
Michal Čihař
1722306a4b Merge remote-tracking branch 'origin/QA_4_6' 2016-11-16 17:49:02 +01:00
Michal Čihař
625fa53f8b Merge commit '80d1bc7c2b6c29b29fe6653ae54d34f8bbb828d4' 2016-11-16 17:48:53 +01:00
Weblate
e7b19f2a2c Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-16 17:48:21 +01:00
Marc Delisle
050e9ebf61 Translated using Weblate (French) 
Currently translated at 99.4% (3205 of 3222 strings)

[CI skip]
 2016-11-16 17:48:19 +01:00
Michal Čihař
80d1bc7c2b Merge pull request #12711 from devenbansod/fix_12361 
Fix #12361 : Fix self SQL injection in table-specific privileges
 2016-11-16 17:48:14 +01:00
Patric Gustafsson
1f52c2a829 Remove unused variable 
Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-11-16 18:38:22 +02:00
Patric Gustafsson
fcd6e5b1ad Remove unused CSS class checks 
Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-11-16 18:28:57 +02:00
Patric Gustafsson
d1aa527944 Remove unused CSS class 
Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-11-16 18:23:14 +02:00
Patric Gustafsson
29755886bb Merge remote-tracking branch 'upstream/master' 2016-11-16 18:05:37 +02:00
Weblate
9e752595f0 Merge remote-tracking branch 'origin/master' 2016-11-16 16:11:59 +01:00
Marc Delisle
4eb366ff02 Translated using Weblate (French) 
Currently translated at 99.1% (3206 of 3232 strings)

[CI skip]
 2016-11-16 16:11:57 +01:00
Michal Čihař
0b510fb3cc Simplify PHP 7.1 test setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-16 16:11:47 +01:00
Patric Gustafsson
6da6083d27 Remove unused CSS class 
Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-11-16 15:50:26 +02:00
Patric Gustafsson
f92c9086a7 Remove unused variable 
Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-11-16 15:30:12 +02:00
Patric Gustafsson
708a9f30fd Fix test 
Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-11-16 14:36:18 +02:00
Patric Gustafsson
f101f31064 Merge remote-tracking branch 'upstream/master' 2016-11-16 14:35:40 +02:00
Deven Bansod
88b284816c ChangeLog for #12361 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	ChangeLog
 2016-11-16 11:12:05 +05:30
Deven Bansod
b69311e460 Fix self-injection in Table specific privileges 
Don't manually add backticks (`) rather use the Util function,
since escaping of backticks inside the column_name has to be handled too.

Fix #12361

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-16 11:11:41 +05:30
Deven Bansod
ace8d9c945 Merge branch 'QA_4_6' 2016-11-16 09:24:49 +05:30
Deven Bansod
0c36e5fd85 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-11-16 09:23:56 +05:30
Deven Bansod
74fd7986eb Remove debugging calls 
Fix #12706

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-16 09:23:06 +05:30
Deven Bansod
f4f4917230 Remove debugging calls 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-16 09:22:42 +05:30
Patric Gustafsson
8e6202bbc9 Remove odd CSS class logic from template files 
Odd CSS class is no longer needed, background coloring
is now done with CSS pseudo-class.

Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-11-15 19:22:34 +02:00
Patric Gustafsson
3ecfa98907 Merge remote-tracking branch 'upstream/master' 2016-11-15 19:19:17 +02:00
Deven Bansod
accd6aa17e Add token parameter in AJAX POST request 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-15 22:28:45 +05:30
Deven Bansod
d833ba5655 Merge branch 'QA_4_6' 
Conflicts:
	js/db_search.js
	libraries/DbSearch.php
	test/classes/DbSearchTest.php
 2016-11-15 22:26:11 +05:30
Michal Čihař
59b2c5a63a Fix markup and tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-15 17:41:38 +01:00
Michal Čihař
51c7739526 Changelog entry for #12696 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-15 17:27:16 +01:00
Michal Čihař
aef7f9288a Merge pull request #12696 from devenbansod/fix_12299 
Fix #12299: Change to POST request to avoid possibly very long URIs
 2016-11-15 17:26:06 +01:00
Deven Bansod
21093b22e4 Escape tablenames, dbnames and properly render html-specific elements/chars 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-15 21:47:32 +05:30
Patric Gustafsson
1bd5fe709d Merge remote-tracking branch 'upstream/master' 2016-11-15 18:08:24 +02:00
Michal Čihař
819ec1b552 Merge branch 'QA_4_6' 2016-11-15 17:06:18 +01:00
Michal Čihař
abe50c6129 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-11-15 17:05:58 +01:00
Michal Čihař
0fb1e3d4c6 Merge branch 'QA_4_6' 2016-11-15 17:05:44 +01:00
Michal Čihař
8d4ea7bad2 Update SQL parser to 3.4.13 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-15 17:05:28 +01:00
Deven Bansod
89dfff7868 Change to using HTML5 data-* attributes to allow easy access in JQuery 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-15 21:14:07 +05:30
Weblate
f3ab8cd00b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-15 15:23:10 +01:00
Hendrik Michaelsen
0b638d735c Translated using Weblate (German) 
Currently translated at 99.4% (3203 of 3222 strings)

[CI skip]
 2016-11-15 15:23:08 +01:00
Marc Delisle
5e354b9439 Translated using Weblate (French) 
Currently translated at 99.4% (3204 of 3222 strings)

[CI skip]
 2016-11-15 15:23:08 +01:00
Michal Čihař
4222000549 Merge branch 'QA_4_6' 2016-11-15 15:22:49 +01:00
Michal Čihař
46eaa53ddd Check parameter type before processing 
Fixes #12443

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-15 15:22:32 +01:00
Weblate
aaa3901406 Merge remote-tracking branch 'origin/master' 2016-11-15 15:20:26 +01:00
Hendrik Michaelsen
51f09c1f1e Translated using Weblate (German) 
Currently translated at 99.4% (3213 of 3232 strings)

[CI skip]
 2016-11-15 15:20:24 +01:00
Marc Delisle
d6ad8571a3 Translated using Weblate (French) 
Currently translated at 99.1% (3204 of 3232 strings)

[CI skip]
 2016-11-15 15:20:24 +01:00
Michal Čihař
78fa4f5b13 Merge pull request #12563 from tfaller/master 
Fix error check of a routine execution
 2016-11-15 15:20:14 +01:00