Commit Graph

96025 Commits

Author SHA1 Message Date
Madhura Jayaratne
923f6682fb Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-19 09:33:54 +05:30
Madhura Jayaratne
3cda6ac366 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-11-19 09:32:23 +05:30
Madhura Jayaratne
0b662922db Merge branch 'QA_4_2' into QA_4_3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-19 09:30:30 +05:30
Madhura Jayaratne
2e42e8a11b bug #4602 Exporting selected rows exports all rows of the query
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-19 09:26:11 +05:30
Madhura Jayaratne
81b2be055f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-19 07:16:56 +05:30
Madhura Jayaratne
a9321f15d5 Merge branch 'QA_4_3' 2014-11-19 07:15:58 +05:30
Weblate
b29a021ffc Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-19 02:44:30 +01:00
Sevdimali İsa
4630dd22d5 Translated using Weblate (Azerbaijani)
Currently translated at 50.6% (1507 of 2978 strings)

[CI skip]
2014-11-19 02:44:28 +01:00
Madhura Jayaratne
aa41a0bb0e Merge branch 'QA_4_2' into QA_4_3 2014-11-19 07:13:37 +05:30
Madhura Jayaratne
e7b2f5415a Merge pull request #1403 from madhuracj/Bug4599
#4599 Input field unnecessarily selected on focus
2014-11-19 07:05:07 +05:30
Weblate
5e8c5af72f Merge remote-tracking branch 'origin/master' 2014-11-18 17:54:38 +01:00
Sevdimali İsa
d0c6061a96 Translated using Weblate (Azerbaijani)
Currently translated at 50.6% (1506 of 2976 strings)

[CI skip]
2014-11-18 17:54:35 +01:00
Marc Delisle
8fd9c48c9c Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-18 11:54:27 -05:00
Madhura Jayaratne
6399fd76a7 Merge branch 'QA_4_3' 2014-11-18 16:18:15 +05:30
Madhura Jayaratne
19e5ddffcc Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-11-18 16:14:48 +05:30
Madhura Jayaratne
ea5333e523 ChangeLog entries for bugs related to performance with thousands of databases
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-18 16:12:12 +05:30
Weblate
cdf832cb39 Merge remote-tracking branch 'origin/master' 2014-11-18 11:25:02 +01:00
Sevdimali İsa
c6aa4fca17 Translated using Weblate (Azerbaijani)
Currently translated at 49.2% (1467 of 2976 strings)

[CI skip]
2014-11-18 11:25:00 +01:00
Madhura Jayaratne
665f1fa215 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-18 15:54:34 +05:30
Weblate
54f1bc5d2c Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-18 11:21:29 +01:00
Sevdimali İsa
7413983602 Translated using Weblate (Azerbaijani)
Currently translated at 49.2% (1467 of 2978 strings)

[CI skip]
2014-11-18 11:21:27 +01:00
Madhura Jayaratne
b802b5f9b3 Bug #4591 Spinner in navigation running forever
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-18 15:51:06 +05:30
Madhura Jayaratne
9f9e6937ca #4599 Input field unnecessarily selected on focus
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-18 12:56:09 +05:30
Weblate
cec7ccb854 Merge remote-tracking branch 'origin/master' 2014-11-17 21:04:40 +01:00
Sevdimali İsa
0223844e34 Translated using Weblate (Azerbaijani)
Currently translated at 48.2% (1436 of 2976 strings)

[CI skip]
2014-11-17 21:04:37 +01:00
Hugues Peccatte
7bdc3e6759 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-17 21:04:27 +01:00
Weblate
b820c8f8f9 Merge remote-tracking branch 'origin/master' 2014-11-17 19:22:11 +01:00
Sevdimali İsa
89f78212f9 Translated using Weblate (Azerbaijani)
Currently translated at 48.2% (1436 of 2976 strings)

[CI skip]
2014-11-17 19:22:09 +01:00
Marc Delisle
f98a3b0799 Merge branch 'QA_4_3' 2014-11-17 13:20:56 -05:00
Marc Delisle
d3aca9a630 Merge commit '8502efb' 2014-11-17 13:20:50 -05:00
Weblate
687e78d2cc Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-17 19:20:33 +01:00
Sevdimali İsa
8269287109 Translated using Weblate (Azerbaijani)
Currently translated at 48.2% (1436 of 2978 strings)

[CI skip]
2014-11-17 19:20:31 +01:00
Marc Delisle
b7108e9e70 Bug #4600 Warning when editing the results of a Search
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-17 13:19:52 -05:00
Hugues Peccatte
23754602ef Reduce nested levels in Node.class.php
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-17 18:57:19 +01:00
Mircəlal
8502efb8cf Translated using Weblate (Azerbaijani)
Currently translated at 47.9% (1429 of 2978 strings)

[CI skip]
2014-11-16 21:29:47 +01:00
Mircəlal
d582c9807a Translated using Weblate (Azerbaijani)
Currently translated at 48.0% (1429 of 2976 strings)

[CI skip]
2014-11-16 21:29:42 +01:00
Weblate
b14acf6e29 Merge remote-tracking branch 'origin/master' 2014-11-16 13:04:43 +01:00
Andika Triwidada
27562616cd Translated using Weblate (Indonesian)
Currently translated at 74.2% (2210 of 2978 strings)

[CI skip]
2014-11-16 13:04:41 +01:00
Marc Delisle
33d5de0df2 Merge commit 'babad6e' 2014-11-16 07:03:03 -05:00
Marc Delisle
d8eb2cac55 Merge commit '3d038ce' 2014-11-16 07:02:40 -05:00
Weblate
9838e780e8 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-16 13:02:25 +01:00
Michal Čihař
baa9545808 Translated using Weblate (Welsh)
Currently translated at 20.1% (599 of 2978 strings)

[CI skip]
2014-11-16 13:02:23 +01:00
Michal Čihař
1a4be1f310 Translated using Weblate (Uzbek)
Currently translated at 37.4% (1114 of 2978 strings)

[CI skip]
2014-11-16 13:02:21 +01:00
Burak Yavuz
c5a40b5767 Translated using Weblate (Turkish)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-11-16 13:02:19 +01:00
youngminz
b5466eaa81 Translated using Weblate (Korean)
Currently translated at 82.1% (2446 of 2978 strings)

[CI skip]
2014-11-16 13:02:17 +01:00
Giovanni Sora
7509725b75 Translated using Weblate (Interlingua)
Currently translated at 63.7% (1897 of 2978 strings)

[CI skip]
2014-11-16 13:02:15 +01:00
Andika Triwidada
931a6458e1 Translated using Weblate (Indonesian)
Currently translated at 74.2% (2210 of 2978 strings)

[CI skip]
2014-11-16 13:02:13 +01:00
Panagiotis Papazoglou
9423d7bf68 Translated using Weblate (Greek)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-11-16 13:02:12 +01:00
Michal Čihař
b86853e50f Translated using Weblate (Armenian)
Currently translated at 3.3% (100 of 2978 strings)

[CI skip]
2014-11-16 13:02:10 +01:00
Marc Delisle
babad6efe5 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-16 07:01:06 -05:00