makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 05:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
25617 commits 18 branches 192 tags 207 MiB
Commit graph

25617 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
0f06b88ee7 [ticket/security-171] Remove duplicate semicolon from tests 
SECURITY-171
 2014-11-22 15:48:09 +01:00
Joas Schilling
11c9d11482 Merge branch 'develop-ascraeus' into develop 2014-11-22 15:43:33 +01:00
Joas Schilling
fd993cbaf2 Merge pull request #3157 from marc1706/ticket/13358 
[ticket/13358] Add class for retrieving remote file data
 2014-11-22 15:42:37 +01:00
Marc Alexander
ab69c79d07 Merge branch 'ticket/13358' into ticket/security-171 2014-11-22 15:24:27 +01:00
Marc Alexander
f3ae5e4cb2 [ticket/13358] Correctly create version_helper in acp_extensions 
The full namespace for the file_downloader is now also being used in
version_helper.

PHPBB3-13358
 2014-11-22 15:23:26 +01:00
Jakub Senko
b9289340d9 [ticket/12567] wrap to top 
PHPBB3-12567
 2014-11-22 12:37:31 +01:00
Tristan Darricau
6850169095 [ticket/13266] Enable the debug extension in the development environment 
PHPBB3-13266
 2014-11-22 12:33:45 +01:00
Joas Schilling
45aafe0b09 Merge branch 'develop-ascraeus' into develop 2014-11-22 12:21:30 +01:00
Joas Schilling
8b71103836 Merge pull request #3123 from Elsensee/ticket/13310 
[ticket/13310] Add event core.acp_email_modify_sql
 2014-11-22 12:21:24 +01:00
Joas Schilling
8ce736ad8a Merge branch 'develop-ascraeus' into develop 2014-11-22 12:19:09 +01:00
Joas Schilling
ea101f7932 Merge pull request #3160 from PayBas/ticket/13228 
[ticket/13228] Fix codebox "select all" font-size in UCP and MCP
 2014-11-22 12:18:00 +01:00
Joas Schilling
d6c85757d7 Merge branch 'develop-ascraeus' into develop 2014-11-22 12:13:46 +01:00
Joas Schilling
7700f31213 Merge pull request #3116 from rxu/ticket/13297 
[ticket/13297] Add unicode modifier to url/email regular expression patterns
 2014-11-22 12:13:39 +01:00
Jakub Senko
a609c9db82 [ticket/12924] Make meta tags self-closing 
PHPBB3-12924
 2014-11-22 12:12:13 +01:00
Joas Schilling
ccad017214 Merge branch 'develop-ascraeus' into develop 2014-11-22 12:08:42 +01:00
Joas Schilling
a83b952f63 Merge pull request #3158 from prototech/ticket/13354 
[ticket/13354] Fix incorrect column name when deleting all topic logs.
 2014-11-22 12:08:33 +01:00
Jakub Senko
86b3c54c77 [ticket/11033] Update string to reflect real requirements 
PHPBB3-11033
 2014-11-22 11:56:52 +01:00
Joas Schilling
cde2f01b65 Merge branch 'develop-ascraeus' into develop 2014-11-22 11:35:58 +01:00
Joas Schilling
e283611dc2 Merge pull request #3161 from Crizz0/ticket/12885 
[ticket/12885] New if for Index-page - board-index-text switch
 2014-11-22 11:35:51 +01:00
Joas Schilling
b15ea672fd Merge branch 'develop-ascraeus' into develop 2014-11-22 11:31:50 +01:00
Joas Schilling
8489e0bdc2 Merge branch 'develop-olympus' into develop-ascraeus 2014-11-22 11:31:41 +01:00
Joas Schilling
a415b8e37b Merge pull request #3164 from Crizz0/ticket/10442 
[ticket/10442] Adds <dd>&nbsp;</dd> to <dl> for xhtml correctness
 2014-11-22 11:31:31 +01:00
Jakub Senko
30f292f5a2 [ticket/11613] Allow cookies to work on netbios domains 
PHPBB3-11613
 2014-11-22 11:29:57 +01:00
Tristan Darricau
0a49dad112 [ticket/13266] Merge pull request #3099 from Senky/ticket/13266 
[ticket/13266] Enabling twig dump function if DEBUG is defined

* Senky/ticket/13266:
  [ticket/13266] Enable twig dump function

Conflicts:
	phpBB/phpbb/template/twig/twig.php

PHPBB3-13266
 2014-11-22 11:04:25 +01:00
Marc Alexander
ece3ebc61b Merge pull request #3162 from nickvergessen/ticket/13359 
[ticket/13359] Add phpbb\template\twig\environment to template constructor
 2014-11-22 09:39:05 +01:00
Joas Schilling
5d3f0a9abb [ticket/13359] Add phpbb\template\twig\environment to template constructor 
PHPBB3-13359
 2014-11-22 03:42:48 +01:00
PayBas
2c15388520 [ticket/13228] Gotta use !important after all. Too bad 
PHPBB3-13228
 2014-11-22 02:42:25 +01:00
Crizzo
867bfa3f9e [ticket/10442] Adds <dd>&nbsp;</dd> to <dl> for xhtml correctness 
PHPBB3-10442
 2014-11-22 01:08:14 +01:00
Marc Alexander
afc658c71a Merge branch 'develop-ascraeus' into develop 2014-11-22 00:15:24 +01:00
Crizzo
4cb930c2c1 [ticket/12885] New if for Index-page - board-index-text switch 
PHPBB3-12885
 2014-11-22 00:09:38 +01:00
Marc Alexander
70692dd522 Merge pull request #3094 from nickvergessen/ticket/10744 
Ticket/10744 Prevent installing styles with reserved names
 2014-11-22 00:00:22 +01:00
Joas Schilling
c174862b7e [ticket/10744] Fix some doc blocks 
PHPBB3-10744
 2014-11-21 23:59:29 +01:00
Joas Schilling
7c683608ab [ticket/10744] Type hint objects for IDE usages 
PHPBB3-10744
 2014-11-21 23:58:53 +01:00
Joas Schilling
7f8c4d877a [ticket/10744] Prevent installing styles with reserved names 
PHPBB3-10744
 2014-11-21 23:55:48 +01:00
Marc Alexander
f648fe88d5 [ticket/security-171] Modify tests for new file_downloader class 
SECURITY-171
 2014-11-21 23:49:54 +01:00
Marc Alexander
9649d78fa4 Merge branch 'ticket/13358' into ticket/security-171 2014-11-21 23:37:17 +01:00
PayBas
16c43b6a7d [ticket/13228] Fix codebox "select all" font-size in UCP and MCP 
PHPBB3-13228
 2014-11-21 23:35:33 +01:00
Joas Schilling
47d3865fa6 Merge branch 'develop-ascraeus' into develop 2014-11-21 23:33:51 +01:00
Joas Schilling
2e2ab7b485 Merge pull request #3127 from omniError/ticket/13323 
[ticket/13323] empty auth option in posting.php
 2014-11-21 23:33:45 +01:00
Marc Alexander
6d3ac29aee [ticket/13358] Use protected and public keywords where applicable 
PHPBB3-13358
 2014-11-21 23:30:47 +01:00
Joas Schilling
dd3e440cef Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_email.html
 2014-11-21 23:26:51 +01:00
Crizzo
f930a75471 [ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entries 
PHPBB3-13357
 2014-11-21 23:18:42 +01:00
Marc Alexander
171837eefe [ticket/13358] Do not pass variables by reference 
PHPBB3-13358
 2014-11-21 23:16:22 +01:00
Joas Schilling
0017fad554 Merge pull request #3108 from Elsensee/ticket/13284 
[ticket/13284] Message body not included in email
 2014-11-21 23:10:00 +01:00
Joas Schilling
655cd3bd3a Merge branch 'develop-ascraeus' into develop 2014-11-21 22:52:29 +01:00
Joas Schilling
c98cceaf22 Merge pull request #3068 from marc1706/ticket/13204 
[ticket/13204] Tell user that password was incorrect when exceeding attempts
 2014-11-21 22:52:24 +01:00
Joas Schilling
9b54f2d0c4 Merge branch 'develop-ascraeus' into develop 2014-11-21 22:42:26 +01:00
Joas Schilling
dd7e09d092 Merge pull request #3064 from marc1706/ticket/13197 
[ticket/13197] Also delete group avatar from users that have it set
 2014-11-21 22:41:17 +01:00
Marc Alexander
4ee05b1c17 [ticket/security-171] Add tests for retrieved remote data in version_helper 
SECURITY-171
 2014-11-21 22:32:28 +01:00
Marc Alexander
34004612ac [ticket/security-171] Sanitize data from composer.json 
SECURITY-171
 2014-11-21 22:32:28 +01:00