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

8677 Commits

Author SHA1 Message Date
Madhura Jayaratne
245e730f56 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 10:53:42 +05:30
Madhura Jayaratne
99aad2c118 bug #4685 Call to a member function isUserType() on a non-object 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 10:49:33 +05:30
Marc Delisle
5091f04058 Merge branch 'QA_4_3' 2015-01-06 14:18:45 -05:00
Marc Delisle
235d5f47f8 bug #4689 Setup tool creates "pma__favorites" incorrectly 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-06 14:17:12 -05:00
Madhura Jayaratne
80121c47c9 Merge branch 'QA_4_3' 2015-01-06 15:32:56 +05:30
Madhura Jayaratne
9829c7662a bug #4686 Select elements flicker and selects something else 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 15:31:31 +05:30
Madhura Jayaratne
b9b42270a5 Merge branch 'QA_4_3' 2015-01-06 14:29:44 +05:30
Madhura Jayaratne
ba4dd00f88 bug #4687 Designer breaks without configuration storage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 14:26:54 +05:30
Madhura Jayaratne
a65e7fb0fc Undefined index notices while configuring recent and favorite tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 13:14:46 +05:30
Marc Delisle
5f815f4844 4.3.5 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:16:52 -05:00
Marc Delisle
7562aadc40 4.3.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:15:22 -05:00
Marc Delisle
495250f8cb Merge branch 'QA_4_3' 2015-01-04 15:34:42 -05:00
Marc Delisle
440afe2423 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-04 15:33:45 -05:00
Marc Delisle
56baec6160 Merge branch 'QA_4_3' 2015-01-04 07:35:26 -05:00
Marc Delisle
459f1a6c16 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-04 07:34:46 -05:00
Marc Delisle
6eb92ff103 Merge commit 'fc6be4a' 2015-01-04 07:11:47 -05:00
Hugues Peccatte
fc6be4a7bd Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:42:32 +01:00
Marc Delisle
423a8f9d49 Merge branch 'QA_4_3' 2015-01-02 09:33:58 -05:00
Marc Delisle
d95356e1dd bug #4655 Undefined index: collation_connection (second patch) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-02 09:32:19 -05:00
Madhura Jayaratne
4560998549 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 15:53:48 +05:30
Madhura Jayaratne
a7db400145 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 15:48:05 +05:30
Madhura Jayaratne
6b85f72604 bug #4683 Relational data is not properly updated on table rename 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 15:35:42 +05:30
Marc Delisle
79974aa6ac Merge commit 'c69cf0b' 2015-01-01 10:46:26 -05:00
Marc Delisle
c69cf0b74d Based on http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci, changed the default connection collation 
to improve sort accuracy.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-01 10:42:44 -05:00
Marc Delisle
a11c2567de Remove entries from 2014 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-01 07:44:23 -05:00
Marc Delisle
ff48b628c8 Remove entries from 2014 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-01 07:42:36 -05:00
Madhura Jayaratne
08a352d469 Merge branch 'QA_4_3' 2015-01-01 11:17:05 +05:30
Madhura Jayaratne
3bd84ee7d3 bug #4681 'Central columns table' field in setup does not have a description 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-01 11:14:05 +05:30
Madhura Jayaratne
5addde6c17 Merge branch 'QA_4_3' 2015-01-01 11:03:52 +05:30
Madhura Jayaratne
8999bc6c65 bug #4680 Number of favorite table are not configurable in setup 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-01 11:00:48 +05:30
Madhura Jayaratne
a48e2efd6d Merge branch 'QA_4_3' 2014-12-31 18:07:15 +05:30
Madhura Jayaratne
9d2880a1c5 bug #4679 Setup does not allow providing a name for favorites table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-31 17:57:29 +05:30
Madhura Jayaratne
e13be0489f Merge branch 'QA_4_3' 2014-12-31 17:21:34 +05:30
Madhura Jayaratne
19583d8013 bug #4678 Some of the data stored in configuration storage are not deleted upon db or table delete 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-31 17:18:08 +05:30
Madhura Jayaratne
74735140bd Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-31 16:25:27 +05:30
Madhura Jayaratne
44647b7eb6 bug #4677 Advanced feature checker does not check for favorite tables feature 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-31 16:09:49 +05:30
Madhura Jayaratne
1b87db5724 bug #4675 phpMyAdmin should be able to work without 'examples' DIR - move SQL scripts to sql directory 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-30 22:55:33 +05:30
Marc Delisle
7a34a1d8de Merge branch 'QA_4_3' 2014-12-30 11:47:38 -05:00
Marc Delisle
e30d15d3b8 Bug in Auto-configuration: tables were not created automatically 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-30 11:46:48 -05:00
Madhura Jayaratne
78fde19a35 ChangeLog entry for fc5bd53eba 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-30 19:27:33 +05:30
Madhura Jayaratne
f6a19c79cb Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-30 18:38:41 +05:30
Madhura Jayaratne
cd249f1cbe rfe #1572 User prefs: Diff-friendly JSON for config 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-30 18:36:51 +05:30
Marc Delisle
ce0763f2eb 4.3.4 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-29 07:07:52 -05:00
Marc Delisle
bbebf89ad2 4.3.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-29 07:06:01 -05:00
Marc Delisle
60a8d33ab5 Merge branch 'QA_4_3' 2014-12-28 06:18:56 -05:00
Hugues Peccatte
70985f197c Update ChangeLog 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-27 20:11:27 +01:00
Marc Delisle
4e8737ff2c Merge branch 'QA_4_3' 2014-12-26 08:29:32 -05:00
Marc Delisle
38bb19ffb6 bug #4655 Undefined index: collation_connection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-26 08:29:09 -05:00
Marc Delisle
7694043514 Merge branch 'QA_4_3' 2014-12-25 07:48:04 -05:00
Marc Delisle
462428570e bug #4658 Illegal string offset (Data_length, Index_length) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-25 07:47:20 -05:00