1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 23:45:20 +02:00

20410 Commits

Author SHA1 Message Date
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
9264d7c758 [prep-release-3.1.2] Update Changelog with 13376 2014-11-25 15:44:39 +01:00
Joas Schilling
0fbe8e8e69 [prep-release-3.1.2] Add migration to update version to 3.1.2 2014-11-24 21:32:17 +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
5f3dffa820 [prep-release-3.1.2] Add changelog for 3.1.2-RC1 2014-11-22 19:35:24 +01:00
Joas Schilling
18d5ca9ce5 [prep-release-3.1.2] Prepare Changelog 2014-11-22 19:32:36 +01:00
Joas Schilling
dcd0f200d6 [prep-release-3.1.2] Add migration for 3.1.2-RC1 2014-11-22 19:27:34 +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
5c3b6a8559 Merge pull request from phpbb/ticket/security-171
[ticket/security-171] Use type cast helper for json data
2014-11-22 17:48:37 +01:00
Joas Schilling
a3b18d87dd Merge pull request from phpbb/ticket/security-169
[ticket/security-169] Stop loop through referer dir in top directory
2014-11-22 15:51:48 +01:00
Joas Schilling
fd993cbaf2 Merge pull request 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
Joas Schilling
8b71103836 Merge pull request from Elsensee/ticket/13310
[ticket/13310] Add event core.acp_email_modify_sql
2014-11-22 12:21:24 +01:00
Joas Schilling
ea101f7932 Merge pull request 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
7700f31213 Merge pull request 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
a83b952f63 Merge pull request from prototech/ticket/13354
[ticket/13354] Fix incorrect column name when deleting all topic logs.
2014-11-22 12:08:33 +01:00
Joas Schilling
e283611dc2 Merge pull request 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
8489e0bdc2 Merge branch 'develop-olympus' into develop-ascraeus 2014-11-22 11:31:41 +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
Crizzo
4cb930c2c1 [ticket/12885] New if for Index-page - board-index-text switch
PHPBB3-12885
2014-11-22 00:09:38 +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
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
2e2ab7b485 Merge pull request 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
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 from Elsensee/ticket/13284
[ticket/13284] Message body not included in email
2014-11-21 23:10:00 +01:00
Joas Schilling
c98cceaf22 Merge pull request 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
dd7e09d092 Merge pull request 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
Marc Alexander
da1888a7fa [ticket/security-171] Use type cast helper for json data
SECURITY-171
2014-11-21 22:32:28 +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
352648f173 [ticket/13358] Fix tests and use exceptions instead of user object
PHPBB3-13358
2014-11-21 21:37:43 +01: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
Marc Alexander
2793f9c078 [ticket/13358] Add file_downloader to version_helper
PHPBB3-13358
2014-11-21 21:37:43 +01:00
Marc Alexander
a080173010 [ticket/13358] Add file_downloader as replacement for get_remote_file
PHPBB3-13358
2014-11-21 21:37:43 +01:00
Cesar G
f3373e1e32 [ticket/13316] Ensure Recaptcha image uses https when necessary.
PHPBB3-13316
2014-11-21 12:17:04 -08:00
Joas Schilling
f719803fdc Merge pull request from marc1706/ticket/13337
[ticket/13337] Do not use SQL IN comparison with empty array
2014-11-21 21:04:11 +01:00
Joas Schilling
d56da0d68f Merge pull request from Elsensee/ticket/13100
[ticket/13100] Display only confirmation buttons when deleting shadow topic
2014-11-21 20:59:22 +01:00
Joas Schilling
1689191f29 Merge pull request from Nicofuma/ticket/13133
[ticket/13133] Allow @vendor_name for includecss
2014-11-21 20:36:41 +01:00
Joas Schilling
973c2a9a3a Merge pull request 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
707a85b6c1 Merge pull request from rxu/ticket/13182
[ticket/13182] Add posting.php core event to allow modifying the message text
2014-11-21 20:14:36 +01:00
Joas Schilling
71a015557f Merge pull request from omniError/ticket/13347
[ticket/13347] missing acp_forums template events

Conflicts:
	phpBB/docs/events.md
2014-11-21 20:09:13 +01:00