gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,861 Commits 12 Branches 481 Tags 2.4 GiB
9455673a26
Commit Graph

92861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
9455673a26 Merge branch 'QA_4_2' 2014-06-05 16:48:57 +05:30
Madhura Jayaratne
2e645ede7f bug #4436 Insert form numeric field with function drop-down list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-05 16:47:41 +05:30
Burak Yavuz
4099c29119 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-05 09:44:09 +02:00
Marc Delisle
27fc59702c Merge pull request #1200 from D-storm/changelog 
changelog: plus sign for rfe
 2014-06-04 12:31:08 -04:00
Ann + J.M
fea0fe03ef Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-04 18:02:44 +02:00
Michal Čihař
1ca50ed73e Adjust comment as this returns bool 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-04 10:15:20 +02:00
Hugues Peccatte
c0b5648cf6 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-06-03 21:36:03 +02:00
Hugues Peccatte
ceddfffac4 Update PHPDoc. 
Add return.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-03 21:35:25 +02:00
Marc Delisle
c8e33b2a96 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:59:55 -04:00
Marc Delisle
84f135d048 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:40:21 -04:00
Marc Delisle
673fce8145 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:33:25 -04:00
Marc Delisle
bd762244ec Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:27:02 -04:00
Marc Delisle
a859c2b8ff Merge pull request #1204 from ashutoshdhundhara/rfe_1448_improvement 
Display loading icon while fetching real row count.
 2014-06-03 09:56:25 -04:00
Weblate
d106d707d0 Merge remote-tracking branch 'origin/master' 2014-06-03 14:37:28 +02:00
Burak Yavuz
859484bcc9 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2782 of 2782)
 2014-06-03 14:37:25 +02:00
Marc Delisle
07ac2cb7dc Add a step for marking default download versions 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 08:37:14 -04:00
Ashutosh Dhundhara
428f985070 Display loading icon while fetching real row count. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-03 13:09:33 +05:30
Marc Delisle
c2b4c5e7c7 Fix XHTML compliance 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-02 12:42:02 -04:00
Marc Delisle
de6e158aa9 Fix indenting 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-02 12:37:30 -04:00
Marc Delisle
3d668e6ae0 Merge pull request #1198 from smita786/gsoc_central_columns_list 
Gsoc central columns list
 2014-06-02 12:32:32 -04:00
Smita Kumari
abdb92e290 fiixed Typs plus remove default from text field 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-02 21:00:17 +05:30
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
Michal Čihař
e3dd434615 Merge pull request #1201 from D-storm/phpcs 
Added codesniffer rule to detect trailing whitespace
 2014-06-01 22:24:21 +02:00
Marc Delisle
260cb1d982 Revert "ChangeLog entry" 
This reverts commit f5ee17fb40.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-01 13:38:45 -04:00
Marc Delisle
3c60bce0fa Merge commit 'a4cbabc' 2014-06-01 13:35:47 -04:00
Marc Delisle
a4cbabc533 Revert fix for bug #4415 that was not in this branch 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-01 13:34:41 -04:00
Weblate
f79aa4e4ea Merge remote-tracking branch 'origin/master' 2014-06-01 19:15:49 +02:00
Anders Jonsson
fa07091620 Translated using Weblate (Swedish) 
Currently translated at 99.4% (2767 of 2782)
 2014-06-01 19:15:47 +02:00
Marc Delisle
a7b6120b68 Merge commit 'f5ee17f' 2014-06-01 13:13:36 -04:00
Marc Delisle
943e505061 Merge commit '1c14cd3' 2014-06-01 13:13:12 -04:00
Marc Delisle
f5ee17fb40 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-01 13:12:19 -04:00
Marc Delisle
d709c7313c Merge pull request #1202 from shivamdixit/bug_4415 
Fixed #4415 Displaying prompt when user navigates away from page
 2014-06-01 13:11:19 -04:00
Shivam Dixit
db2c3ef25a Added comments to bug fix #4415 
Signed-off-by: Shivam Dixit <shivamd001@gmail.com>
 2014-06-01 22:10:18 +05:30
Shivam Dixit
398e7654b2 Merge pull request #2 from lem9/patch-2 
Complete the bugfix
 2014-06-01 21:45:55 +05:30
Chirayu Chiripal
3883925148 Added codesniffer rule to detect trailing whitespace 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-01 20:08:39 +05:30
Marc Delisle
48153344f4 Complete the bugfix 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-01 09:19:42 -04:00
Shivam Dixit
750f3d5f51 Fixed #4415 Show a prompt when user navigates away from insert page without saving 
Signed-off-by: Shivam Dixit <shivamd001@gmail.com>
 2014-06-01 17:22:24 +05:30
Chirayu Chiripal
73f8189df2 changelog: plus sign for rfe 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-01 11:51:29 +05:30
Weblate
5bb486786d Merge remote-tracking branch 'origin/master' 2014-05-31 21:32:25 +02:00
கணேஷ் குமார்
60a68b90e6 Translated using Weblate (Tamil) 
Currently translated at 27.9% (777 of 2782)

உட்புற வளையத்தை சேர்
 2014-05-31 21:32:22 +02:00
Marc Delisle
f28cc43b28 Merge commit '206f4f4' 2014-05-31 15:31:19 -04:00
Weblate
1c14cd3e4e Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-31 21:30:58 +02:00
கணேஷ் குமார்
f885d9a8db Translated using Weblate (Tamil) 
Currently translated at 27.9% (773 of 2770)
 2014-05-31 21:30:55 +02:00
Marc Delisle
206f4f45a2 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-31 15:30:07 -04:00
Shivam Dixit
979adb9382 Fixed #4394 Drop table confirmation message when dropping a user 
Signed-off-by: Shivam Dixit <shivamd001@gmail.com>

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-31 15:27:10 -04:00
கணேஷ் குமார்
e42125333c Translated using Weblate (Tamil) 
Currently translated at 27.9% (777 of 2782)

உள்ப்புற வளையம் %d:->உட்புற வளையம் %d:
 2014-05-31 20:28:20 +02:00
கணேஷ் குமார்
917aebd015 Translated using Weblate (Tamil) 
Currently translated at 27.9% (777 of 2782)

"நெ" (நெடுக்கு அச்சு)
 2014-05-31 20:27:27 +02:00
கணேஷ் குமார்
de8bff0640 Translated using Weblate (Tamil) 
Currently translated at 27.9% (777 of 2782)

"கு" (குறுக்கு அச்சு)
 2014-05-31 20:24:35 +02:00