gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,955 Commits 12 Branches 481 Tags 2.4 GiB
3b6ebb7467
Commit Graph

88955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
3b6ebb7467 Reduce number of nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-09 22:14:05 +01:00
Hugues Peccatte
ae0c9218ce PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-09 20:51:40 +01:00
Weblate
2078214b39 Merge remote-tracking branch 'origin/master' 2014-01-09 19:26:33 +01:00
Giovanni Sora
e340336d5a Translated using Weblate (Interlingua) 
Currently translated at 37.8% (1042 of 2752)
 2014-01-09 19:24:23 +01:00
Hugues Peccatte
f7d5da319e Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-09 18:22:11 +01:00
Kristjan Räts
3ebabff99c Translated using Weblate (Estonian) 
Currently translated at 100.0% (2749 of 2749)
 2014-01-09 15:38:29 +01:00
Giovanni Sora
6e8d4d54eb Translated using Weblate (Interlingua) 
Currently translated at 35.7% (984 of 2752)
 2014-01-09 14:22:42 +01:00
Weblate
9ec09ffccb Merge remote-tracking branch 'origin/master' 2014-01-09 14:17:52 +01:00
Madhura Jayaratne
26702fc489 Merge branch 'QA_4_1' 2014-01-09 18:46:42 +05:30
Weblate
fe688affbd Merge remote-tracking branch 'origin/master' 2014-01-09 14:15:12 +01:00
Madhura Jayaratne
7831078e73 Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-01-09 18:45:00 +05:30
Giovanni Sora
0aeae1179d Translated using Weblate (Interlingua) 
Currently translated at 35.9% (990 of 2752)
 2014-01-09 14:13:34 +01:00
Weblate
6039d15b60 Merge remote-tracking branch 'origin/master' 2014-01-09 14:12:55 +01:00
Atul Pratap Singh
d3bd91eaaf Merge branch 'QA_4_1' 
Conflicts:
	js/navigation.js
 2014-01-10 00:06:29 +05:30
Atul Pratap Singh
832857cea9 Merge commit '4bd02f8' 2014-01-10 00:02:15 +05:30
Atul Pratap Singh
bdd53902f4 Merge commit 'ad415fe' 
Conflicts:
	js/navigation.js
 2014-01-10 00:01:18 +05:30
Atul Pratap Singh
207fb7b08a Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-01-09 21:16:54 +05:30
Atul Pratap Singh
0577539109 Remove redundant function and rename variable: auto-expand table/view 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-09 21:01:19 +05:30
Atul Pratap Singh
eef7c3ddba Rewrite simply and generalize table/view part and fix bug#4219 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-09 21:00:23 +05:30
Marc Delisle
f1bc750a88 Merge branch 'QA_4_1' 2014-01-09 08:11:51 -05:00
Marc Delisle
ed71b71263 Merge pull request #839 from madhuracj/QA_4_1 
bug #4224 Empty table names when a table is "inuse"
 2014-01-09 05:10:38 -08:00
Giovanni Sora
7b450ecff7 Translated using Weblate (Interlingua) 
Currently translated at 35.4% (976 of 2752)
 2014-01-09 14:10:17 +01:00
Madhura Jayaratne
e90abd5477 bug #4225 Partition maintenance broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-09 17:13:28 +05:30
Marc Delisle
93d0174751 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-01-09 06:40:08 -05:00
Marc Delisle
4ad48947f7 Refactor: new PMA_getDescriptionAndTitle() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-09 06:39:40 -05:00
Madhura Jayaratne
09b0f9e60f bug #4224 Empty table names when a table is "inuse" 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-09 16:58:46 +05:30
Weblate
ff3c4c0816 Merge remote-tracking branch 'origin/master' 2014-01-09 12:22:11 +01:00
Marc Delisle
20da1d306e Missing right title 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-09 06:19:18 -05:00
Domen
e19ffa78d1 Translated using Weblate (Slovenian) 
Currently translated at 96.3% (2652 of 2752)
 2014-01-09 12:12:20 +01:00
Marc Delisle
6894e6d7e8 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-09 05:58:44 -05:00
Weblate
4bd02f8fb1 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-01-08 21:32:24 +01:00
Weblate
993023de91 Merge remote-tracking branch 'origin/master' 2014-01-08 21:31:08 +01:00
Lakshmanan M
b21a11ab1a Translated using Weblate (Tamil) 
Currently translated at 15.2% (418 of 2749)
 2014-01-08 21:30:33 +01:00
Gyeongsu Han
0ff8e826fb Translated using Weblate (Korean) 
Currently translated at 66.6% (1835 of 2752)
 2014-01-08 21:29:24 +01:00
Gyeongsu Han
8e42fce595 Translated using Weblate (Korean) 
Currently translated at 70.8% (1949 of 2749)
 2014-01-08 21:28:50 +01:00
Lakshmanan M
ced333e8b0 Translated using Weblate (English (United Kingdom)) 
Currently translated at 99.3% (2730 of 2749)
 2014-01-08 21:27:46 +01:00
J.M
fd07580a3b Merge branch 'QA_4_1' 2014-01-08 21:24:36 +01:00
J.M
917c26703f Finish 4222-create-db-missing-collation-col 2014-01-08 21:22:50 +01:00
J.M
999c90368d Add ChangeLog entry for bug #4223 
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-01-08 21:22:09 +01:00
J.M
e1b34a538f Add missing collation column when creating a db 
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-01-08 21:18:48 +01:00
Atul Pratap Singh
ad415feb09 Remove redundant code and simplify: auto-expand/highlight 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-08 22:45:11 +05:30
Matías Bellone
9c6b46fb0e Translated using Weblate (Spanish) 
Currently translated at 100.0% (2738 of 2738)
 2014-01-08 17:15:10 +01:00
Panagiotis Papazoglou
f561002b3f Translated using Weblate (Greek) 
Currently translated at 100.0% (2749 of 2749)
 2014-01-08 16:47:35 +01:00
Weblate
56af7a55ac Merge remote-tracking branch 'origin/master' 2014-01-08 15:30:38 +01:00
Marc Delisle
f405caa82a ChangeLog entry for rfe 1466 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-08 09:25:55 -05:00
Marc Delisle
77b2467193 Merge pull request #838 from sachith500/master 
(Feature Request 1466 : Refactoring)
 2014-01-08 06:24:17 -08:00
Weblate
7ee2a34c38 Merge remote-tracking branch 'origin/master' 2014-01-08 15:17:32 +01:00
Sachith Hasaranga Seneviratne
4e28aa1a81 (Feature Request 1466) 
Refactor PMA_Util::getLatestVersion() and PMA_sendErrorReport()
to further reuse curl_handle option setting code.

Signed-off-by: Sachith Seneviratne sachith500@gmail.com
 2014-01-08 19:08:18 +05:30
Madhura Jayaratne
89fb7bac4a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-01-08 18:57:21 +05:30
Madhura Jayaratne
3c9f6a6890 Space around . operator - mroe instances 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 18:56:30 +05:30