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

25142 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
f4898b9258 Merge branch 'prep-release-3.1.2' into develop-ascraeus 2014-11-25 16:44:57 +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
Joas Schilling
ff9b541070 Merge pull request #3180 from naderman/ticket/13376 
[ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
 2014-11-25 16:36:18 +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
Tristan Darricau
f4576c969a [ticket/13372] Fix require_once CS 
PHPBB3-13372
 2014-11-25 12:48:48 +01:00
Tristan Darricau
fd94027b40 [ticket/13372] Fix Url Generator/Matcher generation 
PHPBB3-13372
 2014-11-25 12:23:16 +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
Jakub Senko
b8ecd1a656 [ticket/13368] Add @changed entry 
PHPBB3-13368
 2014-11-24 21:30:42 +01:00
Jakub Senko
bb4b04f89a [ticket/13319] Add missing table tags 
PHPBB3-13319
 2014-11-24 20:48:15 +01:00
Jakub Senko
d24fa2e777 [ticket/13346] Fix indentation, spacing and missing divs 
PHPBB3-13346
 2014-11-24 20:41:01 +01:00
Jakub Senko
9348b0c4f2 [ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event 
PHPBB3-13368
 2014-11-24 20:28:47 +01:00
Tristan Darricau
b00d02496e [ticket/13361] Improve the exception listener 
PHPBB3-13361
 2014-11-23 03:15:50 +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
Jakub Senko
595f9c132b [ticket/12924] Remove newlines at the EOF 
PHPBB3-12924
 2014-11-22 19:19:08 +01:00
Joas Schilling
8f67892f5e Merge branch 'develop-ascraeus' into develop 2014-11-22 17:49:06 +01:00
Joas Schilling
5c3b6a8559 Merge pull request #10 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
0c4a0cac61 Merge branch 'develop-ascraeus' into develop 2014-11-22 15:52:34 +01:00
Joas Schilling
a3b18d87dd Merge pull request #8 from phpbb/ticket/security-169 
[ticket/security-169] Stop loop through referer dir in top directory
 2014-11-22 15:51:48 +01:00
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