gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,299 Commits 12 Branches 481 Tags 2.4 GiB
ea3447ed8e
Commit Graph

3291 Commits

Author SHA1 Message Date
Hugues Peccatte
0023381dc5 Merge pull request #1127 from Tithugues/help4319 
Fix undefined max_input_vars.
 2014-04-06 11:45:55 +02:00
Hugues Peccatte
9632ea441b Fix undefined max_input_vars. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-05 21:23:43 +02:00
Marc Delisle
1fe36b313e Merge commit '942ae12' 2014-04-03 06:11:32 -04:00
Marc Delisle
942ae12559 bug #4350 Deleting the DB if it is renamed by the same name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-03 06:09:41 -04:00
Ashutosh Dhundhara
28b7b9031c Browser local storage support for Favorite tables feature. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed sync anchor location.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-02 18:20:29 +05:30
Marc Delisle
a4a3eee468 Merge pull request #1120 from ashutoshdhundhara/filter_rows 
Filter rows option on "Browse" table page.
 2014-03-31 10:18:27 -04:00
Ashutosh Dhundhara
5ea6345adb Filter rows option on "Browse" table page. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Filter rows feature on "Browse" table page.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Included table filter plugin in tbl_select.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-31 17:52:48 +05:30
Marc Delisle
06a2a5377e Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-30 09:45:27 -04:00
Marc Delisle
5c0b5413ca Merge pull request #1119 from Tithugues/help4319 
Add message to warn the user if a form has too many fields.
 2014-03-30 09:40:39 -04:00
Ann + J.M
149aad02da Reset favorite dropdown when selecting "There are no .." 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 22:26:42 +01:00
Hugues Peccatte
eac47b0775 Correct warning message. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-29 18:54:54 +01:00
Hugues Peccatte
287d08c826 Add message to warn the user if a form has too many fields. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-29 17:04:42 +01:00
Marc Delisle
0e13fc74a2 Merge pull request #1115 from ashutoshdhundhara/favorite_table 
Favorite tables feature using Ajax.
 2014-03-28 14:47:55 -04:00
Ashutosh Dhundhara
e9d59fd7e0 Implemented Favorite tables feature with Ajax. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fixes in Settings->Features page and Navigation Header class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed translation issues in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Another fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-29 00:06:14 +05:30
Marc Delisle
f5ff41facd Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-28 08:33:42 -04:00
Marc Delisle
7da28dbec1 Merge pull request #1100 from whitepiegon/QA_4_1_b3 
complete patch for #4279 ctrl +up/down + ff issue
 2014-03-28 08:24:56 -04:00
Marc Delisle
e4224bf18d Merge pull request #1095 from ashutoshdhundhara/favourite_tables_icon_only 
Feature request: #1476 Favorite tables select box.
 2014-03-26 17:01:18 -04:00
Aayush
d131cda6cb complete patch for #4279 ctrl +up/down final 
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
 2014-03-27 00:22:08 +05:30
Aayush
e8315404e0 #4279 ctrl+up/down for all ff 
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
 2014-03-27 00:08:12 +05:30
Ashutosh Dhundhara
8bc21b7876 Feature request: #1476 Favourite tables select box. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changes in "create_tables.sql".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped Trailing White spaces.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed irrelevant comments from "FavouriteTable.class.php".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed Table Summary colspan.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changed Favourite to Favorite

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Feature request: #1476 Favourite tables select box. (Icon only)

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Gray and Golden Icons.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed unwanted icon from "img".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in PMA_buildActionTitles_test.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Re-positioned star icon and added tooltip to it.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped trailing spaces from "structure.lib.php" and "db_structure.js".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-26 23:37:19 +05:30
Aayush
25c227ac04 complete patch for #4279 ctrl +up/down + ff issue 
Signed-off-by: Aayush Anand aayushism12@gmail.com
 2014-03-25 23:05:52 +05:30
Michal Čihař
a40ce0eda7 Support AES_DECRYPT as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-25 13:59:29 +01:00
Michal Čihař
555051618d AES_ENCRYPT does not take salt but encryption key 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-25 13:56:33 +01:00
Dieter Adriaenssens
befcf65617 highlight SQL keyword 
Signed-off-by: Dieter Adriaenssens <ruleant@users.sourceforge.net>
 2014-03-25 09:53:22 +01:00
Michal Čihař
ccc195aef1 Merge commit '0850abc8bc9b4fbbf91cf9ef75520163836bbd4f' 2014-03-24 16:10:13 +01:00
Smita Kumari
51d78cbb81 Bug Sqlform:Missing value in the form 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-24 19:54:53 +05:30
Michal Čihař
8dd5df2a7f Merge pull request #1077 from ganeshaditya1/multicolumn 
Multicolumn sorting feature request(1507)
 2014-03-24 15:21:54 +01:00
Edward Cheng
da3f959bf2 Bug fix: Redirect while timeout and expander clicked. 
Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-03-24 21:42:41 +08:00
Aditya Sastry
a05ab9640b Multicolumn sorting feature request(1507) 
This patch completely implements the feature requested and it modifies 4
existing files and adds one extra Javascript file. The existing system for
one column sorting has been refactored to be used for multicolumn sort.

Files messages.php and makegrid.js where modified to add the tool tip.

File sql.php was modified to add the import statement for the newly added JS
file.

The newly added columndelete.js is responsible for shift deleting the columns.
It gets the url of the link that was shift clicked and removes the name of the
column which we want to remove from the order by clause.

Finally, most of the crux of this feature request is implemented through
changes to the DisplayResult.class.php. 4 methods of this class have been
refactored to accomodate the required change. getsortparams() which process
the order by clause text remains the same, just the output parameters have
been turned into a array for each order by clause column. isInSort() has been
modified to check multiple order by clauses. The smart ordering feature in
to form a new function makeURL, which makes the url for multiple sorted table's
header's button's targets.

Signed-off-by: Aditya Sastry <ganeshaditya1@gmail.com>
 2014-03-24 02:17:54 +05:30
Marc Delisle
3092e99b87 Merge pull request #1087 from ashutoshdhundhara/bug_datepicker 
Bug: Datepicker icon not showing on "Add Event" dialog.
 2014-03-23 15:46:18 -04:00
Ashutosh Dhundhara
c8da59c75a Bug: Datepicker icon not showing on "Add Event" dialog. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-23 19:01:41 +05:30
Madhura Jayaratne
a3c63c3c68 Avoid conflicting selectors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-03-21 00:36:12 +05:30
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 09:36:48 +01:00
Michal Čihař
9a56641d0d Document possible todo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:40:14 +01:00
Michal Čihař
2456af7a01 Remove no longer used JSON plugin for jQuery 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:33:46 +01:00
Michal Čihař
5284882d3d Use native browser support for JSON 
It's there in anything recent (only not supported in IE 6 and 7 which we
don't support anyway).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:33:46 +01:00
Michal Čihař
0d8f510c22 Use JSON parser from jQuery instead of JSON plugin 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:33:46 +01:00
Marc Delisle
f4500d9d10 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-17 10:31:26 -04:00
Ashutosh Dhundhara
571d89f0b8 Feature request: #1514 Add function to all the insert boxes automatically. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-17 18:09:17 +05:30
Marc Delisle
383ffd5d3d Merge branch 'QA_4_1' 2014-03-16 09:57:52 -04:00
Marc Delisle
b2900f12af bug #4323 QueryWindow ignores CodeMirror 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-16 09:56:22 -04:00
Hugues Peccatte
418a7a8813 JSLint updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 17:43:29 +01:00
Hugues Peccatte
b0037e9e8e Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-03-15 15:51:25 +01:00
Hugues Peccatte
ef9130f1e3 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 14:05:05 +01:00
Marc Delisle
9b0ec2aaaf Merge pull request #1066 from ashutoshdhundhara/feature-#1512 
Feature request: #1512 Import doesn't do anything with no file name provided.
 2014-03-15 07:16:23 -04:00
Ashutosh Dhundhara
2943a514b9 Feature request: #1512 Import doesn't do anything with no file name provided. 
https://sourceforge.net/p/phpmyadmin/feature-requests/1512/

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-14 23:21:21 +05:30
Michal Čihař
d3480422b8 Fix typo in attribute name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 08:53:55 +01:00
Michal Čihař
e2238b38da Better way of CFP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 08:50:32 +01:00
Marc Delisle
941fafd71d Merge branch 'QA_4_1' 2014-03-13 10:25:33 -04:00
Aayush Anand
baecb782e5 Fix bug #3991 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-13 10:19:59 -04:00