Commit Graph

241 Commits

Author SHA1 Message Date
Isaac Bennetch
cdb25a1e9e Documentation improvements
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2014-02-11 14:19:13 -05:00
Marc Delisle
379f8b6704 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:53:00 -05:00
Marc Delisle
144e00e5da bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:39:42 -05:00
Marc Delisle
d9a9a9195d 4.1.5-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-07 10:08:05 -05:00
Marc Delisle
da292cbd06 4.1.4-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-31 05:44:36 -05:00
Marc Delisle
ccea1d456e 4.1.3-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-23 08:17:16 -05:00
J.M
e49cb98936 Merge branch 'QA_4_1'
Signed-off-by: J.M <me@mynetx.net>
2013-12-22 20:24:19 +01:00
J.M
165bf9325a rfe #1465 Docs for connecting IPv6 only instances
Signed-off-by: J.M <me@mynetx.net>
2013-12-22 20:20:58 +01:00
Marc Delisle
c8d0dd6860 Merge branch 'QA_4_1' 2013-12-22 12:28:42 -05:00
Marc Delisle
33aaca7bc8 New FAQ entry, see bug #4174
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-22 12:28:02 -05:00
Marc Delisle
60b063116a 4.1.2-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-17 05:52:54 -05:00
Marc Delisle
2a8962aa95 Signed-off-by: Marc Delisle <marc@infomarc.info>
Added warning about the mysql extension being deprecated
and removed the extension directive
2013-12-14 14:26:12 -05:00
Marc Delisle
d31e966a43 4.1.1-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-08 06:25:11 -05:00
Marc Delisle
d67204c664 4.1.0-rc3
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-07 07:36:38 -05:00
Marc Delisle
63b1af983f Make the choices similar to other directives
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-05 13:27:54 -05:00
Chanaka Indrajith
30522c8d5f Rename the global variable from row_action_type to RowActionType
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2013-12-05 23:31:50 +05:30
Chanaka Indrajith
113f8f490e Feature 1455 - Display image,text or both in table row actions area
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2013-12-04 23:59:08 +05:30
Marc Delisle
10293081e8 Merge branch 'QA_4_1' 2013-12-02 13:02:29 -05:00
Marc Delisle
c4f008b6cf bug #4119 Huge session data with ['Error_Handler']['gather'] 2013-12-02 13:00:51 -05:00
Marc Delisle
35ab010a46 4.1.0-rc2 2013-11-30 08:12:31 -05:00
Marc Delisle
7aa96075fa Merge branch 'QA_4_1' 2013-11-28 12:40:37 -05:00
Marc Delisle
a65be4fef8 Complete the list of credits for GSoC 2013 2013-11-28 12:39:58 -05:00
Marc Delisle
bc08e1c0d0 Merge branch 'QA_4_1' 2013-11-25 08:10:57 -05:00
Marc Delisle
39e044d795 Fix merge conflicts 2013-11-25 08:09:54 -05:00
Marc Delisle
975870337b - bug #4163 Setup script does not recognize manually-configured server
- Improve English
2013-11-25 08:06:54 -05:00
Marc Delisle
93ca0a0b82 Merge branch 'QA_4_1' 2013-11-24 06:59:55 -05:00
Marc Delisle
d34e84e75c Move the MaxNavigationItems directive to the Navigation panel section (doc and default config) 2013-11-24 06:59:19 -05:00
Marc Delisle
54527b9634 4.2.0-dev starts 2013-11-23 06:32:35 -05:00
Marc Delisle
96417c4404 4.1.0-rc1 2013-11-23 06:29:04 -05:00
Marc Delisle
ebc5e9a5c7 We do not need a separate ErrorReporting directive 2013-11-20 06:14:53 -05:00
Marc Delisle
15bbe72ca2 Clarify the reason for having two directives (ErrorReporting and SendErrorReports) 2013-11-19 07:14:18 -05:00
Marc Delisle
0c9af2dc1e Improve English 2013-11-16 09:04:25 -05:00
Marc Delisle
85ea82a409 Remove the ShowDatabasesCommand directive 2013-11-06 12:47:27 -05:00
Marc Delisle
87ffbfbee1 GSoC 2013 credits for students mentored by Marc 2013-11-06 06:55:36 -05:00
Marc Delisle
d8fd82a9f5 The DisableIS directive is removed 2013-11-05 12:44:04 -05:00
Marc Delisle
869c1847c2 4.1.0-beta2 2013-11-04 14:58:04 -05:00
Michal Čihař
399fd56504 Add some credits for website as requested by Tony 2013-11-04 10:11:16 +01:00
Marc Delisle
b6bacea337 Start the changes for the new minimum MySQL version 2013-10-31 12:57:39 -04:00
Marc Delisle
43b8d377d7 4.0.10-dev 2013-10-31 12:17:31 -04:00
Marc Delisle
58d2b68afe 4.1.0-beta1 2013-10-16 12:16:44 -04:00
Marc Delisle
ce28d6e901 Fix typo 2013-10-16 06:34:33 -04:00
Marc Delisle
850cfad723 4.1.0-alpha2 2013-10-04 05:36:44 -04:00
Marc Delisle
385e3274be 4.0.9-dev 2013-10-02 06:14:02 -04:00
Marc Delisle
c1f0afecdf 4.1.0-alpha1 2013-10-01 05:39:36 -04:00
Mohamed Ashraf
a2659d7ba5 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
2013-09-29 23:13:05 +02:00
Michal Čihař
017e387048 Link to existing page on Wikipedia 2013-09-25 16:32:27 +02:00
Michal Čihař
8d26080f46 Remove not needed of 2013-09-25 15:28:33 +02:00
Michal Čihař
c7dab76355 Add link to wiki 2013-09-25 15:04:08 +02:00
Michal Čihař
66427dd542 Mention XAMMP as easy way to install on Windows 2013-09-25 15:04:08 +02:00
Michal Čihař
c4763baaff Incorporate distro specific docs from website 2013-09-25 15:04:08 +02:00