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

8828 Commits

Author SHA1 Message Date
Marc Delisle
71c7af80b8 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-12 13:14:19 -05:00
Marc Delisle
5e765233cd Bug Undefined index DisableIS 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-12 13:07:09 -05:00
Madhura Jayaratne
4a90211202 rfe #1549 Reset auto-increment when exporting structure 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-12 16:16:51 +05:30
Madhura Jayaratne
b14e08d0b6 ChangeLog entry for d40a48ec39 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-12 16:13:56 +05:30
Madhura Jayaratne
2d19714b46 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-11 12:54:25 +05:30
Madhura Jayaratne
e1eae3b2d9 bug Add missing confirmation when deleting central columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-11 12:53:02 +05:30
Madhura Jayaratne
cfe3d68060 bug Add missing confirmation when deleting tracking report entries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-11 12:33:34 +05:30
Marc Delisle
a67bf25f46 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-10 12:54:42 -05:00
Marc Delisle
82c8bd83c2 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-10 09:22:25 -05:00
Madhura Jayaratne
7a9d9f4f14 rfe #1241 Browse Field -> Search. Also includes cleaning up of code related to the previous implementation at ade942bb09 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 16:08:19 +05:30
Madhura Jayaratne
a1cabbbf55 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 11:20:34 +05:30
Madhura Jayaratne
056fa2d7d2 Remove extra column heading in view structure page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 11:18:37 +05:30
Madhura Jayaratne
61afef3632 rfe #937 Relations with views like with tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 10:57:04 +05:30
Atul Pratap Singh
ae09513aef Merge branch 'QA_4_3' 2015-02-09 22:36:12 +05:30
Atul Pratap Singh
d171e778bc Changelog entry 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-02-09 22:21:28 +05:30
Marc Delisle
00ba48b701 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-09 10:31:52 -05:00
Marc Delisle
9270d08263 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-09 08:51:11 -05:00
Madhura Jayaratne
26dc919e68 rfe #1208 linking from information_schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-09 14:53:37 +05:30
Madhura Jayaratne
42419588e7 Merge branch 'master' into rfe1235 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-09 12:55:51 +05:30
Madhura Jayaratne
8403bd6c7e rfe #1235 Relation view: move to main "Structure" page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-09 12:07:43 +05:30
Marc Delisle
b6350a8cd7 Merge branch 'QA_4_3' 2015-02-07 08:18:54 -05:00
Marc Delisle
c4f87ea615 Bug Undefined index navwork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-07 08:18:15 -05:00
Marc Delisle
35132e852c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-06 07:58:53 -05:00
Madhura Jayaratne
6f9367b165 rfe #1192 ON DUPLICATE KEY UPDATE for loading CSV 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-06 14:54:34 +05:30
Madhura Jayaratne
553045794a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-06 11:25:06 +05:30
Madhura Jayaratne
76e3ec78c2 rfe #1179 Speed up slow triggers by using EVENT_OBJECT_SCHEMA 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-06 11:24:02 +05:30
Marc Delisle
9e9ed008dc 4.3.9 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-05 12:49:15 -05:00
Marc Delisle
8fdacd980b 4.3.10-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-05 12:47:54 -05:00
Madhura Jayaratne
cf33499f37 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-05 17:50:43 +05:30
Madhura Jayaratne
e4c35185a6 bug #4748 Column name center-aligned instead of left-aligned in Relations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-05 17:48:07 +05:30
Madhura Jayaratne
ac0fa7557f Merge branch 'QA_4_3' 2015-02-05 17:23:27 +05:30
Madhura Jayaratne
733e5430f0 bug #4750 Disable renaming referenced columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-05 17:21:44 +05:30
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
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
0744c5961f Merge branch 'QA_4_3' 2015-02-04 08:37:31 -05:00
Marc Delisle
c2a8f96a13 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-04 08:36:18 -05: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
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
Marc Delisle
50619593bd Bug Incorrect link in doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-03 08:00:48 -05:00
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
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
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
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
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
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