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

92697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
1b2ea7215f Don't let coverage upload failure fail the tests 
Uploading code coverage is not critical task, so it should not fail the
test.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-26 09:32:56 +02:00
Domen
1f425e7809 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 17:53:01 +02:00
Hugues Peccatte
7578978629 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-25 16:55:14 +02:00
Hugues Peccatte
aa2bb1ce9d Add possibility to add new line with shift + enter. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 16:54:49 +02:00
Hugues Peccatte
df0d48ec6c Fix replace of all new lines. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 16:54:18 +02:00
Marc Delisle
1380cf15f2 Merge pull request #1194 from ashutoshdhundhara/rfe_706 
RFE#706: Multi-db privileges adding.
 2014-05-25 10:38:16 -04:00
Weblate
c662d6cebf Merge remote-tracking branch 'origin/master' 2014-05-25 16:33:20 +02:00
Burak Yavuz
d19c34e774 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 16:33:17 +02:00
Hugues Peccatte
64926a82d2 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-25 16:33:03 +02:00
Hugues Peccatte
dec3e0df15 Fix datepicker issue in grid edition. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 16:32:28 +02:00
Burak Yavuz
f96d850202 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 16:10:24 +02:00
Ashutosh Dhundhara
51b6fc08f3 Fix merge conflict. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Conflicts:
	ChangeLog
 2014-05-25 19:27:10 +05:30
Ashutosh Dhundhara
d8134c9116 RFE#706: Multi-db privileges adding. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-05-25 19:25:36 +05:30
Claus Svalekjaer
d8dbbfeae5 Translated using Weblate (Danish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 15:22:35 +02:00
Marc Delisle
9810813411 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-25 08:20:15 -04:00
Marc Delisle
6efaa9e166 Merge pull request #1193 from Tithugues/b4416 
Fix #4416: new lines are removed when editing
 2014-05-25 08:17:16 -04:00
Marc Delisle
14b5c6151b Translated using Weblate (French) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 14:06:03 +02:00
Hugues Peccatte
d5b53ae9b8 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 12:21:20 +02:00
Hugues Peccatte
d8bb18916c Fix display of text after edit. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-24 23:58:16 +02:00
Marc Delisle
9303d465bb Update po files 2014-05-24 17:34:56 -04:00
Marc Delisle
56cbb769cc Improve English 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-24 17:34:29 -04:00
Hugues Peccatte
b7b7e25fe0 Replace edit input for text fields. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-24 23:33:56 +02:00
Claus Svalekjaer
c417efade8 Translated using Weblate (Danish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-24 19:40:16 +02:00
Ann + J.M
43d1239583 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-24 16:48:53 +02:00
Marc Delisle
9c0a72d996 Update po files 2014-05-24 09:08:12 -04:00
Marc Delisle
ee7d793599 Merge commit '7b00947' 2014-05-24 09:07:46 -04:00
Marc Delisle
68eca169a8 Merge commit '60fca63' 2014-05-24 09:07:19 -04:00
Marc Delisle
7b00947113 Update po files 2014-05-24 09:05:53 -04:00
Marc Delisle
60fca63630 Missing message for /setup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-24 09:05:10 -04:00
Marc Delisle
489826139e Merge commit '16036ac' 2014-05-23 10:31:20 -04:00
Marc Delisle
7e43534848 Merge commit '54e2c0f' 2014-05-23 10:30:45 -04:00
Marc Delisle
c1756b96e3 Merge commit '56d5ef0' 2014-05-23 10:30:10 -04:00
Marc Delisle
1a32869ba1 Merge commit 'ec29a0c' 2014-05-23 10:29:13 -04:00
Marc Delisle
ad1e2352ca Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-23 10:28:48 -04:00
Marc Delisle
decbcdfeee Merge commit '524e82e' 2014-05-23 10:24:35 -04:00
Marc Delisle
e50b0d2b71 Merge commit 'daaf70b' 2014-05-23 10:23:51 -04:00
Marc Delisle
7630006be2 Merge commit 'd666ed6' 2014-05-23 10:23:31 -04:00
Marc Delisle
20b2a3a707 Merge commit '28074d2' 2014-05-23 10:22:51 -04:00
Marc Delisle
9373e1b204 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-23 10:21:37 -04:00
Marc Delisle
1acfaf4a7f Merge commit 'ddbe5ae' 2014-05-23 10:15:49 -04:00
Marc Delisle
e98a9a7bdb Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-23 10:03:39 -04:00
Atul Pratap Singh
16036ac143 Fix bug#4424 Table indexes disappear after altering field 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-05-22 23:44:31 +05:30
Atul Pratap Singh
54e2c0f82a Use setdate and make input readonly 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-05-22 23:05:55 +05:30
Atul Pratap Singh
56d5ef04a0 Date format problem in firefox, use jquery datepicker to get date 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-05-22 21:49:46 +05:30
Weblate
737df91c37 Merge remote-tracking branch 'origin/master' 2014-05-22 14:17:35 +02:00
கணேஷ் குமார்
68d39e8fd9 Translated using Weblate (Tamil) 
Currently translated at 27.8% (773 of 2772)

தலைப்புக்களைப் பெறுவதில் தவறியது.->நிறைவரிசை எண்ணிக்கையை பெற தவறியது.
 2014-05-22 14:17:31 +02:00
Marc Delisle
3bb157d6ce Merge pull request #1191 from D-storm/browse-foreign 
fixed browse foreign values copying description in input field
 2014-05-22 08:17:24 -04:00
Chirayu Chiripal
58dba3809f fixed browse foreign values copying description in input field 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-22 13:49:05 +05:30
Ann + J.M
ec29a0c59d Add missing ) 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:46:54 +02:00
Ann + J.M
5facff36bd Add missing break in # comment detection switch 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:43:20 +02:00