Commit Graph

92636 Commits

Author SHA1 Message Date
Smita Kumari
1ec1f2b7ab removing trailing whitespace
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-06-02 09:18:06 +05:30
Smita Kumari
93dfb4734a Fix coding style
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-06-02 09:13:08 +05:30
Smita Kumari
175b69b72b central columns management page basic
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

central columns management page edit/delete

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

added column length to central columns table

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

fix edit issu

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

remove logging and alert statement

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

delete an entry fixed

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

col_length default to 0 + filter rows

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

fix menu tab test case

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

fix col_length datatype plus menu tst case fix

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

added cancel button

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

sprite regenerate for adding cntral columns icon

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

removing default value from col_length of type text

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

message format

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

search fix plus uitablfilter plugin modify to take elements to limit search to

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

refactoring db_cntral_columns.php plus file description in db_cntral_columns.js

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

added table sorting

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

fix js error for empty central columns

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

refactoring of code plus adding option to add a column to central list

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

removing trailing white spaces

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

handle condition if central list is empty

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-06-02 01:57:50 +05:30
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
Marc Delisle
161d22a587 4.2.3-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-20 08:30:25 -04:00
Marc Delisle
f32e14c2c6 Merge commit '45f33fd' 2014-05-20 08:29:42 -04:00
Marc Delisle
45f33fdafe Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-05-20 08:28:52 -04:00
Marc Delisle
634307329e 4.2.3-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-20 08:28:42 -04:00
Weblate
4d70eda6b4 Merge remote-tracking branch 'origin/master' 2014-05-20 14:22:29 +02:00
Jouni Kähkönen
b9fc353774 Translated using Weblate (Finnish)
Currently translated at 62.1% (1722 of 2772)
2014-05-20 14:22:26 +02:00
Marc Delisle
f027527c51 Merge branch 'QA_4_2' 2014-05-20 08:22:00 -04:00
Weblate
c3860e8f5b Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-20 14:21:52 +02:00
Jouni Kähkönen
37ea4aa905 Translated using Weblate (Finnish)
Currently translated at 62.2% (1722 of 2768)
2014-05-20 14:21:49 +02:00
Marc Delisle
fda047361d Fix notice
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-20 08:21:27 -04:00
Marc Delisle
8e99c1159f Merge branch 'QA_4_2' 2014-05-19 17:40:00 -04:00
Marc Delisle
389d26c811 Merge commit '9207203' 2014-05-19 17:39:53 -04:00
Marc Delisle
7937cbde62 Complete the fix for bug #4418
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-19 17:38:55 -04:00
Ann + J.M
9207203a56 Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:51:33 +02:00
Ann + J.M
d9bd81a2a1 Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:40:24 +02:00
Ann + J.M
69ddb29989 Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:33:01 +02:00
Ann + J.M
5cab1dfbf2 Add string check for json_decode in SavedSearches::setCriterias
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:20:14 +02:00
Ann + J.M
ec5292fb31 Config class: Drop dead initializations
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:06:52 +02:00
Ann + J.M
6743e78ea4 PMA_Bookmark_delete: Drop unnecessary $db param
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:04:22 +02:00
Ann + J.M
8838d58666 Advisor class: Drop unnecessary initialization
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:03:39 +02:00
Ann + J.M
b3dbec1107 Advisor: Check for possibly undefined memory usage values
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 21:48:25 +02:00
Ann + J.M
71fb5057a3 rfe #1523 Better visual clue for table structure primary key column
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 14:02:08 +02:00
Marc Delisle
9b15ce4d27 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-19 07:39:39 -04:00
Marc Delisle
24720826cc Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-19 07:39:36 -04:00
Ann + J.M
437c717eb3 Merge remote-tracking branch 'pma/QA_4_2' 2014-05-19 13:36:48 +02:00
Ann + J.M
486dd3b4e3 Monitor: Check for possibly undefined memory usage values
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 13:32:53 +02:00
Marc Delisle
749becaea0 Merge commit '67901f3' 2014-05-18 13:54:33 -04:00
Marc Delisle
4d92ef1605 Merge commit '17b0851' 2014-05-18 13:54:22 -04:00
Marc Delisle
2bfffa181b Merge commit 'a941632' 2014-05-18 13:54:09 -04:00
Marc Delisle
67901f390e ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-18 13:53:27 -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
Marc Delisle
5a18dda9e1 Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-18 13:32:54 -04:00
Marc Delisle
39c181ca1e Merge branch 'QA_4_2' 2014-05-18 13:23:16 -04:00
Marc Delisle
85bc719837 Merge commit 'ec9f73c' 2014-05-18 13:23:08 -04:00
Weblate
a941632ad8 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-18 19:22:58 +02:00
Yungu Kim
0780e97f3b Translated using Weblate (Korean)
Currently translated at 81.1% (2247 of 2768)
2014-05-18 19:22:55 +02:00
Marc Delisle
e813cab608 bug #4418 When copying databases, primary key attributes get lost
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-18 13:22:14 -04:00
Weblate
ad81be128a Merge remote-tracking branch 'origin/master' 2014-05-18 18:13:41 +02:00
Yungu Kim
9b2d55d663 Translated using Weblate (Korean)
Currently translated at 81.1% (2249 of 2772)
2014-05-18 18:13:37 +02:00
Hugues Peccatte
cc9460e798 Update PHPDoc.
Add missing initialisation.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-05-18 18:13:17 +02:00
Hugues Peccatte
9dd5c4ca6e Fix typo in PHP variable.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-05-18 14:38:46 +02:00
Hugues Peccatte
81c3916485 Fix scrutinizer JS issues.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-05-18 13:57:41 +02:00
Madhura Jayaratne
22e3a0d19f Fix some coding style violations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-05-18 14:44:10 +05:30
Madhura Jayaratne
f79ab273a2 Merge branch 'QA_4_2' 2014-05-18 14:16:16 +05:30
Weblate
ec9f73c4b5 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-18 10:44:05 +02:00
Rahoz Yaseen
47399d82fd Translated using Weblate (Kurdish Sorani)
Currently translated at 17.9% (496 of 2768)
2014-05-18 10:44:02 +02:00