gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,454 Commits 12 Branches 481 Tags 2.4 GiB
097b83cd98
Commit Graph

101454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
097b83cd98 This is not an ajaxified form 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 12:09:30 +05:30
Madhura Jayaratne
8d0a9ff74e Fix another instance of issue #10307 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 12:07:58 +05:30
Madhura Jayaratne
cba50c1e5a Merge branch 'issue10307' 2015-07-29 12:01:44 +05:30
Madhura Jayaratne
c21377d2da Fix #10307 Replication broken when using cross-database master/slave config and phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 08:29:25 +05:30
Marc Delisle
0e8c6983b8 Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-28 20:43:08 -04:00
Marc Delisle
11472afa87 Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-28 19:49:40 -04:00
Hugues Peccatte
7d295166c5 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-07-28 22:37:04 +02:00
Hugues Peccatte
2efdf5f197 Make PHPCS happy. 
Return null values instead of void.
Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-28 22:36:49 +02:00
Weblate
398dc64096 Merge remote-tracking branch 'origin/master' 2015-07-28 20:39:12 +02:00
Moshe Harush
b3218123ef Translated using Weblate (Hebrew) 
Currently translated at 17.6% (564 of 3194 strings)

[CI skip]
 2015-07-28 20:39:09 +02:00
Hugues Peccatte
bce60613ae Update comments style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-28 20:38:59 +02:00
Marc Delisle
057536256f Translated using Weblate (French) 
Currently translated at 99.6% (3182 of 3194 strings)

[CI skip]
 2015-07-28 13:37:07 +02:00
Madhura Jayaratne
9a8e8e60c8 Fix #11328 Exporting table generates AUTO_INCREMENT=; for new tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 16:13:42 +05:30
Madhura Jayaratne
87fadc20b0 Remove extraneous spaces around values. Remove deprecated cellpadding and cellspacing attributes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 15:12:52 +05:30
Madhura Jayaratne
9b0b23cbfe Do not jump to the top of the page when clicking on these links to open a section 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 13:31:13 +05:30
Madhura Jayaratne
c122e761c9 Merge branch 'QA_4_4' 2015-07-28 09:13:42 +05:30
Madhura Jayaratne
ccc6ea454d Align ChangeLog entries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 09:11:12 +05:30
Madhura Jayaratne
75cf9e7d59 Merge branch 'QA_4_4' 2015-07-28 08:17:42 +05:30
Weblate
6fa0e78f15 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-07-28 04:43:02 +02:00
Andrey Aleksanyants
71309f41e3 Translated using Weblate (Armenian) 
Currently translated at 49.2% (1496 of 3038 strings)

[CI skip]
 2015-07-28 04:42:59 +02:00
Madhura Jayaratne
7c1c639ef4 Fix #11326 Exported schema includes all the tables of the database 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 08:11:38 +05:30
Marc Delisle
877fc06c2a Complete type definition 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-27 17:11:04 -04:00
Hugues Peccatte
f661b97c6d Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-27 21:35:19 +02:00
Hugues Peccatte
5888218060 Fix HTML attribute value. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-27 21:14:45 +02:00
Hugues Peccatte
6434fbfa80 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-27 21:13:58 +02:00
Isaac Bennetch
d48cc5d12a ChangeLog for pull request 1792 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-07-27 14:10:50 -04:00
Isaac Bennetch
7b1765f1fd Merge pull request #1792 from devenbansod/rfe1396 
RFE #1396 : Add support for MySQL 5.6.6+ SHA256 Auth plugin
 2015-07-27 14:04:51 -04:00
Isaac Bennetch
9456ee8514 Merge pull request #1797 from devenbansod/reload_privs_visibility 
Make visibility of Reload privs notice conditional
 2015-07-27 13:41:36 -04:00
Hugues Peccatte
0a7ff32c28 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-07-27 18:50:55 +02:00
Hugues Peccatte
839ac8412a Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-27 18:50:45 +02:00
Marc Delisle
5bddfec5c5 Merge pull request #11323 from madhuracj/cache 
Avoid caching JS and CSS files across phpMyAdmin versions
 2015-07-27 12:50:16 -04:00
Madhura Jayaratne
cd76cb6acc Avoid caching JS and CSS files across phpMyAdmin versions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 21:52:20 +05:30
Marc Delisle
e9f0554775 Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-27 10:34:59 -04:00
Weblate
ea5e3e6e4a Merge remote-tracking branch 'origin/master' 2015-07-27 16:14:33 +02:00
Andrey Aleksanyants
ae03d0b379 Translated using Weblate (Armenian) 
Currently translated at 50.0% (1600 of 3194 strings)

[CI skip]
 2015-07-27 16:14:30 +02:00
Marc Delisle
07071a169b Make phan happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-27 10:14:22 -04:00
Weblate
9f464fd861 Merge remote-tracking branch 'origin/master' 2015-07-27 15:07:00 +02:00
Andrey Aleksanyants
1c73d0407b Translated using Weblate (Armenian) 
Currently translated at 50.0% (1599 of 3194 strings)

[CI skip]
 2015-07-27 15:06:56 +02:00
Madhura Jayaratne
9e2e1b4c0e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-27 18:36:48 +05:30
Madhura Jayaratne
11d8de1ca9 Fix #11324 JS error while opening a new page in Desginer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 18:35:45 +05:30
Marc Delisle
bb81230644 Translated using Weblate (French) 
Currently translated at 99.5% (3179 of 3194 strings)

[CI skip]
 2015-07-27 14:47:44 +02:00
Weblate
55a0ca2693 Merge remote-tracking branch 'origin/master' 2015-07-27 14:37:32 +02:00
Andrey Aleksanyants
fbd70972f4 Translated using Weblate (Armenian) 
Currently translated at 49.9% (1596 of 3194 strings)

[CI skip]
 2015-07-27 14:37:28 +02:00
Madhura Jayaratne
df1582d625 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-27 18:06:34 +05:30
Madhura Jayaratne
80c944ef2b Upgrade TCPDF to version 6.2.9 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 18:05:14 +05:30
Andrey Aleksanyants
3bdcaaa9c6 Translated using Weblate (Armenian) 
Currently translated at 43.0% (1375 of 3194 strings)

[CI skip]
 2015-07-27 10:48:32 +02:00
Andrey Aleksanyants
4c124ce668 Translated using Weblate (Armenian) 
Currently translated at 42.1% (1282 of 3038 strings)

[CI skip]
 2015-07-27 10:45:56 +02:00
Madhura Jayaratne
6c37fd9e36 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-27 12:31:20 +05:30
Madhura Jayaratne
6504d2f10d Align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 12:30:10 +05:30
Weblate
733999cf79 Merge remote-tracking branch 'origin/master' 2015-07-27 08:59:45 +02:00