gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,276 Commits 12 Branches 481 Tags 2.4 GiB
4da88d0fcf
Commit Graph

99276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
4da88d0fcf Merge commit '9e19fcf' 2015-04-22 09:47:05 -04:00
Marc Delisle
efa7f0d3c9 Merge commit 'f120a77' 2015-04-22 09:46:43 -04:00
Marc Delisle
40af9f6c13 Merge commit '1c92fdb' 2015-04-22 09:46:32 -04:00
Weblate
9e19fcf371 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-22 15:45:47 +02:00
João Rodrigues
caccf0a9ab Translated using Weblate (Portuguese) 
Currently translated at 59.2% (1798 of 3035 strings)

[CI skip]
 2015-04-22 15:45:45 +02:00
Marc Delisle
f120a77f4c bug #4865 sprintf(): Too few arguments 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-22 09:45:22 -04:00
Marc Delisle
6dcfe4b6d5 Use strict comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-22 08:32:47 -04:00
Weblate
1b1d00962a Merge remote-tracking branch 'origin/master' 2015-04-22 13:28:44 +02:00
João Rodrigues
f49b685535 Translated using Weblate (Portuguese) 
Currently translated at 58.2% (1792 of 3075 strings)

[CI skip]
 2015-04-22 13:28:41 +02:00
Madhura Jayaratne
96e30781d1 List of columns is ordered. Use row numbers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-22 16:58:35 +05:30
Madhura Jayaratne
f1236e2ec5 Identify keys in structure snapshots 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-22 15:31:30 +05:30
Madhura Jayaratne
54a2b7a81e Wrap some long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-22 13:10:26 +05:30
Madhura Jayaratne
741a08208b Do not return duplicate column names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-22 13:02:49 +05:30
Madhura Jayaratne
f2015f5b20 Add icon for columns with index 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-22 13:00:21 +05:30
Madhura Jayaratne
0bc04da034 Fix variable name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-22 12:49:31 +05:30
Madhura Jayaratne
b5d75f952b Allow retrieving indexes by types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-22 12:25:45 +05:30
Madhura Jayaratne
fba28baa32 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-22 11:28:11 +05:30
Madhura Jayaratne
9bb5363995 Add space 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-22 11:26:59 +05:30
Marc Delisle
0fe34e4ef2 Merge branch 'QA_4_4' 2015-04-21 11:28:35 -04:00
Weblate
1c92fdbcab Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-21 17:28:24 +02:00
fundawang
5a756f58f1 Translated using Weblate (Chinese (China)) 
Currently translated at 80.5% (2444 of 3035 strings)

[CI skip]
 2015-04-21 17:28:21 +02:00
Marc Delisle
b0ddd7e743 bug #4861 Use of undefined constant PMA_DRIZZLE 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-21 11:28:08 -04:00
Weblate
61c8a07565 Merge remote-tracking branch 'origin/master' 2015-04-21 15:47:32 +02:00
fundawang
3934f6fb35 Translated using Weblate (Chinese (China)) 
Currently translated at 79.3% (2441 of 3075 strings)

[CI skip]
 2015-04-21 15:47:28 +02:00
Marc Delisle
5c3b9c604f Fix JSHint warnings 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-21 09:47:18 -04:00
Madhura Jayaratne
8d8b2677db Merge branch 'QA_4_4' 2015-04-21 11:34:37 +05:30
Madhura Jayaratne
2981728987 bug #4862 Misaligned Inline edit field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-21 11:33:16 +05:30
Madhura Jayaratne
9627e352b0 Merge branch 'QA_4_4' 2015-04-21 10:20:26 +05:30
Madhura Jayaratne
a204b56f2d Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-21 10:19:17 +05:30
Madhura Jayaratne
af2755217f bug #4859 Don't scroll (to bottom) when editing multiple rows 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-21 10:17:00 +05:30
Marc Delisle
7179dd17d3 Better validation for parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-20 12:42:04 -04:00
Weblate
2ce511d42b Merge remote-tracking branch 'origin/master' 2015-04-20 18:03:54 +02:00
Arben Çokaj
7e2ccd4314 Translated using Weblate (Albanian) 
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
 2015-04-20 18:03:49 +02:00
Marc Delisle
924b8d0ddd Merge branch 'QA_4_4' 2015-04-20 12:03:33 -04:00
Marc Delisle
f5361aadf0 Ticket was moved to bugs 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-20 12:03:00 -04:00
Arben Çokaj
6ff96a5522 Translated using Weblate (Albanian) 
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
 2015-04-20 16:56:15 +02:00
Madhura Jayaratne
a74f0d97df Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 18:39:35 +05:30
Madhura Jayaratne
60e3af04fd bug #1656 Edit vs Change 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 18:04:50 +05:30
Madhura Jayaratne
853541ccc0 Display transformation name as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 17:43:31 +05:30
Madhura Jayaratne
92473c4a29 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-20 17:27:05 +05:30
Madhura Jayaratne
cacafa8e88 Use lower case names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 17:26:00 +05:30
Marc Delisle
e1004ada0f Merge branch 'QA_4_4' 2015-04-20 07:41:07 -04:00
Marc Delisle
ce73509ecf 4.4.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-20 07:40:54 -04:00
Weblate
db40caae2d Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-20 13:40:24 +02:00
Arben Çokaj
c334ea103c Translated using Weblate (Albanian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-04-20 13:40:20 +02:00
Marc Delisle
e603b3459a 4.4.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-20 07:39:51 -04:00
Weblate
1fb71b38ab Merge remote-tracking branch 'origin/master' 2015-04-20 12:13:27 +02:00
Arben Çokaj
bb67e2e927 Translated using Weblate (Albanian) 
Currently translated at 99.3% (3054 of 3075 strings)

[CI skip]
 2015-04-20 12:13:23 +02:00
Madhura Jayaratne
f344c26138 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 15:43:15 +05:30
Madhura Jayaratne
608c9f198e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-20 15:38:03 +05:30