gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,747 Commits 12 Branches 481 Tags 2.4 GiB
93292f3bcb
Commit Graph

98747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
93292f3bcb Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:44:41 +05:30
Madhura Jayaratne
ebb613ab51 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-03-27 19:41:32 +05:30
Madhura Jayaratne
8f58c8f851 bug #4805 Inline edit broken when using functions in query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:39:11 +05:30
Madhura Jayaratne
c06c23f560 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:24:00 +05:30
Madhura Jayaratne
f70cda04e5 Merge branch 'QA_4_4' 2015-03-27 19:23:47 +05:30
Weblate
42ee547bb6 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-27 14:53:38 +01:00
Ahmed Saleh Abd El-Raouf Ismae
48f149e855 Translated using Weblate (Arabic) 
Currently translated at 38.4% (1167 of 3032 strings)

[CI skip]
 2015-03-27 14:51:29 +01:00
Madhura Jayaratne
9c56ea6950 Make translatable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:20:16 +05:30
Weblate
166c94dc31 Merge remote-tracking branch 'origin/master' 2015-03-27 14:47:15 +01:00
Ahmed Saleh Abd El-Raouf Ismae
0c9ff8914e Translated using Weblate (Arabic) 
Currently translated at 38.3% (1167 of 3042 strings)

[CI skip]
 2015-03-27 14:47:12 +01:00
Madhura Jayaratne
050319f2e2 rfe #354 PDF schema sort options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:16:49 +05:30
Madhura Jayaratne
3a5b3fd27a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-27 16:47:38 +05:30
Michal Čihař
b249614d06 Merge native and multibyte tests 
Having in all cases dozen of skipped test just makes the results
readability worse. So it makes little sense unless we can figure out way
to test both implementations.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-03-27 08:44:39 +01:00
Madhura Jayaratne
0d2cb6e29b Remove icon used for query window 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:47:09 +05:30
Madhura Jayaratne
251a6282e2 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:37:07 +05:30
Madhura Jayaratne
d32f555a56 bug Missing sort icons in monitor 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:35:16 +05:30
Madhura Jayaratne
f74969651d Use b_help icon here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:08:51 +05:30
Weblate
bce658b7c5 Merge remote-tracking branch 'origin/master' 2015-03-27 05:28:12 +01:00
Sevdimali İsa
3eef6920d1 Translated using Weblate (Azerbaijani) 
Currently translated at 53.6% (1633 of 3043 strings)

[CI skip]
 2015-03-27 05:28:09 +01:00
Madhura Jayaratne
094f1f87e7 Merge branch 'QA_4_4' 2015-03-27 09:57:57 +05:30
Weblate
071e43fbe2 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-27 05:25:01 +01:00
Sevdimali İsa
424a3c1f4a Translated using Weblate (Azerbaijani) 
Currently translated at 53.8% (1633 of 3032 strings)

[CI skip]
 2015-03-27 05:24:57 +01:00
Madhura Jayaratne
6431883648 Missing tooltip in monitor 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 09:53:43 +05:30
Weblate
4f5a23682a Merge remote-tracking branch 'origin/master' 2015-03-26 22:33:54 +01:00
Domen
06f2290ffc Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3042 of 3042 strings)

[CI skip]
 2015-03-26 22:33:51 +01:00
Balázs Úr
5732a281d4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3042 of 3042 strings)

[CI skip]
 2015-03-26 22:33:48 +01:00
Michal Čihař
1b1b3cdb67 Disable setting of session cookies for further session_start() calls. 
See #1544 for discussion.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-03-26 22:33:27 +01:00
Domen
0a88ea395d Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3042 of 3042 strings)

[CI skip]
 2015-03-26 16:02:21 +01:00
Marc Delisle
14bd4a66aa Translated using Weblate (French) 
Currently translated at 100.0% (3043 of 3043 strings)

[CI skip]
 2015-03-26 15:42:29 +01:00
Marc Delisle
52652e7165 Translated using Weblate (French) 
Currently translated at 100.0% (3043 of 3043 strings)

[CI skip]
 2015-03-26 15:41:23 +01:00
Madhura Jayaratne
5d416f0d71 Explicitly check for non empty array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 19:25:47 +05:30
Madhura Jayaratne
a2d045137a Use unambiguous checks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 19:23:47 +05:30
Madhura Jayaratne
5c5de0951d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-26 19:20:20 +05:30
Madhura Jayaratne
772ab1cde3 Update doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 19:19:19 +05:30
Burak Yavuz
7074a98056 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3043 of 3043 strings)

[CI skip]
 2015-03-26 14:46:31 +01:00
Madhura Jayaratne
5cfc3755b0 Use explicit checking for empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 19:10:05 +05:30
Madhura Jayaratne
7981437b85 Avoid having to check for uninitialized comment_map 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 19:07:29 +05:30
Madhura Jayaratne
78d2b1a70b Fix parameter name in doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 19:03:40 +05:30
Madhura Jayaratne
d8784a3889 Another bad line break 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:59:32 +05:30
Madhura Jayaratne
6b1d977e33 Fix bad line break 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:58:18 +05:30
Madhura Jayaratne
5e823b1813 isset($num_rows) always evaluated to false 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:51:49 +05:30
Madhura Jayaratne
4f9bb04e55 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-26 18:35:24 +05:30
Madhura Jayaratne
b5eefc7a53 Fix bad line breaks in functions.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:19:50 +05:30
Madhura Jayaratne
92299af11a Fix bad line breaks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:16:18 +05:30
Madhura Jayaratne
c177ebeaea Avoid loose comparing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:11:12 +05:30
Burak Yavuz
879453cad3 Translated using Weblate (Turkish) 
Currently translated at 99.9% (3041 of 3043 strings)

[CI skip]
 2015-03-26 13:35:28 +01:00
Weblate
9096a58e4e Merge remote-tracking branch 'origin/master' 2015-03-26 13:32:53 +01:00
Madhura Jayaratne
3e77c708b4 Check whether query succeeded 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:02:38 +05:30
Weblate
15107aa414 Merge remote-tracking branch 'origin/master' 2015-03-26 13:25:49 +01:00
Burak Yavuz
0cbca7a022 Translated using Weblate (Turkish) 
Currently translated at 99.9% (3040 of 3043 strings)

[CI skip]
 2015-03-26 13:25:46 +01:00