1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Commit Graph

5055 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
2dcecd7c08 Move jquery.md5.js to js/vendor/jquery
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-20 12:13:58 -02:00
Maurício Meneghini Fauth
dc8866230c Update TraceKit to 0.4.5
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-20 12:06:54 -02:00
Maurício Meneghini Fauth
bb8e3c3e54 Update CodeMirror to 5.30.0
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-20 11:54:18 -02:00
Ankit Jain
7a9754a64d Fixed #13748
Signed-off-by: Ankit Jain <ankitjain28may77@gmail.com>
2017-10-16 17:27:08 +05:30
Michal Čihař
2cf9b10134 Merge pull request #13682 from jakubstanecki/feature/13560-change-all-table-collations
Added change all table collations when changing database collation
2017-09-28 15:59:34 +02:00
Michal Čihař
448a221ea0 Fix passing boolean values as PMA_commonParams
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-28 11:07:08 +02:00
Maurício Meneghini Fauth
3a00dd69a5 Change ESLint's one-var to error
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-25 22:46:20 -03:00
Maurício Meneghini Fauth
ef99fef8d6 Change ESLint's eqeqeq to error
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-25 21:30:14 -03:00
Maurício Meneghini Fauth
97323989cb Change ESLint's brace-style to error
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-25 17:58:45 -03:00
Maurício Meneghini Fauth
00e1ca9b66 Automatic fixes by ESLint
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-25 14:22:35 -03:00
ryanml
aa7434096b Fixing Issue #13584, adjusting create table input when import config notification is present
Signed-off-by: Ryan Lanese <rlanese@asu.edu>
2017-09-19 06:50:10 -07:00
codehimanshu
9858d9ef20 fix issue #13666
Signed-off-by: Himanshu Agrawal <himanshuagrawal1998@gmail.com>
2017-09-18 22:12:15 +05:30
Jakub Stanecki
e3e4fa93fd Added change all table collations when changing database collation
Signed-off-by: Jakub Stanecki <staneckijakub@gmail.com>
2017-09-16 23:06:07 +02:00
Maurício Meneghini Fauth
feb5abc43a Merge pull request #13674 from jakubstanecki/feature/13660-add-refresh-button-to-export-results-when-view-output-as-text-is-selected
Added refresh button in export
2017-09-14 21:10:49 -03:00
Jakub Stanecki
9f27920406 Added refresh button in export (support for F5)
Signed-off-by: Jakub Stanecki <staneckijakub@gmail.com>
2017-09-15 00:51:50 +02:00
Maurício Meneghini Fauth
695f51034d Refactor FormDisplay.tpl functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-14 11:53:56 -03:00
Maurício Meneghini Fauth
010e455796 Merge pull request #13672 from jakubstanecki/bug/13044-remembersorting-table-uiprefs-not-saving-when-using-the-sort-by-key-select
Added remember table sorting when browsing table

Fix #13044
2017-09-14 10:47:52 -03:00
Maurício Meneghini Fauth
faf19202e0 Merge pull request #13671 from jakubstanecki/bug/13410-add-constraint-copies-current-constraint-s-name
Clean text inputs values in current constraints row

Fix #13410
2017-09-14 10:18:55 -03:00
Maurício Meneghini Fauth
a893e62143 Merge branch 'QA_4_7' 2017-09-11 21:13:15 -03:00
Jakub Stanecki
2192fadc0b Fix selecting multiple rows accidentally selects the next row too
Fix #13669

Signed-off-by: Jakub Stanecki <staneckijakub@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-11 20:58:12 -03:00
Jakub Stanecki
5b1ed4c326 Added remember table sorting when browsing table
Signed-off-by: Jakub Stanecki <staneckijakub@gmail.com>
2017-09-11 21:37:29 +02:00
Jakub Stanecki
df03897dbb Clean text inputs values in current constraints row
Signed-off-by: Jakub Stanecki <staneckijakub@gmail.com>
2017-09-11 21:29:50 +02:00
Maurício Meneghini Fauth
512d81cb29 Refactor display_create_table to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-07 09:37:02 -03:00
Maurício Meneghini Fauth
2217b4c960 Refactor change password function to static method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-06 21:42:18 -03:00
Michal Čihař
811d124503 Merge branch 'QA_4_7' 2017-09-04 16:58:11 +02:00
Michal Čihař
04add7c918 Better report connection errors
Provide verbose error description when we can't connect to the server
from client.

Fixes #13183

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-04 16:57:27 +02:00
Michal Čihař
0fcceb9b2f Do not include error code 0 in the message
It really is not useful information.

Issue #13183

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-04 16:53:56 +02:00
Michal Čihař
2a883f8ba1 Include error detail in the error message
Issue #13183

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-04 16:51:19 +02:00
akritianand
4f6335bb59 Do not include messages when copying results
Unnecessary data should not come in clipboard copied table.

Fixes #13617 

Signed-off-by: Akriti Anand <anand.akriti@gmail.com>
2017-09-04 09:55:12 +02:00
Michal Čihař
ca68951b85 Merge branch 'QA_4_7' 2017-08-29 15:34:34 +02:00
Michal Čihař
e781cf0c76 Fixed javascript error in server monitor
Fixes #13628

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-29 15:34:21 +02:00
Madhura Jayaratne
bf08e0ab6d Merge branch 'QA_4_7' 2017-08-29 23:33:43 +10:00
Madhura Jayaratne
047de9cdf4 Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-08-29 23:27:22 +10:00
Madhura Jayaratne
f4d77f905d Fix #13177 Grid editing repeats action after error
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2017-08-29 23:25:14 +10:00
Michal Čihař
85c335d13a Merge branch 'QA_4_7' 2017-08-28 15:06:24 +02:00
Michal Čihař
fa2dc971f6 Integrate tooltip into datetime pickers
The tooltip is now disabled when picker is shown and it's content is
rendered wihtin the picker.

Fixes #13612

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-28 15:05:50 +02:00
Isaac Bennetch
1e36be831e Merge pull request #13342 from Achilles-96/Multi-Table-Query-UI
Replace "Query By Example" with new "Multi Table Query" interface
2017-08-23 12:23:59 -04:00
Michal Čihař
f7404bce02 Do not use AJAX POST for forms that would normally use GET
Fixes #13606

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-23 14:44:26 +02:00
Michal Čihař
47e5f6894e Merge branch 'QA_4_7' 2017-08-23 14:44:57 +02:00
Raghuram
75404f72a8 Interface design for Multi-table query
Signed-off-by: Raghuram <raghuram.vadapalli@research.iiit.ac.in>
2017-08-15 11:04:40 +05:30
Isaac Bennetch
486daec6d1 Remove debugging code
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2017-08-14 14:19:03 -04:00
Isaac Bennetch
c7264e5858 Merge pull request #13455 from Achilles-96/Issue-#5827
Allow Designer to show tables from other databases
2017-08-14 14:10:25 -04:00
HIMANSHU AGRAWAL
b63a39f806 Show warning if no users are selected
Fixes #13538

Signed-off-by: Himanshu Agrawal <himanshuagrawal1998@gmail.com>
2017-08-07 07:19:53 -04:00
Michal Čihař
1d56452d2a Fix query formatting for AJAX loaded forms
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 08:38:11 +02:00
Michal Čihař
50dc0bd590 Avoid two locations fighting for codemirror_editor variable
Fixes #13545

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 08:38:11 +02:00
Michal Čihař
5e9bb1b584 Merge branch 'QA_4_7' 2017-08-02 08:19:45 +02:00
Michal Čihař
ef891b2bba Simplify code for copying to clipboard
Honestly I don't understand the old code, but it breaks on fields with
applied transformations, while using simply text() works fine.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 08:18:37 +02:00
Michal Čihař
626c2b3a29 Remove not needed variable
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 08:14:12 +02:00
Michal Čihař
12f54fd0cf Fixed copy results to clipboard
Copy only results table, not all tables on the page.

Fixes #13550

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 08:12:41 +02:00
Michal Čihař
33dd51eaf7 Move SQL copy handler to sql.js
Issue #13550

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 08:11:32 +02:00