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

100744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Madhura Jayaratne
eb6607bbd7 Merge branch 'QA_4_4' 2015-07-02 08:24:50 +05:30
Madhura Jayaratne
626487f865 Remove character set from create_tables_drizzle.sql 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 08:19:24 +05:30
Marc Delisle
b18bda2e51 Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-01 07:57:12 -04:00
Isaac Bennetch
d9d25db53d Merge pull request #1769 from devenbansod/342_correction 
'As Separate files' export works with ZIP compression only
 2015-07-01 00:10:36 -04:00
Deven Bansod
2ff6d53b12 Fixed typos 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-01 13:46:23 +05:30
Marc Delisle
e093a33422 Merge branch 'QA_4_4' 2015-06-30 17:13:08 -04:00
Marc Delisle
d9043cac8c Merge commit 'b956fe7' 2015-06-30 17:13:00 -04:00
Weblate
498d5fc697 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-30 23:12:50 +02:00
Marc Delisle
777a8a00e1 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-06-30 23:12:47 +02:00
Stefano Martinelli
70eca3b6a7 Translated using Weblate (Italian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-06-30 23:12:44 +02:00
Yaron Shahrabani
593280fee5 Translated using Weblate (Hebrew) 
Currently translated at 19.0% (577 of 3035 strings)

[CI skip]
 2015-06-30 23:12:42 +02:00
Valter Georgiev
781f917faf Translated using Weblate (Bulgarian) 
Currently translated at 63.4% (1925 of 3035 strings)

[CI skip]
 2015-06-30 23:12:40 +02:00
Arben Çokaj
64698e7505 Translated using Weblate (Albanian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-06-30 23:12:38 +02:00
Marc Delisle
66b4be9b74 bug #4972 Incorrect length computed for binary data 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-30 17:12:23 -04:00
Deven Bansod
863c29bbe7 Separate file export works with ZIP only 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-01 02:10:12 +05:30
Weblate
fc855b37e2 Merge remote-tracking branch 'origin/master' 2015-06-30 20:21:24 +02:00
Yaron Shahrabani
1a1f6779c3 Translated using Weblate (Hebrew) 
Currently translated at 18.2% (572 of 3142 strings)

[CI skip]
 2015-06-30 20:21:20 +02:00
Marc Delisle
8d0d02bb35 Merge pull request #1770 from nisargjhaveri/fix_style 
Make Scrutinizer Happy
 2015-06-30 14:21:16 -04:00