gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,408 Commits 12 Branches 481 Tags 2.4 GiB
93db7fac2d
Commit Graph

90408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
93db7fac2d Merge commit 'd2dbe10' 2014-03-02 09:41:13 -05:00
Marc Delisle
b50ed1aac4 Merge commit '65e24c0' 2014-03-02 09:41:02 -05:00
Marc Delisle
8c795aede7 Merge commit '089b382' 2014-03-02 09:40:49 -05:00
Atul Pratap Singh
872e4d039b Merge branch 'QA_4_1' 2014-03-03 01:33:29 +05:30
Atul Pratap Singh
15539d4d7d Fix bugs#4302: Some params are being omitted from microhistory 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-02 23:48:37 +05:30
Atul Pratap Singh
c98b4a1d17 Merge pull request #985 from vpowerrc/master 
fixed #4300 Grid edit textfield: can't place cursor or select text with ...
 2014-03-02 19:57:46 +05:30
Smita Kumari
d2dbe10b5a unbinding keyup event 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-02 18:44:05 +05:30
Weblate
043a007c66 Merge remote-tracking branch 'origin/master' 2014-03-02 13:42:46 +01:00
Anders Jonsson
79cdc9ebe1 Translated using Weblate (Swedish) 
Currently translated at 99.5% (2739 of 2752)
 2014-03-02 13:42:42 +01:00
Marc Delisle
db3857ef7a Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-02 07:40:00 -05:00
Viduranga Wijesooriya
820bd6ad6e fixed #4300 Grid edit textfield: can't place cursor or select text with mouse 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-03-02 14:48:50 +05:30
Atul Pratap Singh
c50e0a22d9 Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-03-01 23:51:23 +05:30
Atul Pratap Singh
54ee8faa96 Fix error reports 974/1833: cannot call method on tooltip 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-01 23:36:45 +05:30
Atul Pratap Singh
987ab29858 Fix error reports 477/1573/1604: unrecognized expression: input:checkbox 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-01 23:22:05 +05:30
Hugues Peccatte
b006fd0349 Add fix #4304 in ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-01 15:23:08 +01:00
Atul Pratap Singh
69e504ccf8 Fix error reports 1678/1757 chartObj.chart.series[j].setData is not a function 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-01 19:01:25 +05:30
Hugues Peccatte
0cc2d39b3d Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-03-01 14:28:18 +01:00
Hugues Peccatte
9fb69a229f Merge branch 'fixExport' 2014-03-01 14:27:36 +01:00
Marc Delisle
a546378175 Merge branch 'QA_4_1' 2014-03-01 07:44:24 -05:00
Marc Delisle
58f0552e31 bug #4303 "New" link in navi panel is shown even if no privileges 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-01 07:42:53 -05:00
Marc Delisle
da773f5be5 Merge pull request #978 from Dennis1993/master 
No space between attribute #2
 2014-03-01 07:23:33 -05:00
Weblate
1ed0ef5038 Merge remote-tracking branch 'origin/master' 2014-03-01 13:21:38 +01:00
Anders Jonsson
16a958de97 Translated using Weblate (Swedish) 
Currently translated at 99.4% (2737 of 2752)
 2014-03-01 13:21:35 +01:00
Marc Delisle
6c2e46d6c7 Merge pull request #974 from WhaleWatching/fix_jqplot 
Fix jqplot display
 2014-03-01 07:21:30 -05:00
Hugues Peccatte
dcfe93a888 Minor PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-28 22:09:48 +01:00
Hugues Peccatte
1b13ecac80 Fix use of a missing variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-28 22:07:52 +01:00
Marc Delisle
1fc31bb57b Merge branch 'QA_4_1' 2014-02-28 15:16:10 -05:00
Marc Delisle
35a61a4052 Merge commit '9b7fccd' 2014-02-28 15:16:04 -05:00
Marc Delisle
d808194e2d Merge commit '5f93f45' 2014-02-28 15:15:31 -05:00
Marc Delisle
46b3419977 Merge commit '431c2ad' 2014-02-28 15:15:19 -05:00
Marc Delisle
93578eb963 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-28 15:14:36 -05:00
Weblate
9b7fccd1c3 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-28 21:11:54 +01:00
Matías Bellone
72d11b7a7c Translated using Weblate (Spanish) 
Currently translated at 100.0% (2749 of 2749)
 2014-02-28 21:11:51 +01:00
Marc Delisle
94cb1e11f8 Merge pull request #976 from sampathLiyanage/bugfixdbsearch 
DB Search bug fix #4299
 2014-02-28 15:11:48 -05:00
Dennis1993
bda2da60aa No space between attribute 
Signed-off-by: Marvin Wegener <mw197@web.de>
 2014-02-28 19:56:53 +01:00
Sampath Liyanage
5f93f45c04 test failure fixed 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-03-01 00:15:08 +05:30
Domen
aab02e867e Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-28 19:44:17 +01:00
Marc Delisle
3aad41c407 Merge pull request #977 from Dennis1993/master 
No space between attributes
 2014-02-28 12:56:15 -05:00
Dennis1993
a9ccbe9021 No space between attributes 
Signed-off-by: Marvin Wegener <mw197@web.de>
 2014-02-28 18:45:16 +01:00
Michal Čihař
05d1f0344b Should wait for login page before doing login 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-28 10:44:19 +01:00
Weblate
204728cdfe Merge remote-tracking branch 'origin/master' 2014-02-28 08:52:23 +01:00
Burak Yavuz
51676fa88a Translated using Weblate (Turkish) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-28 08:52:20 +01:00
Michal Čihař
2bacdef4f4 Drop non js behavior of export chooser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-28 08:51:58 +01:00
Michal Čihař
d9eccfa988 Increase timeout for javascript 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-28 08:43:53 +01:00
Sampath Liyanage
431c2ad5d8 DB Search bug fix 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-02-28 01:50:33 +05:30
Burak Yavuz
39eb75c4fd Translated using Weblate (Turkish) 
Currently translated at 100.0% (2752 of 2752)
 2014-02-27 20:08:15 +01:00
Marc Delisle
44b3c01aed Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-02-27 13:00:46 -05:00
Marc Delisle
8a419f4ccf ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-27 13:00:35 -05:00
Weblate
30cc87b2b0 Merge remote-tracking branch 'origin/master' 2014-02-27 18:58:40 +01:00
Burak Yavuz
82ba32aec1 Translated using Weblate (Turkish) 
Currently translated at 99.6% (2743 of 2752)
 2014-02-27 18:58:37 +01:00