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

97589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
f14766def9 Merge commit '0768e38' 2015-02-04 08:36:58 -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
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
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
Nisarg Jhaveri
89ae501a24 bug4743 Unable to move cursor in filter rows 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-02-02 01:26:54 +05:30
Weblate
9403be6983 Merge remote-tracking branch 'origin/master' 2015-02-01 07:08:20 +01:00
Domen
fd19a46c95 Translated using Weblate (Slovenian) 
Currently translated at 99.9% (3003 of 3005 strings)

[CI skip]
 2015-02-01 07:08:16 +01:00
Marc Delisle
1fd10cd114 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-01 07:07:53 +01:00
Marc Delisle
c0a03cac9f This code went dead when the corresponding library was moved to a class 
and because we stopped letting non-unique-key results being editable.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-31 13:31:29 +01:00
Madhura Jayaratne
3e8ec1d51b Align. Use caps 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 22:24:03 +05:30
Madhura Jayaratne
c2572487c1 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 22:21:43 +05:30
Weblate
6a45dfc6ec Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-30 17:48:32 +01:00
Madhura Jayaratne
dd66956d83 #4741 in ./libraries/Advisor.class.php#184 vsprintf(): Too few arguments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 22:18:32 +05:30
Martin Lacina
7fa462478b Translated using Weblate (Slovak) 
Currently translated at 83.7% (2495 of 2979 strings)

[CI skip]
 2015-01-30 17:48:29 +01:00
Marc Delisle
75fd862c79 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-30 15:49:20 +01:00
Marc Delisle
fba5c19ad8 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-30 20:58:59 +01:00
Madhura Jayaratne
2be7403799 Extend disabling foreign key check to row deletion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 15:57:11 +05:30
Madhura Jayaratne
47d6aea6a5 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 12:46:51 +05:30
Madhura Jayaratne
dc095da468 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 12:18:20 +05:30
Madhura Jayaratne
8352aeeca6 Fix po flle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 12:13:10 +05:30
Madhura Jayaratne
28d3f2a1fc rfe #1096 cannot enter connection for federated engine table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 12:08:51 +05:30
Madhura Jayaratne
e384f142f9 Fix po file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-30 10:12:37 +05:30
Madhura Jayaratne
714ddaca58 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-30 10:05:26 +05:30