gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,381 Commits 12 Branches 481 Tags 2.4 GiB
440afe2423
Commit Graph

96381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
440afe2423 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-04 15:33:45 -05:00
Weblate
3777e0a198 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-04 21:32:48 +01:00
Ann + J.M
760c61d78c Translated using Weblate (German) 
Currently translated at 100.0% (2979 of 2979 strings)

[CI skip]
 2015-01-04 21:32:45 +01:00
Marc Delisle
63bf881f26 Merge pull request #1447 from Tithugues/b4416_qa43 
Fix #4416 New lines are removed when grid editing
 2015-01-04 15:32:41 -05:00
Marc Delisle
459f1a6c16 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-04 07:34:46 -05:00
Marc Delisle
964881b40d Merge remote-tracking branch 'madhuracj/zeroconf' into QA_4_3 2015-01-04 07:32:31 -05:00
Weblate
741c4ab958 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-04 13:10:07 +01:00
Yong Kim
489c378318 Translated using Weblate (Korean) 
Currently translated at 82.8% (2471 of 2982 strings)

[CI skip]
 2015-01-04 13:10:04 +01:00
Balázs Úr
8033864970 Translated using Weblate (Hungarian) 
Currently translated at 99.3% (2964 of 2982 strings)

[CI skip]
 2015-01-04 13:10:02 +01:00
Marc Delisle
c99765a098 Merge pull request #1446 from Tithugues/b4645_2_qa43 
Fix #4645 and #4682
 2015-01-04 07:09:52 -05:00
Madhura Jayaratne
9c097139ef This note does not make sense anymore since tables are no longer created automatically without asked by the user. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-04 16:09:58 +05:30
Madhura Jayaratne
9beef68341 Do not unset configuration storage details here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-04 16:05:45 +05:30
Hugues Peccatte
cf4d94527c Fix #4416 New lines are removed when grid editing 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 22:40:54 +01:00
Hugues Peccatte
fc6be4a7bd Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:42:32 +01:00
Hugues Peccatte
561ec7ea30 Remove code to ignore commit. 
Fix comment.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:39:56 +01:00
Hugues Peccatte
4330110c90 Revert "Fix #4645 Import of export created with mysqldump" 
This reverts commit 2dcb1c9b0a.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 19:53:09 +01:00
Weblate
a29ee3897a Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-03 13:31:26 +01:00
Сергій Педько
16a6507b73 Translated using Weblate (Ukrainian) 
Currently translated at 92.1% (2749 of 2982 strings)

[CI skip]
 2015-01-03 13:31:23 +01:00
Martin Lacina
275b74fe77 Translated using Weblate (Slovak) 
Currently translated at 76.2% (2272 of 2979 strings)

[CI skip]

Sentence should be split. Oldest records should be separate sentence.
 2015-01-03 13:31:20 +01:00
Balázs Úr
587667f6c7 Translated using Weblate (Hungarian) 
Currently translated at 97.7% (2916 of 2982 strings)

[CI skip]
 2015-01-03 13:31:17 +01:00
Marc Delisle
b34af47a39 Translated using Weblate (English (United Kingdom)) 
Currently translated at 90.9% (2712 of 2982 strings)

[CI skip]
 2015-01-03 13:31:15 +01:00
Marc Delisle
cf8bed2e3e Incorrect parameter passed to function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-03 07:30:57 -05:00
Madhura Jayaratne
62631f77bf Simplify checking for empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 20:57:51 +05:30
Martin Lacina
0be22a8874 Translated using Weblate (Slovak) 
Currently translated at 76.1% (2269 of 2979 strings)

[CI skip]
 2015-01-02 15:46:27 +01:00
Weblate
ea7c9034f1 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-02 15:33:27 +01:00
Martin Lacina
ab817dfebc Translated using Weblate (Slovak) 
Currently translated at 76.0% (2265 of 2979 strings)

[CI skip]
 2015-01-02 15:33:25 +01:00
Marc Delisle
de80a3fad4 Translated using Weblate (English (United Kingdom)) 
Currently translated at 90.9% (2711 of 2982 strings)

[CI skip]
 2015-01-02 15:33:23 +01:00
Marc Delisle
d95356e1dd bug #4655 Undefined index: collation_connection (second patch) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-02 09:32:19 -05:00
Madhura Jayaratne
31a1b7396c Saving table UI prefs were failing due to errors in the query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 19:40:45 +05:30
Madhura Jayaratne
9bc80b7c84 Do not save the configuration table name statically 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 19:40:07 +05:30
Weblate
f68d5ccf31 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-02 11:19:20 +01:00
Martin Lacina
17236b0c3f Translated using Weblate (Slovak) 
Currently translated at 74.4% (2217 of 2979 strings)

[CI skip]
 2015-01-02 11:19:17 +01:00
Kristjan Räts
3fcfb992f1 Translated using Weblate (Estonian) 
Currently translated at 99.8% (2976 of 2979 strings)

[CI skip]
 2015-01-02 11:19:16 +01:00
Madhura Jayaratne
0fd5cb54b9 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-01-02 15:49:04 +05:30
Madhura Jayaratne
a7db400145 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 15:48:05 +05:30
dingo thirteen
035595ff23 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2981 of 2981 strings)

[CI skip]
 2015-01-02 11:17:10 +01:00
Madhura Jayaratne
6b85f72604 bug #4683 Relational data is not properly updated on table rename 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 15:35:42 +05:30
Madhura Jayaratne
2947c166a1 Do not read SQL file until it is really required 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 11:11:06 +05:30
Madhura Jayaratne
eee442e4a7 Update another tracking query and its corresponding unit test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 10:27:47 +05:30
Madhura Jayaratne
09fff10681 Fix tracking query and related test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 10:21:10 +05:30
Madhura Jayaratne
d8bea6fcbe Fix a failing test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 10:04:50 +05:30
Madhura Jayaratne
e75d4ec8b4 Merge branch 'QA_4_3' into zeroconf 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 09:57:25 +05:30
Madhura Jayaratne
dfae4d2f08 Bug #4676 - Auto configuration issues 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 09:49:03 +05:30
Burak Yavuz
530c04d14a Translated using Weblate (Turkish) 
Currently translated at 100.0% (2982 of 2982 strings)

[CI skip]
 2015-01-01 19:07:05 +01:00
Burak Yavuz
d26bffd0ae Translated using Weblate (Turkish) 
Currently translated at 100.0% (2982 of 2982 strings)

[CI skip]
 2015-01-01 19:06:32 +01:00
Domen
117f36c8da Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2015-01-01 17:15:43 +01:00
Weblate
bd7a3eabec Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-01 16:44:21 +01:00
Martin Lacina
ca6bc114f3 Translated using Weblate (Slovak) 
Currently translated at 73.6% (2195 of 2979 strings)

[CI skip]
 2015-01-01 16:44:18 +01:00
Marc Delisle
c69cf0b74d Based on http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci, changed the default connection collation 
to improve sort accuracy.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-01 10:42:44 -05:00
Marc Delisle
23494011be Translated using Weblate (French) 
Currently translated at 100.0% (2982 of 2982 strings)

[CI skip]
 2015-01-01 15:23:51 +01:00