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

297 Commits

Author SHA1 Message Date
Marc Delisle
b3ce71f569 Improve English 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-10 08:47:07 -04:00
Marc Delisle
00bad7150b Merge pull request #1211 from smita786/gsoc_central_columns_list 
option to Make table consistent with central list of columns
 2014-06-09 12:27:40 -04:00
Smita Kumari
6b8575734c option to Make table consistent with central list of columns 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

make messages transtalable

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

Coding style fix

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

Make confirmation button options translatable

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-09 20:35:10 +05:30
Marc Delisle
d7a7d68df7 Improve a message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 15:41:37 -04:00
Marc Delisle
060fb03afb Merge pull request #1206 from smita786/gsoc_central_columns_list 
Using central list of columns : pick a column from central list
 2014-06-07 15:37:42 -04:00
Smita Kumari
294e36bdb6 pick a column from central list 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

small bug fix

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

added own style

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

not display column name that already exist in tabl

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

added search to the pick column dialog

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

Fix coding style

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

check for central columns configuration relation

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

pagination in pick coulumn dialog

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

code cleanup

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

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-07 22:06:05 +05:30
Ashutosh Dhundhara
99b9e8d83c RFE#1145: Preview SQL instead of executing it. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-07 00:27:39 +05:30
Marc Delisle
56cbb769cc Improve English 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-24 17:34:29 -04:00
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
Marc Delisle
4d92ef1605 Merge commit '17b0851' 2014-05-18 13:54:22 -04:00
Todd Crane
17b085148c bug #4421 empty maxInputVars on js/messages.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-18 13:51:36 -04:00
Chirayu Chiripal
c3f2abe873 FR #1487: Browse Foreign Values should be modal dialog 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-14 17:30:11 +05:30
Ashutosh Dhundhara
0a5d1ad757 RFE: #1448 Allow clicking an approximate row count to get a correct one. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-05-10 20:23:15 +05:30
minhaz
217459424f Confirm message for Confirm Navigation 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-04-18 17:33:43 +05:30
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
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
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
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ř
8dd5df2a7f Merge pull request #1077 from ganeshaditya1/multicolumn 
Multicolumn sorting feature request(1507)
 2014-03-24 15:21:54 +01: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
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
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
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
Marc Delisle
9a18b579c3 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-26 12:47:22 -05:00
Hugues Peccatte
1fa4cdf800 Add confirmation before deletion. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-24 19:56:38 +01:00
Michal Čihař
c20ed3e970 Place comment for translators in a place where gettext finds it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-24 10:00:04 +01:00
Michal Čihař
767fc8c997 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:38:49 +01:00
Michal Čihař
6ec65071fd Use sprintf instead of concatenating for translated message 2014-02-02 11:34:25 +01:00
Michal Čihař
8593a5a497 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:33:52 +01:00
Michal Čihař
c3bcdf2b5d Remove no longer used javascript messages 2014-01-29 13:23:03 +01:00
Michal Čihař
0097ba0b58 End sentences with punctuation 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-01-23 10:59:27 +01:00
Atul Pratap Singh
43f250096e Fix bug#3780: Allow aborting ajax request if user clicks on new link in time 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-07 22:59:33 +05:30
Marc Delisle
d3fc017131 Code cleanup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-19 06:26:18 -05:00
Smita Kumari
675e457f50 bug fix #2760 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2013-12-18 19:17:59 +05:30
Rouslan Placella
7d8144437e Improved appearance and text in error reporting notification 2013-10-27 20:31:08 +00:00
Marc Delisle
1d32c14572 Fix coding style 2013-10-08 08:04:00 -04:00
Marc Delisle
bb923e6fb4 Fix typo 2013-10-03 11:25:09 -04:00
Michal Čihař
58d7005a42 Coding style: wrap long lines 2013-10-02 11:45:45 +02: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
Michal Čihař
d53bbe777a End sentence with comma 2013-09-12 10:41:48 +02:00
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-01 13:07:52 +02:00
Atul Pratap Singh
fa8176def5 Show meaningful message if database name is unknown in server's logs, as suggested by Marc 2013-08-18 20:42:21 +05:30
Marc Delisle
3df8d3db6b bug #4056 Language: Vague error message when adding a varchar field 2013-08-18 06:15:58 -04:00
Michal Čihař
523086a2f2 Better loading message 2013-08-11 13:16:59 +02:00