mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00
Code Issues Releases Wiki Activity
17,558 Commits 18 Branches 192 Tags
Commit Graph

7853 Commits

Author SHA1 Message Date
Joas Schilling
8c5ff0775a [ticket/9657] Fix a little error when moving softdeleted topics 
PHPBB3-9657
 2013-07-12 15:42:28 -04:00
Andreas Fischer
37b28ca7e7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.

Conflicts:
	build/build.xml
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
 2013-07-12 21:34:15 +02:00
Andreas Fischer
b93636d42d [develop-olympus] Increment version number to 3.0.13-dev. 2013-07-12 21:10:05 +02:00
Andreas Fischer
f1dd35387c [develop-olympus] Bump version numbers for 3.0.12-RC1 release. 2013-07-12 21:10:05 +02:00
Marc Alexander
adff2fb254 [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 
The upload avatar URL was checked for its length in phpBB 3.0. Additionally,
starting with the new avatar system in phpBB 3.1, the URL was checked to
prevent improper URLs being submitted. This minor change is needed for proper
testing of the ucp and acp groups pages.

PHPBB3-11548
 2013-07-12 14:35:17 -04:00
Andreas Fischer
0d0338a55c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page

Conflicts:
	tests/functional/common_groups_test.php
	tests/functional/ucp_groups_test.php
 2013-07-12 20:09:22 +02:00
Marc Alexander
da8e35ac77 [ticket/11548] Fix incorrect usage of array_map on acp groups page 
The array_map was only ran on small parts of the actual error array instead
of the whole one. This resulted in the output of the language variables' names
rather than their actual value.

PHPBB3-11548
 2013-07-12 13:40:30 -04:00
Nathaniel Guse
7e20b71180 [ticket/11665] Can't change file names already sent to set_filenames 
PHPBB3-11665
 2013-07-12 11:47:34 -05:00
Nathan Guse
7e4acced85 Merge pull request #1526 from bantu/ticket/11662-develop 
[ticket/11662] Typos: occured -> occurred
 2013-07-12 09:05:02 -07:00
Andreas Fischer
25c37bcee7 Merge remote-tracking branch 'EXreaction/ticket/11660' into develop 
* EXreaction/ticket/11660:
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
 2013-07-12 17:56:28 +02:00
Andreas Fischer
658b378b63 [ticket/11662] Typos: occured -> occurred 
PHPBB3-11662
 2013-07-12 17:51:29 +02:00
Nathaniel Guse
193670d7a9 Merge branch 'develop-olympus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11662] Typos: occured -> occurred

Conflicts:
	tests/template/template_test.php
 2013-07-12 10:37:52 -05:00
Andreas Fischer
f4b7cbd976 [ticket/11662] Typos: occured -> occurred 
PHPBB3-11662
 2013-07-12 17:10:18 +02:00
Nathaniel Guse
be020646f4 [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) 
PHPBB3-11660
 2013-07-12 09:37:24 -05:00
Joas Schilling
1911285b77 [ticket/9657] Notifications do not require emails or jabber anymore 
PHPBB3-9657
 2013-07-11 22:44:06 -04:00
Joas Schilling
003a104f93 [ticket/9657] Add type hints for classes 
PHPBB3-9657
 2013-07-11 22:41:24 -04:00
Joas Schilling
5ab0090e6c [ticket/9657] Remove sql_visibility as it is always non-empty 
PHPBB3-9657
 2013-07-11 22:35:55 -04:00
Joas Schilling
53c0647aed [ticket/9657] Use include instead of include_once 
PHPBB3-9657
 2013-07-11 22:16:45 -04:00
Nils Adermann
b1d3c1bf69 Merge pull request #1522 from igorw/feature/bootstrap-dic 
[feature/bootstrap-dic] Bootstrap container from config.php
 2013-07-11 15:28:26 -07:00
Vjacheslav Trushkin
f5c2119e7c [ticket/11647] Always use & for URLs 
Remove code for URLs separated with ;
Add test case for mix of & and & in URLs

PHPBB3-11647
 2013-07-11 18:13:48 -04:00
Andreas Fischer
382ae5a01e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11548] Use new static methods for request and submit
  [ticket/11548] Run array_map on complete error array and not just colour_error

Conflicts:
	tests/functional/ucp_groups_test.php
 2013-07-12 00:11:18 +02:00
Joas Schilling
54012dfb2f [ticket/9657] Initialise variable outside of the loop 
PHPBB3-9657
 2013-07-11 18:04:56 -04:00
Igor Wiedler
1a5d685f45 [feature/bootstrap-dic] Bootstrap container from config.php 
PHPBB3-11651
 2013-07-11 18:04:40 -04:00
Joas Schilling
0e5e128174 [ticket/9657] Fix variable naming of phpEx to php_ext 
PHPBB3-9657
 2013-07-11 18:02:45 -04:00
Joseph Warner
f4f29a1c0a [feature/auth-refactor] Fix style issue 
PHPBB3-9734
 2013-07-11 17:43:53 -04:00
Joseph Warner
a64a042830 [feature/auth-refactor] Fix typo 
PHPBB3-9734
 2013-07-11 17:39:51 -04:00
Marc Alexander
dc4687501a Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11548 2013-07-11 17:30:32 -04:00
Vjacheslav Trushkin
94fc0cccdc [ticket/11647] Allow custom ports 
Allow custom port number in schema-relative URLs

PHPBB3-11647
 2013-07-11 16:56:10 -04:00
Vjacheslav Trushkin
4fbdac0b9e [ticket/11647] Use $config for assets_version 
PHPBB3-11647
 2013-07-11 16:38:52 -04:00
Vjacheslav Trushkin
63f1d99cc8 [ticket/11647] Fix invalid variable name 
PHPBB3-11647
 2013-07-11 16:33:08 -04:00
Nathaniel Guse
159f018056 [ticket/11388] INCLUDECSS 
PHPBB3-11388
 2013-07-11 15:31:55 -05:00
Marc Alexander
599f83395f [ticket/11548] Run array_map on complete error array and not just colour_error 
Up to now the array_map() that turns error messages into the localized output
was only ran if the group's color was set. With this patch it'll run the
array_map() on the complete error array if it's not empty.

PHPBB3-11548
 2013-07-11 16:15:27 -04:00
Joseph Warner
f24a8e5b81 [ticket/11626] Make identifier uppercase per style requirements 
PHPBB3-11626
 2013-07-11 15:49:46 -04:00
Joseph Warner
3465867a4e [ticket/11626] Change the identifier template file in the template 
PHPBB3-11626
 2013-07-11 15:49:45 -04:00
Joseph Warner
3431cb8ed7 [ticket/11626] Call method only one time per provider 
PHPBB3-11626
 2013-07-11 15:49:45 -04:00
Joseph Warner
60100b62f3 [ticket/11626] Change interface to match functionality 
Changes the interface so that it matches the new functionality of
phpbb_provider_auth_interface::acp().

PHPBB3-11626
 2013-07-11 15:49:45 -04:00
Joseph Warner
29b472c2e5 [ticket/11626] Include the template file in acp_board 
PHPBB3-11626
 2013-07-11 15:49:45 -04:00
Joseph Warner
80eb95bbb7 [ticket/11626] LDAP Auth ACP Template File 
PHPBB3-11626
 2013-07-11 15:49:45 -04:00
Joseph Warner
b0e6b1dd98 [ticket/11626] Create get_acp_template method for auth providers 
PHPBB3-11626
 2013-07-11 15:49:45 -04:00
Joseph Warner
9c0495664d [feature/auth-refactor] Remove invalid providers from acp select 
PHPBB3-9734
 2013-07-11 15:46:08 -04:00
Vjacheslav Trushkin
4f3ce669f6 [ticket/11647] New assets handling 
PHPBB-11647
 2013-07-11 15:41:27 -04:00
Nils Adermann
59f34bef08 Merge pull request #1470 from EXreaction/feature/twig 
Feature/twig
 2013-07-11 12:11:41 -07:00
Joseph Warner
e2435f25d9 [feature/auth-refactor] Check that providers implement auth interface 
PHPBB3-9734
 2013-07-11 14:54:52 -04:00
Nathaniel Guse
947b907efe [ticket/11388] Do not append assets_version if using remote path (e.g. http) 
PHPBB3-11388
 2013-07-11 11:28:35 -05:00
Nathaniel Guse
abd4159f87 [ticket/11388] Fix typo 
PHPBB3-11388
 2013-07-11 11:27:15 -05:00
Nathaniel Guse
dd7f9f08d5 [ticket/11388] Remove typehints (causing tests to fail) 
PHPBB3-11388
 2013-07-11 11:24:45 -05:00
Joseph Warner
e674838d69 [feature/auth-refactor] Remove full stop 
PHPBB3-9734
 2013-07-11 12:07:00 -04:00
Nathaniel Guse
a846048918 [ticket/11388] Disable cache if IN_INSTALL defined 
PHPBB3-11388
 2013-07-11 11:03:28 -05:00
Nathaniel Guse
bc4b5c87a9 [ticket/11388] Do not modify by reference 
PHPBB3-11388
 2013-07-11 10:45:23 -05:00
Nathaniel Guse
ac6b4319b3 [ticket/11388] typehits 
PHPBB3-11388
 2013-07-11 10:32:13 -05:00