gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,546 Commits 12 Branches 481 Tags 2.4 GiB
3363f10880
Commit Graph

328 Commits

Author SHA1 Message Date
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed" 
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:29:55 +05:30
Michal Čihař
2224e00c84 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-10-07 09:45:57 +02:00
Michal Čihař
1552d32830 Switch translation server to hosted Weblate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-10-02 10:38:59 +02:00
Chirayu Chiripal
b9996c5657 Give credits to GSoC 2014 students 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-10-01 23:23:32 +05:30
Chanaka Dharmarathna
7969336d04 rfe-1502 : Smart sorting for int keys 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-08-26 21:44:05 +05:30
Marc Delisle
639ce05d54 Add another situation to normalize 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-13 08:26:05 -04:00
Marc Delisle
1e25379a27 Merge pull request #1325 from ashutoshdhundhara/rfe_1492 
RFE#1492: Remove the distinct query window.
 2014-08-12 08:36:28 -04:00
Michal Čihař
098a2e6190 Merge remote-tracking branch 'origin/QA_4_2' 2014-08-12 11:06:44 +02:00
Michal Čihař
72fa800935 Remove link to withdrawn FAQ entry 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-08-12 11:06:27 +02:00
Michal Čihař
b7e45547fe Various documentation markup fixes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-08-12 10:40:09 +02:00
Michal Čihař
a2fca828e7 Merge commit '648c016422365f88d047d9bf82c23cb8b2be9210' 2014-08-12 10:17:12 +02:00
Michal Čihař
648c016422 Document Debian and Ubuntu differences 
The Debian package comes with patched documentation, but I think it's
better to cover this upstream as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-08-12 10:15:20 +02:00
Ashutosh Dhundhara
35dab58bf5 RFE#1492: Remove the distinct query window. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-12 01:47:20 +05:30
Marc Delisle
7e9fa77fa5 Improve message and doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-11 10:56:38 -04:00
Marc Delisle
ce4a0cc9da Merge pull request #1319 from ashutoshdhundhara/rfe_1123 
RFE#1123: Zeroconf PMA tables support.
 2014-08-11 10:27:36 -04:00
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-11 18:33:59 +05:30
Marc Delisle
50f43c607b Improve faq entries 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-10 17:13:52 -04:00
Smita Kumari
3c578850de documentation FAQ added for central columns and normalization 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-10 23:31:43 +05:30
Marc Delisle
02b7ee547e Add credits 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-08 07:56:28 -04:00
Ashutosh Dhundhara
b3583d4cba RFE#1491: Support InnoDB for database Query by example. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

FAQ entry should remain.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-04 23:55:53 +05:30
Marc Delisle
f0e1dd8406 Merge pull request #1104 from madhuracj/nav 
Add 'collapse all' and 'link with main panel' buttons to navigation
 2014-08-03 07:37:00 -04:00
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Marc Delisle
2d8860f9a9 4.2.8-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-31 06:55:23 -04:00
Madhura Jayaratne
dfe8dc283a Add 'collapse all' and 'link with main panel' buttons to navigation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-07-28 09:58:24 +05:30
Marc Delisle
be0d0f642f 4.2.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-17 18:08:17 -04:00
Hugues Peccatte
f7921607b0 Fix typo. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-07-16 22:18:25 +02:00
Chirayu Chiripal
0906f78fab Suggest ALTER rights on phpmyadmin for controluser 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-14 18:20:24 +05:30
Marc Delisle
c19cb1d480 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-12 17:28:41 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Michal Čihař
7089858ab0 Allow to use system phpseclib 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-07-08 16:29:54 +02:00
Isaac Bennetch
30d1b5845d * Consolidate README to eliminate some duplicate information 
* Editing README.rst to make it more friendly as our github home page
* Move third party license info to copyright file

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2014-07-02 21:01:25 -04:00
Marc Delisle
8453488a26 Merge commit '5b1fe4e' 2014-06-29 07:26:54 -04:00
Shivam Dixit
3f21378e4c Fix for bug 4027 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-29 07:14:39 -04:00
Marc Delisle
d8b3f9a766 4.2.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 10:01:48 -04:00
Marc Delisle
8ce1e316a6 Merge branch 'QA_4_2' 2014-06-26 09:58:01 -04:00
Marc Delisle
18e6cfd5c5 mcrypt: remove the requirement (64-bit) and the related warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 09:56:24 -04:00
Ashutosh Dhundhara
2a7cdbdb75 RFE#654: Range Search Capability. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-24 16:47:34 +05:30
Marc Delisle
aebfcfdc9f 4.2.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 08:47:51 -04:00
Madhura Jayaratne
521a77d8bd Merge pull request #1232 from kb-yashodha/multipages1 
Complete multipages functionality in designer
 2014-06-16 15:22:13 +05:30
Bimal Yashodha
48dd4f354d Remove references to designer_coords and designerwork 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 11:39:39 +05:30
Michal Čihař
234cfbf73f Document AES usage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
5f3b69908a Document that we are using AES for encryption 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
c6e76422c4 Allow to use system phpseclib 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:06:20 +02:00
Michal Čihař
96366ce7bc Remove no longer used caching configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 11:57:15 +02:00
Marc Delisle
199982f0d0 4.2.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-08 18:35:23 -04:00
Craig Duncan
17fd6b576a Dynamically detect an amazon rds instance 
This is to avoid more configuration options

Signed-off-by: Craig Duncan <git@duncanc.co.uk>
 2014-06-05 19:38:57 +01:00
Craig Duncan
812d1ce67d Allow processes to be killed on Amazon RDS 
The 'KILL' syntax isn't available but a procedure to do the same thing is
http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Appendix.MySQL.CommonDBATasks.html

Signed-off-by: Craig Duncan <git@duncanc.co.uk>
 2014-06-03 22:39:04 +01:00
Michal Čihař
d515cc4ca0 Merge remote-tracking branch 'origin/QA_4_2' 2014-05-30 09:16:30 +02:00
Michal Čihař
6c4cca7766 Do not try to localize sphinx extension 
- we do not (and can not) translate this anyway
- causes problems with older Sphinx versions

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-30 09:15:28 +02:00
Marc Delisle
acb348a4f6 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 12:54:41 -04:00