gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,608 Commits 12 Branches 481 Tags 2.4 GiB
0db22c044f
Commit Graph

97608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nisarg Jhaveri
0db22c044f Translated using Weblate (Hindi) 
Currently translated at 42.0% (1266 of 3009 strings)

[CI skip]
 2015-02-05 12:17:05 +01:00
Kristjan Räts
bcd02d4b68 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3009 of 3009 strings)

[CI skip]
 2015-02-05 08:31:48 +01:00
dingo thirteen
4fb44cc137 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3009 of 3009 strings)

[CI skip]
 2015-02-04 20:30:50 +01:00
Burak Yavuz
13d1c0dacd Translated using Weblate (Turkish) 
Currently translated at 100.0% (3009 of 3009 strings)

[CI skip]
 2015-02-04 20:01:05 +01:00
Marc Delisle
ae8b5308c8 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-04 11:32:22 -05:00
Marc Delisle
b83cdcd4ae Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-04 11:30:41 -05:00
Marc Delisle
a9729f46cb ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-04 11:24:53 -05:00
Marc Delisle
ff3ab2bfce Merge pull request #1479 from gzzhanghao/master 
Fix isCanvasSupported for new window
 2015-02-04 11:23:47 -05:00
Nisarg Jhaveri
ad84a3fe28 Clarify the "Inline" link, rfe_1600 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-02-04 21:43:41 +05:30
Marc Delisle
447862cdf1 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-04 10:54:47 -05:00
Marc Delisle
3039087487 jQuery.browser() has been removed in 1.9 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-04 08:52:09 -05:00
Marc Delisle
0744c5961f Merge branch 'QA_4_3' 2015-02-04 08:37:31 -05:00
Marc Delisle
5ba6b6098a Merge commit 'df5629d' 2015-02-04 08:37:23 -05:00
Marc Delisle
f14766def9 Merge commit '0768e38' 2015-02-04 08:36:58 -05:00
Marc Delisle
c2a8f96a13 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-04 08:36:18 -05:00
Marc Delisle
3de60b4542 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-04 08:34:48 -05:00
Marc Delisle
5f13ce0948 Merge pull request #1473 from whitepiegon/QA_4_3_Bug1 
bugs#3935 Table Header issue in Safari 5.0.5
 2015-02-04 08:31:53 -05:00
Weblate
5b9d0e0249 Merge remote-tracking branch 'origin/master' 2015-02-04 10:49:17 +01:00
Jorge Famma Tinoco Gomez
229541e2d1 Translated using Weblate (Spanish) 
Currently translated at 99.2% (2981 of 3004 strings)

[CI skip]
 2015-02-04 10:49:14 +01:00
Madhura Jayaratne
1006aedb28 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-04 15:17:55 +05:30
Weblate
df5629dae1 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-02-04 10:44:46 +01:00
Jorge Famma Tinoco Gomez
6fe81b4260 Translated using Weblate (Spanish) 
Currently translated at 99.8% (2976 of 2979 strings)

[CI skip]
 2015-02-04 10:44:43 +01:00
Madhura Jayaratne
677da2906c bug #4706 Schema export doesn't handle dots in db/table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-04 15:11:05 +05:30
Madhura Jayaratne
01cd2c17fc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-04 12:54:24 +05:30
Madhura Jayaratne
68b03bb857 Make the order consistent 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-04 12:53:24 +05:30
Madhura Jayaratne
a621b89a74 Add a separate section for view related trackings 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-04 12:51:26 +05:30
Madhura Jayaratne
08ba93f9ba Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-04 12:44:53 +05:30
Weblate
32d3b35df8 Merge remote-tracking branch 'origin/master' 2015-02-04 08:14:42 +01:00
Ahmed Saad
afaf83cbb5 Translated using Weblate (Arabic) 
Currently translated at 36.9% (1109 of 3005 strings)

[CI skip]
 2015-02-04 08:14:39 +01:00
Madhura Jayaratne
e125a7711e Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-04 12:44:03 +05:30
Madhura Jayaratne
4e3cb71a4c bug #4745 Tracking does not handle views properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-04 12:38:43 +05:30
Weblate
62f4802ef8 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-02-04 08:08:36 +01:00
Ahmed Saad
b46e6b5351 Translated using Weblate (Arabic) 
Currently translated at 37.3% (1112 of 2981 strings)

[CI skip]
 2015-02-04 08:08:32 +01:00
Zhang Hao
64e3c46ad1 Fix isCanvasSupported for new window 
Signed-off-by: Zhang Hao <jason.daurus@gmail.com>
 2015-02-04 09:44:22 +08:00
Weblate
df74705601 Merge remote-tracking branch 'origin/master' 2015-02-03 14:04:04 +01:00
Domen
4ba533e210 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3005 of 3005 strings)

[CI skip]
 2015-02-03 14:04:00 +01:00
Marc Delisle
d9769bb6aa Merge branch 'QA_4_3' 2015-02-03 08:02:16 -05:00
Marc Delisle
50619593bd Bug Incorrect link in doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-03 08:00:48 -05:00
Ann + J.M
8af73f3e10 Translated using Weblate (German) 
Currently translated at 100.0% (3002 of 3002 strings)

[CI skip]
 2015-02-03 10:43:18 +01:00
Domen
3fbefa6692 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3005 of 3005 strings)

[CI skip]
 2015-02-03 00:28:31 +01:00
Madhura Jayaratne
3e05148ad6 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-02 18:12:25 +05:30
Madhura Jayaratne
77d66242e4 Transformation for JSON 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-02 17:51:23 +05:30
Madhura Jayaratne
0ad24870e6 rfe #1260 Setting LoginCookieValidity > session.gc_maxlifetime 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-02 16:13:50 +05:30
Madhura Jayaratne
f8f05f36f7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-02 12:28:26 +05:30
Madhura Jayaratne
be237a7b51 rfe #954 Allow SALT in ENCRYPT function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-02 12:26:47 +05:30
Aayush
0768e38508 bugs#3935 Table Header issue in Safari 5.0.5 
Signed-off-by: Aayush Anand aayushism12@gmail.com
 2015-02-02 11:54:22 +05:30
Marc Delisle
be03cb3f27 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-02 06:25:37 +01:00
Marc Delisle
41d168afe2 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-02 05:50:25 +01:00
Madhura Jayaratne
2607b66a37 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-02 09:32:16 +05:30
Madhura Jayaratne
e874cafeb1 Merge pull request #1472 from nisargjhaveri/QA_4_3 
bug4743 Unable to move cursor in filter rows
 2015-02-02 09:27:21 +05:30