mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 08:25:42 +02:00
Code Issues Releases Wiki Activity
24,686 Commits 18 Branches 192 Tags
Commit Graph

9404 Commits

Author SHA1 Message Date
Joas Schilling
8aadee60f7 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:46:46 +01:00
Joas Schilling
ec90f2b380 [ticket/13421] Move tools to subdirectory 
PHPBB3-13421
 2014-12-06 17:10:07 +01:00
Oliver Schramm
a349db54d6 [ticket/13312] Use empty for usernames array 
PHPBB3-13312
 2014-11-26 23:10:02 +01:00
Oliver Schramm
41d0b5d3a2 [ticket/13312] Add event core.acp_email_send_before 
PHPBB3-13312
 2014-11-26 23:01:58 +01:00
Joas Schilling
1a0cba1099 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-11-25 16:47:22 +01:00
Joas Schilling
9c9623e47f [prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev 2014-11-25 16:43:43 +01:00
Joas Schilling
1ad0dd28f1 Merge branch 'develop-olympus' into prep-release-3.1.2 2014-11-25 16:36:32 +01:00
Nils Adermann
965042d015 [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3 
Also introduce a clear cookie message hardcoded just in case.

PHPBB3-13376
 2014-11-25 15:57:12 +01:00
Joas Schilling
3862b60094 [prep-release-3.1.2] Increase version number to 3.1.2 2014-11-24 21:31:49 +01:00
Joas Schilling
a5b3393bb0 [prep-release-3.1.2] Update version to 3.1.2-RC1 2014-11-22 19:22:40 +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
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
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
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
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
Marc Alexander
afc658c71a Merge branch 'develop-ascraeus' into develop 2014-11-22 00:15:24 +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
171837eefe [ticket/13358] Do not pass variables by reference 
PHPBB3-13358
 2014-11-21 23:16:22 +01:00
Cesar G
8d8c2930d2 [ticket/13354] Fix incorrect column name when deleting all topic logs. 
PHPBB3-13354
 2014-11-21 12:48:26 -08:00
Marc Alexander
f6e7a94bd5 [ticket/13358] Use file_downloader in get_remote_file() 
get_remote_file() has been marked as deprecated.

PHPBB3-13358
 2014-11-21 21:37:43 +01:00
Joas Schilling
1104f788c3 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/confirm_delete_body.html
 2014-11-21 21:00:00 +01:00
Joas Schilling
d56da0d68f Merge pull request #3044 from Elsensee/ticket/13100 
[ticket/13100] Display only confirmation buttons when deleting shadow topic
 2014-11-21 20:59:22 +01:00
Joas Schilling
a191708601 Merge branch 'develop-ascraeus' into develop 2014-11-21 20:20:45 +01:00
Joas Schilling
973c2a9a3a Merge pull request #2765 from Elsensee/ticket/11863 
[ticket/11863] Set require_activation to none if emails are disabled
 2014-11-21 20:18:15 +01:00
Joas Schilling
d311fa2c5e Merge branch 'develop-ascraeus' into develop 2014-11-21 20:05:37 +01:00
Joas Schilling
bc52a84998 Merge pull request #3131 from omniError/ticket/13328 
[ticket/13328] add core.mcp_view_forum_modify_sql
 2014-11-21 20:05:19 +01:00
Joas Schilling
2ba391d04a Merge branch 'develop-ascraeus' into develop 2014-11-21 19:32:42 +01:00
Joas Schilling
4bf3dcbebd Merge pull request #3114 from rxu/ticket/13294 
[ticket/13294] Add function parse() core event for additional message checks
 2014-11-21 19:28:07 +01:00
Tristan Darricau
5e2896bb00 [ticket/12620] Remove the old includes/functions_url_matcher.php file 
PHPBB3-12620
 2014-11-21 16:42:01 +01:00
Tristan Darricau
93f61a4a7d [ticket/12620] Use the right environment while installing 
PHPBB3-12620
 2014-11-20 21:13:30 +01:00
Tristan Darricau
48950be82b [ticket/12620] Fix tests 
PHPBB3-12620
 2014-11-20 21:13:26 +01:00
Tristan Darricau
6019e51fed [ticket/12620] Fix coding style 
PHPBB3-12620
 2014-11-20 21:09:40 +01:00
Tristan Darricau
acc91a2bbf [ticket/12620] Use the container to get the environment name 
PHPBB3-12620
 2014-11-20 21:01:01 +01:00
Tristan Darricau
aa061aa7c9 [ticket/12620] Uses a cache directory per environment 
PHPBB3-12620
 2014-11-20 20:59:34 +01:00
Tristan Darricau
998b4baa71 [ticket/12620] Fix download/file.php and app.php outside of the root_path 
PHPBB3-12620
 2014-11-20 20:58:35 +01:00
Tristan Darricau
014eed385b [ticket/12620] Add support of the environments for the ext routing files 
PHPBB3-12620
 2014-11-20 20:15:45 +01:00
Tristan Darricau
b697273aaa [ticket/12620] Use PHPBB_ENVIRONMENT 
PHPBB3-12620
 2014-11-20 19:01:23 +01:00
Tristan Darricau
7fa3b4c686 [ticket/12620] Rename productive to production 
PHPBB3-12620
 2014-11-20 19:00:46 +01:00
Tristan Darricau
c4842fe119 [ticket/12620] Fix functional tests 
PHPBB3-12620
 2014-11-20 19:00:42 +01:00
Tristan Darricau
70201ee8fa [ticket/12620] Rename debug to development 
PHPBB3-12620
 2014-11-20 19:00:35 +01:00
Tristan Darricau
c22562f5cd [ticket/12620] Allow the user to define multiples environments 
PHPBB3-12620
 2014-11-20 19:00:27 +01:00
rxu
1e867ce52b [ticket/13294] Add function parse() core event for additional message checks 
Add core event to the function parse() in includes/message_parser.php to allow
additional handling message before parsing (i.e. perform custom message
checks, cleanup etc.).

PHPBB3-13294
 2014-11-20 00:47:51 +07:00
Marc Alexander
19a47c7bac Merge branch 'develop-ascraeus' into develop 2014-11-18 13:12:08 +01:00
Joas Schilling
31c59cad83 [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php 
PHPBB3-13298
 2014-11-17 23:56:33 +01:00