gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,134 Commits 12 Branches 481 Tags 2.4 GiB
2c90167a8a
Commit Graph

106134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2c90167a8a Merge remote-tracking branch 'origin/pull/12689' into QA_4_6 2016-11-09 18:04:49 +01:00
Michal Čihař
0404f09ace Update SQL parser to 3.4.12 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-09 17:43:13 +01:00
Marc Delisle
9fb7293eef Translated using Weblate (French) 
Currently translated at 99.7% (3211 of 3219 strings)

[CI skip]
 2016-11-09 17:43:04 +01:00
Sevdimali İsa
94ef1a4f7c Translated using Weblate (Azerbaijani) 
Currently translated at 53.3% (1717 of 3219 strings)

[CI skip]
 2016-11-09 17:43:03 +01:00
Deven Bansod
2309ef57d2 Add LEFT JOIN for different constraints 
If there are two or more columns in the same constraint (foreign key),
we should use AND to concatenate the conditions on LEFT JOIN for both the columns

Fix #12652

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-09 21:16:00 +05:30
Michal Čihař
583304a132 Changelog entry for #12683 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-08 14:51:30 +01:00
Michal Čihař
8babc66201 Merge remote-tracking branch 'origin/pull/12683' into QA_4_6 2016-11-08 14:50:42 +01:00
Michal Čihař
164176cbbe Changelog entry for #12666 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-08 14:48:44 +01:00
Michal Čihař
9df6c8258c Merge remote-tracking branch 'origin/pull/12666' into QA_4_6 2016-11-08 14:48:16 +01:00
Michal Čihař
af73f564dd Changelog entry for #12678 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-08 14:45:46 +01:00
Michal Čihař
38a804edde Merge remote-tracking branch 'origin/pull/12678' into QA_4_6 2016-11-08 14:45:10 +01:00
Weblate
303da921a2 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-08 06:37:12 +01:00
Deven Bansod
7b4f4a1bff Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-11-08 11:08:33 +05:30
Deven Bansod
ff3dd90172 Remove unused deubgging calls 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-08 11:07:41 +05:30
popinha13
80ad2da2b8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.2% (3001 of 3219 strings)

[CI skip]
 2016-11-08 06:37:11 +01:00
Lee Joon Haeng
1fcfdb9963 Translated using Weblate (Korean) 
Currently translated at 80.5% (2592 of 3219 strings)

[CI skip]
 2016-11-08 06:37:10 +01:00
Nils Van Zuijlen
dec24a713e Translated using Weblate (French) 
Currently translated at 99.5% (3205 of 3219 strings)

[CI skip]
 2016-11-08 06:37:10 +01:00
Nils Van Zuijlen
1503912dc1 Translated using Weblate (Breton) 
Currently translated at 16.9% (547 of 3219 strings)

[CI skip]
 2016-11-08 06:37:09 +01:00
Prasna Lukito
39abc62b37 Translated using Weblate (Indonesian) 
Currently translated at 69.9% (2252 of 3219 strings)

[CI skip]
 2016-11-08 00:45:10 +01:00
Guilherme Rocha
eb5fa46b0c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2999 of 3219 strings)

[CI skip]
 2016-11-07 14:07:31 +01:00
popinha13
14317c7734 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2998 of 3219 strings)

[CI skip]
 2016-11-07 13:57:56 +01:00
Lee Joon Haeng
5795f3d15a Translated using Weblate (Korean) 
Currently translated at 80.3% (2585 of 3219 strings)

[CI skip]
 2016-11-06 06:45:21 +01:00
Deven Bansod
8badbe371a Don't urlencode the table and database names 
If used in encoded form, they are shown to be non-existent

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-05 09:53:36 +05:30
Jørgen Thomsen
8fbff5f19e Translated using Weblate (Danish) 
Currently translated at 96.0% (3092 of 3219 strings)

[CI skip]
 2016-11-04 18:44:31 +01:00
Deven Bansod
9be7c55bd0 Allow for proper MySQL-allowed strings as identifiers 
Fix #12674

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-01 21:20:13 +05:30
Deven Bansod
8556b5d4bf ChangeLog for #12665 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-30 14:49:41 +05:30
Deven Bansod
1475c0e811 Allow Foreign keys to be added on non-indexed columns, if it's an InnoDB table 
InnoDB automatically creates an index over the column, which can be replaced
by defining a new index over the same column.

Fix #12665

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-30 13:39:02 +05:30
Deven Bansod
2fbf09ba2d ChangeLog for #12195 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-28 13:12:43 +05:30
Deven Bansod
3e9c30a561 Document prevention of errors with import of ROW_FORMAT=fixed in newer MySQL versions 
See https://github.com/phpmyadmin/phpmyadmin/issues/12195#issuecomment-256849353

Fix #12195

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-28 13:08:17 +05:30
Deven Bansod
368b74bad6 ChangeLog for #12661 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-27 17:02:02 +05:30
Deven Bansod
c5d3b0bbb0 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-27 16:54:04 +05:30
Deven Bansod
e4fe53217e Try adding query to history only if Database links are available 
Fix #12661

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-27 16:52:40 +05:30
Stefano Martinelli
077a79b5ce Translated using Weblate (Italian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 11:36:18 +02:00
Stefano Martinelli
e0195f1928 Translated using Weblate (Italian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 10:33:31 +02:00
dingo thirteen
8f29910c03 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 10:32:16 +02:00
Burak Yavuz
b249cdbc95 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 07:31:13 +02:00
Deven Bansod
74db20cc9e ChangeLog for #12610 
Fix #12610 , with updating of SQL Parser to 3.4.11 in 1ec99a

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-27 10:02:40 +05:30
Weblate
d44caac678 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-27 06:32:02 +02:00
Παναγιώτης Παπάζογλου
e7e8c9a5b4 Translated using Weblate (Greek) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 06:32:00 +02:00
Deven Bansod
95c23da6e0 Close the UI for invalid 'time' values too 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-27 08:02:37 +05:30
Deven Bansod
11575ad959 Add tooltip for acceptance of additional values 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-26 21:44:07 +05:30
Deven Bansod
c2f7f82a98 If date is invalid acc to datePicker plugin, close the UI 
There are partial dates like '0000-00-00', '2016-00-00' etc. which are
rejected by the Datetimepicker JQuery plugin, but can be accepted by MySQL server

Fix #12651

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-26 21:29:54 +05:30
Deven Bansod
cc50e75e31 Allow for partial dates on Insert page and while editing a row (via Edit Row link) 
Issue #12651

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-26 21:29:43 +05:30
Michal Čihař
9e0e8a4bf1 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 11:14:19 +02:00
Michal Čihař
a6dd27897e Remove no longer used file 
The docs is now generated using ApiGen.

See also phpmyadmin/docker#78

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:41:38 +02:00
Michal Čihař
a33693bb8e Changelog entry for #12334 and #12626 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:30:59 +02:00
Michal Čihař
2c91327374 Merge pull request #12626 from madhuracj/bug12234 
Fix bug #12234 No page indicator in view
 2016-10-25 10:28:54 +02:00
Michal Čihař
0983ff0586 Changelog entry for #12648 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:27:30 +02:00
Michal Čihař
287cd62497 Merge pull request #12648 from devenbansod/fix_12622 
Fix submission of 'Save page' form using Enter keypress
 2016-10-25 10:27:00 +02:00
Michal Čihař
cefb072fea Changelog entry for #12654 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:25:14 +02:00