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

9522 Commits

Author SHA1 Message Date
Marc Delisle
e4e991d3fc Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 21:10:28 -04:00
Madhura Jayaratne
05c22016ee Fix cookies clearing on version change 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-10 08:26:40 +11:00
Madhura Jayaratne
a72e65e31e Merge branch 'QA_4_5' 
Conflicts:
	js/messages.php
 2015-10-09 10:10:14 +11:00
Madhura Jayaratne
cc4c615720 Fix #11548 Confirm box on "Reset slave" option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-09 10:06:49 +11:00
Madhura Jayaratne
bf22e3c492 Merge branch 'QA_4_5' 2015-10-08 19:15:35 +11:00
Madhura Jayaratne
5e7a8fac43 Fix #11546 "Visualize GIS data" seems to be broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-08 19:09:33 +11:00
Marc Delisle
621825fadd Merge branch 'QA_4_5' 2015-10-06 16:43:39 -04:00
Marc Delisle
ee958f08cb ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-06 16:42:47 -04:00
Marc Delisle
64758a0c82 Merge commit 'f830b07' 2015-10-06 07:31:38 -04:00
Marc Delisle
8e81b91372 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-06 07:28:47 -04:00
Madhura Jayaratne
dab71427cd Tracking does not make sense for information_schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 20:58:32 +11:00
Madhura Jayaratne
1411ffaaef Merge branch 'QA_4_5' 2015-10-06 20:39:59 +11:00
Madhura Jayaratne
558e6be76e ChangeLog entry for issue #11544 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 20:34:42 +11:00
Marc Delisle
be17cf15cb Merge branch 'QA_4_5' 2015-10-05 18:19:34 -04:00
Marc Delisle
ed8ba7b3d7 Fixes #11541 Missing arguments for PMA_Table::generateAlter() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-05 18:18:55 -04:00
Madhura Jayaratne
20974c6ae5 Merge branch 'QA_4_5' 2015-10-06 07:42:11 +11:00
Madhura Jayaratne
f2ef8fb770 ChangeLog for #11539 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 07:40:33 +11:00
Madhura Jayaratne
3c8ee7c5f8 Fix #11522 Strange behavior on table rename 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-05 20:50:55 +11:00
Madhura Jayaratne
5eef3a9b60 Merge branch 'QA_4_5' 2015-10-03 22:50:59 +10:00
Madhura Jayaratne
4633d2458f ChangeLog entry for issue #11519 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-03 22:48:10 +10:00
Madhura Jayaratne
5d2fa0d91b Merge branch 'QA_4_5' 2015-10-03 22:20:06 +10:00
Madhura Jayaratne
b41ab56e3b Fix #11526 Foreign key to other database's tables fails 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-03 22:14:49 +10:00
Marc Delisle
b77c874db6 Merge branch 'QA_4_5' 2015-10-02 13:26:28 -04:00
Marc Delisle
33f1fe5bd9 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-02 13:26:03 -04:00
Marc Delisle
75acdb1344 Merge branch 'QA_4_5' 2015-10-01 11:29:29 -04:00
Marc Delisle
3df771238e Fixes #11524 Yellow star does not change in database Structure after add/remove from favorites 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-01 11:28:29 -04:00
Marc Delisle
d951b9d133 Merge branch 'QA_4_5' 2015-10-01 09:49:52 -04:00
Marc Delisle
67eb366ce3 ChangeLog entries 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-01 09:49:25 -04:00
Madhura Jayaratne
a01b472642 Merge branch 'QA_4_5' 2015-10-01 06:10:48 +10:00
Madhura Jayaratne
50c34261e3 #11521 Notice of undefined variable when performing SHOW CREATE 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-01 06:08:11 +10:00
Marc Delisle
cadc93a76f ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-30 13:30:23 -04:00
Marc Delisle
6dbdceef21 Add type definition for JSON 
Add ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-30 08:01:34 -04:00
Madhura Jayaratne
015eb63166 Merge branch 'QA_4_5' 2015-09-30 21:12:15 +10:00
Madhura Jayaratne
6adb719b3f Fix #11516 Some partitions are missing in copied table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-30 21:03:25 +10:00
Marc Delisle
bf064db193 Merge branch 'QA_4_5' 2015-09-29 05:18:01 -04:00
Marc Delisle
5c51536560 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-29 05:16:41 -04:00
Marc Delisle
54c08f8de8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-28 09:46:18 -04:00
Madhura Jayaratne
b6c6695f9b fix bug Notice in Structure page of views 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-28 16:52:32 +10:00
Madhura Jayaratne
2e402b8e35 Hide Insert tab for non-updatable views 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-28 16:49:43 +10:00
Madhura Jayaratne
f0d678a673 fix bug Notice in Structure page of views 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-28 16:24:01 +10:00
Marc Delisle
50d1c4f950 Merge branch 'QA_4_5' 2015-09-27 08:52:34 -04:00
Marc Delisle
3bc822d626 Fixes #11505 Notice on htmlspecialchars() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-27 08:52:07 -04:00
Marc Delisle
62859dffbc Merge branch 'QA_4_5' 2015-09-25 13:49:36 -04:00
Marc Delisle
a8e66a5853 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 13:44:50 -04:00
Marc Delisle
0c361f5ca5 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:22:31 -04:00
Marc Delisle
ac33a96ba8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:17:04 -04:00
Marc Delisle
440aaaacae ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:15:22 -04:00
Madhura Jayaratne
7c325469d5 Fix #11490 UI for defining partitioning in create table window 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-25 14:44:28 +10:00
Marc Delisle
a9b022701b Merge branch 'QA_4_5' 2015-09-24 09:47:43 -04:00
Marc Delisle
a7836067db Fixes #11496 Incorrect definition for getTablesWhenOpen() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 09:46:54 -04:00