gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,263 Commits 12 Branches 481 Tags 2.4 GiB
205e4175e5
Commit Graph

97263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
205e4175e5 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-14 12:09:34 -05:00
dingo thirteen
d7d15040aa Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2015-01-14 17:30:21 +01:00
Παναγιώτης Παπάζογλου
484ca6a892 Translated using Weblate (Greek) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2015-01-14 17:02:50 +01:00
Madhura Jayaratne
f2663a0324 Merge branch 'QA_4_3' 2015-01-14 21:07:14 +05:30
Madhura Jayaratne
36cb10bd77 Update another test case 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 21:05:19 +05:30
Madhura Jayaratne
f55aa7b939 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 20:58:38 +05:30
Madhura Jayaratne
8cdaf81e27 bug #4702 URL is non RFC-2396 compatible in get_scripts.js.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 20:56:22 +05:30
Madhura Jayaratne
4084dab7e3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-14 19:34:57 +05:30
Madhura Jayaratne
fed064fa6b Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 19:32:13 +05:30
Weblate
1a242a44f5 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-14 15:00:23 +01:00
Juha
deeb985d09 Translated using Weblate (Finnish) 
Currently translated at 62.2% (1857 of 2982 strings)

[CI skip]
 2015-01-14 15:00:20 +01:00
josep constanti
da6797dfa6 Translated using Weblate (Catalan) 
Currently translated at 84.7% (2527 of 2982 strings)

[CI skip]
 2015-01-14 15:00:19 +01:00
Madhura Jayaratne
aea519fded bug #4707 Call to undefined method PMA_Schema_PDF::dieSchema() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 19:30:00 +05:30
Michal Čihař
270b89dbea Allow failures for hhvm 
We're more testing hhvm than testing our code base with this.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-01-14 14:21:45 +01:00
Michal Čihař
0cd62aef98 Switch to new style SVG badges 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-01-14 14:09:51 +01:00
Madhura Jayaratne
737e51eeb0 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 18:36:57 +05:30
Marc Delisle
ae7d27f913 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-14 07:44:16 -05:00
Marc Delisle
a5f003077d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-14 07:43:44 -05:00
Madhura Jayaratne
b28bb3ec3e Reload navigation after adding indexes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 18:11:50 +05:30
Madhura Jayaratne
785123b643 bug #4705 Table structure: adding primary key doesn't refresh page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 18:05:14 +05:30
Smita Kumari
b1f059dce3 Merge pull request #1459 from smita786/master 
FRE #1568: fold add column position radio into one 'add column after'
 2015-01-14 16:58:00 +05:30
Weblate
b2a37f7b5d Merge remote-tracking branch 'origin/master' 2015-01-14 11:43:00 +01:00
josep constanti
8fe6b24b09 Translated using Weblate (Catalan) 
Currently translated at 84.5% (2533 of 2996 strings)

[CI skip]
 2015-01-14 11:42:57 +01:00
Michal Čihař
bb12c8f489 Actually store the attribute in constructor 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-01-14 11:41:26 +01:00
Weblate
8c36cc867d Merge remote-tracking branch 'origin/master' 2015-01-13 22:44:43 +01:00
Juha
c40395c685 Translated using Weblate (Finnish) 
Currently translated at 62.1% (1862 of 2996 strings)

[CI skip]
 2015-01-13 22:44:40 +01:00
Hugues Peccatte
7053381719 Merge branch 'f1591_master' 2015-01-13 22:43:19 +01:00
Juha
b5055fd14a Translated using Weblate (Finnish) 
Currently translated at 61.9% (1856 of 2996 strings)

[CI skip]

Amended the translation to correspond the time form
 2015-01-13 22:15:10 +01:00
Juha
75e33bfc90 Translated using Weblate (Finnish) 
Currently translated at 61.9% (1855 of 2996 strings)

[CI skip]

Tietokanta = database, Taulu = table.
 2015-01-13 22:09:36 +01:00
Juha
bbc769ec70 Translated using Weblate (Finnish) 
Currently translated at 61.8% (1854 of 2996 strings)

[CI skip]
 2015-01-13 22:08:55 +01:00
Juha
4b9adf3907 Translated using Weblate (Finnish) 
Currently translated at 61.8% (1852 of 2996 strings)

[CI skip]

Finnish does not always translate directly from word to word. I took a little freedom to change the grammatical structure. :)
 2015-01-13 22:06:18 +01:00
Juha
84b0fc6687 Translated using Weblate (Finnish) 
Currently translated at 61.7% (1851 of 2996 strings)

[CI skip]
 2015-01-13 21:55:52 +01:00
Smita Kumari
5fa0cef84c change text 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-01-13 23:47:30 +05:30
Marc Delisle
1125b87c3e Remove dead code; fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-13 11:15:30 -05:00
Marc Delisle
d1c7ee21af Merge pull request #1458 from madhuracj/displayDir 
Remove display direction
 2015-01-13 10:22:28 -05:00
Smita Kumari
e0e3c0e84f FRE #1568: fold add column position radio into one 'add column after' dropdown 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-01-13 20:24:56 +05:30
Madhura Jayaratne
0d601eb9c4 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-13 19:09:54 +05:30
Madhura Jayaratne
b1056fc7d4 diagram variable does not have a method dieSchema() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 19:08:36 +05:30
Madhura Jayaratne
baa92b32f3 Revert "Remove more dead code" 
This reverts commit c1e220520e.
 2015-01-13 18:51:21 +05:30
Michal Čihař
b4fe0d8db6 Merge branch 'QA_4_3' 2015-01-13 13:55:33 +01:00
Madhura Jayaratne
c1e220520e Remove more dead code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:18:11 +05:30
Madhura Jayaratne
c895b6147b Remove dead code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:10:10 +05:30
Madhura Jayaratne
a3477de69a Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:07:55 +05:30
Weblate
7d5acc16be Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-13 13:30:40 +01:00
Michal Čihař
132a9c081a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 95.0% (2833 of 2982 strings)

[CI skip]
 2015-01-13 13:30:37 +01:00
Giovanni Sora
a88447c4e5 Translated using Weblate (Interlingua) 
Currently translated at 63.8% (1901 of 2979 strings)

[CI skip]
 2015-01-13 13:30:35 +01:00
Zufar Fathi Suhardi
e2c4569398 Translated using Weblate (Indonesian) 
Currently translated at 74.8% (2232 of 2982 strings)

[CI skip]
 2015-01-13 13:30:33 +01:00
Kristjan Räts
538f303a4b Translated using Weblate (Estonian) 
Currently translated at 99.9% (2977 of 2979 strings)

[CI skip]
 2015-01-13 13:30:30 +01:00
josep constanti
92a76746e7 Translated using Weblate (Catalan) 
Currently translated at 84.5% (2522 of 2982 strings)

[CI skip]
 2015-01-13 13:30:28 +01:00
Madhura Jayaratne
9524db89ce bug #4703 Unsaved schema page exported as pdf.pdf 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:00:13 +05:30