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

93652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atul Pratap Singh
d3e45578ff Merge branch 'QA_4_2' 2014-07-02 14:14:02 +05:30
Atul Pratap Singh
f4b9d1f0aa Merge commit '18973db' 2014-07-02 14:13:21 +05:30
Atul Pratap Singh
b46f11fe3a Merge commit '5e96d8d' 2014-07-02 14:12:33 +05:30
Atul Pratap Singh
dc7bdf48c6 Merge commit 'b756cc6' 
Conflicts:
	js/makegrid.js
	js/multi_column_sort.js
 2014-07-02 14:11:11 +05:30
Atul Pratap Singh
ab1d28fb79 Merge commit '2819506' 2014-07-02 14:08:13 +05:30
Atul Pratap Singh
b228f74e7c Merge commit '3bf732c' 2014-07-02 14:02:44 +05:30
Atul Pratap Singh
c2797570d1 Fix js error on multisort 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-02 14:00:32 +05:30
Weblate
0dfa00374d Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-07-02 10:01:31 +02:00
Lakshmanan M
b0507aab93 Translated using Weblate (Tamil) 
Currently translated at 31.0% (860 of 2770)
 2014-07-02 10:01:27 +02:00
Kristjan Räts
06f7a7b8a4 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2770 of 2770)
 2014-07-02 10:01:24 +02:00
Atul Pratap Singh
a61bc86d2b Remove window.location.replace 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-02 13:10:15 +05:30
Atul Pratap Singh
18973db3c9 Changelog for 4482 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-02 11:45:21 +05:30
Matías Bellone
d970122061 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2903 of 2903)
 2014-07-02 02:13:24 +02:00
Marc Delisle
a5ff78d463 Update po files 2014-07-01 16:23:14 -04:00
Weblate
ba9b58ca64 Merge remote-tracking branch 'origin/master' 2014-07-01 22:21:37 +02:00
Giovanni Sora
9601d1e7f7 Translated using Weblate (Interlingua) 
Currently translated at 54.1% (1571 of 2903)
 2014-07-01 22:21:33 +02:00
Marc Delisle
f47548e18f Use ellipsis character 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-01 16:21:22 -04:00
Giovanni Sora
90088506d1 Translated using Weblate (Interlingua) 
Currently translated at 54.0% (1568 of 2903)
 2014-07-01 22:20:31 +02:00
Burak Yavuz
f07daed129 Translated using Weblate (Turkish) 
Currently translated at 97.7% (2837 of 2903)
 2014-07-01 22:20:00 +02:00
Giovanni Sora
1fceb67534 Translated using Weblate (Interlingua) 
Currently translated at 53.9% (1567 of 2903)
 2014-07-01 22:19:55 +02:00
Marc Delisle
d854e335f4 Translated using Weblate (French) 
Currently translated at 97.8% (2840 of 2903)
 2014-07-01 22:19:51 +02:00
Atul Pratap Singh
5e96d8d566 Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 2014-07-02 00:46:17 +05:30
Atul Pratap Singh
b756cc66de update js for add/remove modify columns in multi sort 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-02 00:37:14 +05:30
Atul Pratap Singh
2819506bb0 Have single-sort url besides multi-sort for each column and make single-sort default on click 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-01 23:32:05 +05:30
Weblate
cd964c2208 Merge remote-tracking branch 'origin/master' 2014-07-01 19:22:28 +02:00
Lakshmanan M
bdb830de67 Translated using Weblate (Tamil) 
Currently translated at 30.2% (877 of 2903)
 2014-07-01 19:22:25 +02:00
Marc Delisle
369cdff685 Translated using Weblate (French) 
Currently translated at 97.6% (2836 of 2903)
 2014-07-01 19:22:22 +02:00
Marc Delisle
e52092c707 Merge branch 'QA_4_2' 2014-07-01 13:21:54 -04:00
Marc Delisle
b86f07be81 Merge commit '2388e14' 2014-07-01 13:21:47 -04:00
Weblate
3bf732cf9d Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-07-01 19:21:32 +02:00
Sevdimali İsa
ee85be1083 Translated using Weblate (Azerbaijani) 
Currently translated at 41.2% (1143 of 2770)
 2014-07-01 19:21:28 +02:00
Marc Delisle
cc9f364aab ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-01 13:20:48 -04:00
Panagiotis Papazoglou
cd4bc4a80f Translated using Weblate (Greek) 
Currently translated at 100.0% (2903 of 2903)
 2014-07-01 17:38:12 +02:00
Marc Delisle
8ea807bf1d Update po files 2014-07-01 08:49:49 -04:00
Madhura Jayaratne
b092ad5b57 Merge pull request #1263 from kb-yashodha/ut 
Unit tests
 2014-07-01 17:17:42 +05:30
Bimal Yashodha
22748080ac Remove extra space 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-01 15:12:54 +05:30
Weblate
ac41955eab Merge remote-tracking branch 'origin/master' 2014-07-01 11:14:21 +02:00
Sevdimali İsa
1f21a05892 Translated using Weblate (Azerbaijani) 
Currently translated at 41.5% (1178 of 2834)
 2014-07-01 11:14:17 +02:00
Madhura Jayaratne
6f065ac6b6 Merge pull request #1262 from kb-yashodha/export 
Export schema from designer
 2014-07-01 14:44:14 +05:30
Bimal Yashodha
0b58c22afb Test for exporting functionality 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-01 11:42:42 +05:30
Marc Delisle
5b6331cb7e Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-30 16:03:34 -04:00
Marc Delisle
819365ab83 Fix typos, improve messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-30 15:52:20 -04:00
Marc Delisle
ca4c37282e Merge pull request #1257 from smita786/gsoc_automated_normalizaion 
automated normalizaion to 1NF
 2014-06-30 15:44:09 -04:00
Bimal Yashodha
6a243cfe3c Export schema from designer 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-30 23:06:55 +05:30
Smita Kumari
1e971f3263 1NF: initial commit 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

step 1 to 1NF complete

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

added layout for step2 and step3

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

basic 1NF complete

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

fix coding style

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

added doc comment

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

fix coding style

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

error handling plus during split shows my string type columns

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

removing unnecessory code

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

removing unnecessory code

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

code refactoring plus translatable message format

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

added events on cancel and added unbind function calls

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

hide default textarea when value NONE

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

remove unnecesory alert

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

create unique column screen fixed plus starting link for normalization on tbl_structure page

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

added hint to follow steps carefully and finish message changes

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

Fix coding style plus messages

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

added wand icon for normalization

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

bug fix: dont go next step if any index other than primary/unique is crated

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

bug fix: replace .live with .on plus others

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

change show central column message plus refresh central column list on split save

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-30 22:32:53 +05:30
Marc Delisle
f1b37d7ffc Fix incorrect parameter type definition 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-30 11:33:01 -04:00
Marc Delisle
f5b56c6cfd Fix incorrect parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-30 11:27:28 -04:00
Marc Delisle
f53343429c Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-30 11:12:04 -04:00
Marc Delisle
8e2f307279 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-30 11:10:00 -04:00
Marc Delisle
d6d6e31d7a Merge pull request #1259 from D-storm/bug-4479 
bug-4479 Missing permission in export dir not detected
 2014-06-29 13:50:13 -04:00