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

98270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
79b35fcb99 Merge branch 'QA_4_4' 2015-03-06 08:14:24 -05:00
Marc Delisle
fd366c9166 Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-06 08:14:00 -05:00
Madhura Jayaratne
87fc15cc00 Merge branch 'QA_4_4' 2015-03-06 16:04:12 +05:30
Madhura Jayaratne
c93d7f8440 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 16:00:31 +05:30
Madhura Jayaratne
faa85419c5 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 15:57:40 +05:30
Madhura Jayaratne
a708e79df7 Merge branch 'QA_4_3' into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 15:55:44 +05:30
Madhura Jayaratne
390a36eeea Compatibility with central columns of version 4.4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 15:52:44 +05:30
Weblate
9c6da42e64 Merge remote-tracking branch 'origin/master' 2015-03-06 11:11:22 +01:00
Matthias Bluthardt
57da5aa40c Translated using Weblate (German) 
Currently translated at 98.8% (2996 of 3032 strings)

[CI skip]
 2015-03-06 11:11:18 +01:00
Michal Čihař
b2eda4ccb3 Translated using Weblate (Czech) 
Currently translated at 92.6% (2810 of 3032 strings)

[CI skip]
 2015-03-06 11:11:16 +01:00
Valter Georgiev
3b9bdf32e6 Translated using Weblate (Bulgarian) 
Currently translated at 62.4% (1894 of 3031 strings)

[CI skip]
 2015-03-06 11:11:15 +01:00
Weblate
59a8347ebb Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-06 11:08:39 +01:00
Michal Čihař
66433a0eff Translated using Weblate (Czech) 
Currently translated at 92.6% (2810 of 3032 strings)

[CI skip]
 2015-03-06 11:08:37 +01:00
Valter Georgiev
80ada8155c Translated using Weblate (Bulgarian) 
Currently translated at 62.4% (1893 of 3032 strings)

[CI skip]
 2015-03-06 11:08:35 +01:00
Madhura Jayaratne
f037e5a166 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-03-06 15:36:25 +05:30
Madhura Jayaratne
c32a5ace66 Add space around operators 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 15:33:14 +05:30
Madhura Jayaratne
dee38cc470 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 15:30:08 +05:30
Madhura Jayaratne
4b057ae45f Simplify handling values from previous version by using comma separated values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 15:28:27 +05:30
Matthias Bluthardt
f8ba01fcbb Translated using Weblate (German) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-06 10:13:50 +01:00
Madhura Jayaratne
1f0ab51a6a Charts also need these parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 12:03:37 +05:30
Madhura Jayaratne
f0456f6268 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 12:01:16 +05:30
Madhura Jayaratne
b2910e3a85 Pass values as parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 11:54:57 +05:30
Madhura Jayaratne
b6f79a9202 Limit pos based on the number of rows in the table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 11:39:46 +05:30
Madhura Jayaratne
5a0ffa30fd rfe Pagination for GIS visualization 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 11:27:50 +05:30
Madhura Jayaratne
3de6ee1b0a Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 08:51:32 +05:30
Weblate
0a264104bb Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-06 04:17:33 +01:00
Dieter Adriaenssens
a5a9de6796 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-06 04:17:30 +01:00
Madhura Jayaratne
8d7caf61f9 Merge branch 'QA_4_3' into QA_4_4 2015-03-06 08:47:05 +05:30
Madhura Jayaratne
31410ecb0a Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 08:34:40 +05:30
Madhura Jayaratne
1bb782aa46 bug #4790 DROP TABLE/VIEW IF EXISTS are not tracked 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 08:14:52 +05:30
Dieter Adriaenssens
a5da3aa13c Translated using Weblate (Dutch) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-05 21:48:20 +01:00
Dieter Adriaenssens
89c09ac7bc Translated using Weblate (Dutch) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-05 21:37:30 +01:00
Weblate
c0d90da42d Merge remote-tracking branch 'origin/master' 2015-03-05 21:18:19 +01:00
Macofe
3e479073a8 Translated using Weblate (Spanish) 
Currently translated at 99.2% (3008 of 3031 strings)

[CI skip]
 2015-03-05 21:18:16 +01:00
Douglas Rafael Morais Kollar
0c2c0cf925 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 97.9% (2970 of 3032 strings)

[CI skip]
 2015-03-05 21:18:13 +01:00
Marc Delisle
a7d32811b0 Merge branch 'QA_4_4' 2015-03-05 15:17:57 -05:00
Marc Delisle
128de539e5 Merge commit 'de5fbf5' 2015-03-05 15:17:47 -05:00
Weblate
07462151a5 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-05 21:17:23 +01:00
Macofe
d92d9fa9a6 Translated using Weblate (Spanish) 
Currently translated at 99.1% (3007 of 3032 strings)

[CI skip]
 2015-03-05 21:17:20 +01:00
Douglas Rafael Morais Kollar
b1c16eb6c1 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 97.9% (2971 of 3032 strings)

[CI skip]
 2015-03-05 21:17:17 +01:00
Marc Delisle
c3410b3e21 Merge branch 'QA_4_3' into QA_4_4 2015-03-05 15:16:55 -05:00
Marc Delisle
7ceeeb1fbe ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-05 15:16:17 -05:00
Marc Delisle
f1eb918780 Merge pull request #1542 from daniyalme/QA_4_3 
#4788 Inline edit of DATE fields with NULL
 2015-03-05 15:09:38 -05:00
Daniyal Shahid
b39933c37b Fix for #4788 
Signed-off-by: Daniyal Shahid daniyal36@gmail.com

Added a top margin to the datepicker after a certain window height so that null checkbox is visible
 2015-03-06 00:34:37 +05:00
Weblate
ab817cf1a9 Merge remote-tracking branch 'origin/master' 2015-03-05 15:34:03 +01:00
Douglas Rafael Morais Kollar
1e321b711e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 96.0% (2911 of 3032 strings)

[CI skip]
 2015-03-05 15:34:00 +01:00
Michal Čihař
2b23430475 Properly set default value for mysqli 
The port always should be integer.

See PR #1530

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-03-05 15:33:24 +01:00
Παναγιώτης Παπάζογλου
871b95ee96 Translated using Weblate (Greek) 
Currently translated at 100.0% (3031 of 3031 strings)

[CI skip]
 2015-03-05 14:40:45 +01:00
Παναγιώτης Παπάζογλου
de5fbf546a Translated using Weblate (Greek) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-05 14:39:53 +01:00
Weblate
f13aaa64f2 Merge remote-tracking branch 'origin/master' 2015-03-05 14:38:35 +01:00