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

100767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
f8bd03cecc Merge branch 'QA_4_4' 2015-07-05 22:11:53 -04:00
Isaac Bennetch
937be53dc9 Merge branch 'fix_errors_docs' of https://github.com/devenbansod/phpmyadmin into QA_4_4 2015-07-05 22:11:09 -04:00
Marc Delisle
2c6f5e7efb This variable is needed for multiple db dropping 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-05 17:41:34 -04:00
Atul Pratap Singh
aba718f105 Merge pull request #1758 from gzzhanghao/controller 
WIP: Introduce Controllers
 2015-07-05 22:33:45 +05:30
Deven Bansod
ece5e60ab1 Fixed some spelling mistakes 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-05 19:59:31 +05:30
Marc Delisle
3a92a2812e Merge branch 'QA_4_4' 2015-07-05 06:42:22 -04:00
Marc Delisle
6d4aac0853 bug #4844 FAQ 1.17 needs an update 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-05 06:41:48 -04:00
Marc Delisle
6365442c5e Merge branch 'QA_4_4' 2015-07-04 07:25:06 -04:00
Marc Delisle
ee650720cb bug #4974 Creating a database from console doesn't update navigation panel 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-04 07:24:39 -04:00
Marc Delisle
4a05b4265e Fix code execution path 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-04 06:40:49 -04:00
dingo thirteen
fb71cfa18d Translated using Weblate (Dutch) 
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
 2015-07-04 11:08:08 +02:00
Isaac Bennetch
6fc448b967 Merge pull request #1772 from devenbansod/657Correction 
Improvements to Adjust Privileges RFE #657; disables the checkbox when a user lacks sufficient privileges.
 2015-07-03 11:13:56 -04:00
Jason
d1e2c58ee4 Test & fix TableGisVisualizationController 
Also fix typos in controllers.

Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-03 23:04:19 +08:00
Marc Delisle
d0e2df0e42 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-03 06:30:45 -04:00
Madhura Jayaratne
42a4088943 More local variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 22:52:09 +05:30
Madhura Jayaratne
30418f37a3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-02 22:29:17 +05:30
Madhura Jayaratne
3e9b97ef6c These are local variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 22:27:46 +05:30
Marc Delisle
135289ca25 Merge pull request #1773 from nisargjhaveri/tests 
Fix tests, use proxy settings from env
 2015-07-02 12:50:06 -04:00
Madhura Jayaratne
89b75b3a4e Remove dead code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:56:11 +05:30
Madhura Jayaratne
81bd7f38af More local variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:55:42 +05:30
Madhura Jayaratne
319611a1c6 These are all local variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:52:01 +05:30
Madhura Jayaratne
5d61cde487 Fix variable scope 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:49:40 +05:30
Madhura Jayaratne
8130247f03 Fix more implicitly declared variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:44:36 +05:30
Madhura Jayaratne
fe521b8586 Spaces around + operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:35:27 +05:30
Madhura Jayaratne
84bff8e21f Fix implicitly declared variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:27:07 +05:30
Jason
3a6f70cd23 Refine tbl_columns_definition_form.inc.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-02 22:51:02 +08:00
Madhura Jayaratne
51d789c80f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-02 20:11:49 +05:30
Madhura Jayaratne
bbd58f36cb Variable 'l' implicitly declared. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:10:28 +05:30
Nisarg Jhaveri
0c704996fa Fix tests, use proxy settings from env 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-02 20:08:03 +05:30
Michal Čihař
0ef3f23e56 Revert "Do not skip SSL verification" 
This reverts commit 1a316a6986.

Unfortunately this seems to fail on Travis and probably on some users as
well...
 2015-07-02 16:37:02 +02:00
Madhura Jayaratne
c44db2e2a1 Variable 'selectionBox' implicitly declared. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:06:06 +05:30
Michal Čihař
1a316a6986 Do not skip SSL verification 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 16:33:32 +02:00
Michal Čihař
5a5ceecee5 Simplify CURL request processing 
We do not have to reinvent wheel by parsing HTTP response, CURL can do
it for us.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 16:29:43 +02:00
Michal Čihař
00bfb4d596 Remove no longer needed parameter from upload-release script 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 16:18:17 +02:00
Marc Delisle
288841c05c Complete instructions about the keyring 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-02 09:46:31 -04:00
Michal Čihař
2abc91fe43 Add link to download signing keyring 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 14:42:14 +02:00
Marc Delisle
d67cd792c2 We no longer upload to SourceForge 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-02 07:55:38 -04:00
Michal Čihař
b39cb1cb81 Merge remote-tracking branch 'origin/QA_4_4' 2015-07-02 13:40:23 +02:00
Michal Čihař
4404f28d4b Replace some links to sourceforge.net with our website 
- donations are no longer processed by sf.net
- support forums are disabled for years, point users to support page

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 13:39:15 +02:00
Michal Čihař
a6fd4c2ed4 Cleanup URLs to our website 
- use https everywhere
- follow redirects on renamed pages

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 13:39:10 +02:00
Marc Delisle
974161ef8a Merge branch 'QA_4_4' 2015-07-02 06:14:33 -04:00
Marc Delisle
069d6d9eb3 bug #4973 Users overview needs clarification 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-02 06:13:58 -04:00
Michal Čihař
27e3963840 Update releasing instructions to new code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 11:29:48 +02:00
Michal Čihař
3ae994d830 Use case insensitive header comparing 
Maybe we should not compare the text part at all, but let's keep it this
way for now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 09:32:32 +02:00
Michal Čihař
d7682c05e5 Merge branch 'gpg-doc' 2015-07-02 08:35:17 +02:00
Madhura Jayaratne
22e006fd0d Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 12:04:39 +05:30
Michal Čihař
2b321b5053 Fix link 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 08:34:39 +02:00
Madhura Jayaratne
d9afffb089 Remove configuration storage data related to a user upon deleting the user 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 11:52:13 +05:30
Madhura Jayaratne
9d4850c974 Syntax highlight settings_data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 08:33:58 +05:30
Madhura Jayaratne
29e29757c6 Remove more character set specifications 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 08:26:04 +05:30