Commit Graph

101032 Commits

Author SHA1 Message Date
Dan Ungureanu
3fdd86ceda Updated sql-parser library to udan11/sql-parser@8835414.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-17 22:55:59 +03:00
Dan Ungureanu
98a497e67c Do not process unauthorized requests.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-17 18:14:57 +03:00
Dan Ungureanu
c5a788bfec Use mb_strlen to match the other code base.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-17 18:14:12 +03:00
Dan Ungureanu
0a96c497c8 Updated sql-parser library to udan11/sql-parser@9e3a9ee.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-16 16:46:10 +03:00
Dan Ungureanu
33344520a3 Fixed a few of Scrutinizer's issue.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-15 19:53:46 +03:00
Dan Ungureanu
024d96700d Reorganized code.
Fixed a bug that miscalculated the position of the tokens.
Added tests.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-15 18:08:18 +03:00
Dan Ungureanu
4c24db0812 Style improvements.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-15 17:19:13 +03:00
Dan Ungureanu
068c11bb80 Updated sql-parser library to udan11/sql-parser@56ce2d7.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-15 16:52:08 +03:00
Dan Ungureanu
eef994f122 Added lint.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-15 16:48:13 +03:00
Marc Delisle
ea015a5389 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-15 08:06:35 -04:00
Weblate
48c895909a Merge remote-tracking branch 'origin/master' 2015-07-15 03:50:24 +02:00
Dalibor Straka
b36e840f81 Translated using Weblate (Czech)
Currently translated at 97.1% (3064 of 3155 strings)

[CI skip]
2015-07-15 03:50:20 +02:00
Isaac Bennetch
62547b127e Merge pull request #1790 from devenbansod/701C
Improve Print View output by removing #prefs_autoload.
2015-07-14 21:50:14 -04:00
Aleš Hakl
acd6c4ea18 Translated using Weblate (Czech)
Currently translated at 97.0% (3062 of 3155 strings)

[CI skip]
2015-07-14 23:54:12 +02:00
Stefano Martinelli
03af422de4 Translated using Weblate (Italian)
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
2015-07-14 16:13:01 +02:00
Marc Delisle
680d70af8b The "Sort by key" drop-down should have priority over the remembered sorting
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-14 09:22:02 -04:00
Madhura Jayaratne
86e1510b9a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-14 17:04:40 +05:30
Madhura Jayaratne
e70d2cf551 bug #4981 Uncaught TypeError: Cannot read property 'attr' of null
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-14 17:03:30 +05:30
Marc Delisle
c7a4d176c5 Merge branch 'QA_4_4' 2015-07-14 06:46:29 -04:00
Marc Delisle
0ec95ea88b Merge commit '62042d2' 2015-07-14 06:46:22 -04:00
Marc Delisle
598ebb8057 Changelog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-14 06:45:46 -04:00
Olivier PIERRE
e62113e170 Add missing head tag
Signed-off-by: Olivier PIERRE <mail@olivierpierre.net>
2015-07-14 06:43:49 -04:00
Weblate
b54906dbf2 Merge remote-tracking branch 'origin/master' 2015-07-14 11:27:47 +02:00
Michal Čihař
5cc23386fe Translated using Weblate (Bengali)
Currently translated at 78.3% (2472 of 3155 strings)

[CI skip]
2015-07-14 11:27:43 +02:00
Madhura Jayaratne
b065dede6d Merge branch 'QA_4_4' 2015-07-14 14:57:23 +05:30
Weblate
62042d2776 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-07-14 11:25:33 +02:00
Michal Čihař
e849cb5b73 Translated using Weblate (Bengali)
Currently translated at 82.6% (2512 of 3038 strings)

[CI skip]
2015-07-14 11:25:28 +02:00
Madhura Jayaratne
e4de638bbd Only the empty repeats in the last column should be skipped
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-14 14:55:01 +05:30
Deven Bansod
f1961969f6 Fixed a small error
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-07-14 14:38:21 +05:30
Madhura Jayaratne
6cd73329a6 Merge branch 'QA_4_4' 2015-07-14 14:27:02 +05:30
Madhura Jayaratne
9614518999 bug #4979 Problem when import *.ods file
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-14 14:25:19 +05:30
Madhura Jayaratne
57eb428335 ChangeLog entry for rfe #1517
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-14 10:57:27 +05:30
Madhura Jayaratne
ee1b179fcb Merge branch 'rfe1517' 2015-07-14 10:47:48 +05:30
Madhura Jayaratne
ae3fba2683 rfe #1517 Support for virtual/persistent columns in MariaDB
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-14 10:45:04 +05:30
Madhura Jayaratne
d90ebfe96b Get the latest version of sql-parser (8d2f7b5234fc6836c292051519d087f8a82cd48b)
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-14 10:17:14 +05:30
Balázs Úr
25f5cd774b Translated using Weblate (Hungarian)
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
2015-07-13 21:07:55 +02:00
Madhura Jayaratne
8b0088163d More show create queries
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-13 18:42:37 +05:30
Madhura Jayaratne
2b1234cff4 Result retrieve function has also changed
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-13 18:40:02 +05:30
Madhura Jayaratne
1ed244db25 Fix test. Numeric indexes are being used to fetch value
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-13 18:24:06 +05:30
Madhura Jayaratne
90b5983ddf Add a method to get CREATE TABLE statement to PMA_Table class
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-13 18:10:12 +05:30
Madhura Jayaratne
271b47956a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-13 16:31:30 +05:30
Madhura Jayaratne
80259fe7ee Fix typo
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-13 16:30:21 +05:30
Marc Delisle
7f7e45de6b Merge branch 'QA_4_4' 2015-07-13 06:54:21 -04:00
Marc Delisle
9bffc176fe ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-13 06:53:44 -04:00
Jack Smith
e88f290d44 Remove confusing second inline edit window (bug #4826)
When a long truncated text field is being inline edited it pops up a second edit window which could be confusing. Removed it.

Signed-off-by: Jack Smith <devjacksmith@gmail.com>
2015-07-13 06:52:07 -04:00
Madhura Jayaratne
f09a583368 Fix tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-13 16:18:00 +05:30
Madhura Jayaratne
d37fed64b6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-13 16:11:12 +05:30
Madhura Jayaratne
91397b24ec Add ChangeLog entry for MySQL virtual columns
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-13 16:07:59 +05:30
Marc Delisle
da47bab407 Translated using Weblate (French)
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
2015-07-13 12:36:34 +02:00
Madhura Jayaratne
cb8a75b719 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-13 15:59:25 +05:30