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

465 Commits

Author SHA1 Message Date
Marc Delisle
8453488a26 Merge commit '5b1fe4e' 2014-06-29 07:26:54 -04:00
Shivam Dixit
3f21378e4c Fix for bug 4027 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-29 07:14:39 -04:00
Marc Delisle
8ce1e316a6 Merge branch 'QA_4_2' 2014-06-26 09:58:01 -04:00
Marc Delisle
18e6cfd5c5 mcrypt: remove the requirement (64-bit) and the related warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 09:56:24 -04:00
Madhura Jayaratne
521a77d8bd Merge pull request #1232 from kb-yashodha/multipages1 
Complete multipages functionality in designer
 2014-06-16 15:22:13 +05:30
Bimal Yashodha
48dd4f354d Remove references to designer_coords and designerwork 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 11:39:39 +05:30
Michal Čihař
234cfbf73f Document AES usage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Marc Delisle
a83ca5d73b Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-10 12:43:07 -04:00
Chirayu Chiripal
ff688b18fb Bug-4448: Dump binary columns in hexadecimal notation not working and hex_for_blob -> hex_for_binary 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-10 19:00:16 +05:30
Michal Čihař
96366ce7bc Remove no longer used caching configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 11:57:15 +02:00
Marc Delisle
93ce1a69de Merge pull request #1195 from smita786/gsoc_central_columns_list 
Gsoc central columns list
 2014-05-26 15:14:04 -04:00
Smita Kumari
200737bcce gsoc:central list of columns, added sync and remove column list on db_structure page 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixing indentation in mult_submits.inc.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

naming convention,typos, indentaion fix and removed unnecessory file db_sync_central_columns.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

check if central columns storage is configured, if not configured don't show the option to sync/remove

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove columns to central list of columns from tbl_structure page

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added icon image for central columns add/delete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove of columns option in tbl_structure page in columns rows depending upon if column is already present in central columns or not

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed php notices, apporiprate message when a non existing column is removed and when a existing column is added to cenral list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

documentation added for central_columns configuration

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

regenerated sprite

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

changed central_columns table structure + modified functions to add to central column as per new tbl def

updated delete and other function as per new db structure

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

remove notices

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

sprintf for variable message

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix unit test failure errors

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed whitespace issues plus function definition

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring code plus fixing coding style issues

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-05-26 23:13:03 +05:30
Chirayu Chiripal
85390a7169 rfe-982: Support for editing binary fields in hexadecimal 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-21 21:42:21 +05:30
Atul Pratap Singh
9d76696650 We decided to display pagination after 250, see http://sourceforge.net/p/phpmyadmin/mailman/message/31333321/ 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-04-27 05:33:12 +05:30
Marc Delisle
48cee9be09 Now that MaxNavigationItems is no longer related to the number of databases, it makes more sense to lower its default value 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-25 06:13:51 -04:00
Hugues Peccatte
ebc2739c89 Update documentation. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-22 21:36:26 +02:00
Hugues Peccatte
6cb5756e7d Manage a config proporty to limit the number of items at first level in navigation panel. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-21 22:14:31 +02:00
Michal Čihař
7233657d4d Remove support for SQL validator 
The SOAP service seems to be down for quite some time and it is not
mentioned anywhere on Mimer website.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-02 12:10:52 +02: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
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
Maxime DAVID
a395d9474f #1486 Possibility of disabling database expansion + doc + integration 
Signed-off-by: Maxime DAVID <got2bex@gmail.com>
 2014-03-26 10:15:14 -04:00
Maxime DAVID
65bb55450f #1486 Possibility of disabling database expansion 
Signed-off-by: Maxime DAVID <got2bex@gmail.com>
 2014-03-25 16:28:28 -04:00
Marc Delisle
9a18b579c3 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-26 12:47:22 -05:00
Madhura Jayaratne
0aae267d06 Merge branch 'QA_4_1' 2014-02-26 07:26:31 +05:30
Madhura Jayaratne
ff064833ec bug #4291 Unable to export comments in OpenDocument text format 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-26 07:22:04 +05:30
Hugues Peccatte
58ff71f57f Fix typos. 
Minor PHPDoc update.
Minor refactoring.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-23 18:47:18 +01:00
Hugues Peccatte
8b84cf0d91 Feature #569 Load/Save Query By Example 
Implement possibility to save/load/delete a QBE on a DB.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-23 14:52:48 +01:00
Chanaka Indrajith
4457f40ef4 Support for export server/db/table without views 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-02-06 23:03:04 +05:30
Chanaka Indrajith
55151381fa rfe-1403 : Support for export only triggers/stored procedures 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-02-04 22:47:00 +05:30
Chanaka Indrajith
2988aebc86 rfe-1483 : Export database without triggers 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-01-28 23:09:59 +05:30
Marc Delisle
379f8b6704 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-15 08:53:00 -05:00
Marc Delisle
144e00e5da bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-15 08:39:42 -05:00
Marc Delisle
b2305dcefc Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-18 12:45:03 -05:00
Marc Delisle
9876aeb550 Finish removing the gather suboption of the error handler 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-18 12:37:01 -05:00
Marc Delisle
2a8962aa95 Signed-off-by: Marc Delisle <marc@infomarc.info> 
Added warning about the mysql extension being deprecated
and removed the extension directive
 2013-12-14 14:26:12 -05:00
Madhura Jayaratne
4a8e3ce39a Fix docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-12 07:14:10 +05:30
Chanaka Indrajith
30522c8d5f Rename the global variable from row_action_type to RowActionType 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-05 23:31:50 +05:30
Marc Delisle
d34e84e75c Move the MaxNavigationItems directive to the Navigation panel section (doc and default config) 2013-11-24 06:59:19 -05:00
Marc Delisle
ebc5e9a5c7 We do not need a separate ErrorReporting directive 2013-11-20 06:14:53 -05:00
Marc Delisle
85ea82a409 Remove the ShowDatabasesCommand directive 2013-11-06 12:47:27 -05:00
Marc Delisle
d8fd82a9f5 The DisableIS directive is removed 2013-11-05 12:44:04 -05:00
Mohamed Ashraf
d90126ebd7 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 
Conflicts:
	ChangeLog
	scripts/create-release.sh
 2013-09-21 00:49:01 +02:00
Dieter Adriaenssens
4b43310d6f fix coding style : use lowercase null 2013-09-06 17:53:54 +02:00
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-01 13:07:52 +02:00
Marc Delisle
e25db4a004 Fix merge conflicts 2013-08-27 10:54:59 -04:00
Marc Delisle
18c35b7689 Merge branch 'QA_4_0' 2013-08-27 08:11:33 -04:00
Michal Čihař
c921f6f807 Increase default maximal number of navigation items 
The load times should not be that big issue with 250 items and it helps
loading all tables/databases for most users.
 2013-08-27 11:10:32 +02:00
Michal Čihař
1084e4dfdd Do not show tooltip in table navigation 
Most tables don't have any comment set and this causes serious slow down
of a navigation.
 2013-08-27 11:08:28 +02:00
Marc Delisle
15de2de0fc Merge pull request #605 from ibennetch/ssl 
Improved SSL communication between MySQL and phpMyAdmin
 2013-08-17 12:31:32 -07:00
Isaac Bennetch
8fd8c4d525 Improved SSL communication between MySQL and phpMyAdmin 2013-08-16 23:20:21 -04:00