1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

2146 Commits

Author SHA1 Message Date
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
2013-07-24 13:25:20 -05:00
Nathaniel Guse
4b761f6575 [ticket/11628] Remove third parameter ($names) from set_custom_style
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
2013-07-24 12:56:39 -05:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
2013-07-24 12:24:35 -05:00
Oliver Schramm
e805036963 [ticket/10917] Using phpbb wrapper
PHPBB3-10917
2013-07-24 19:08:49 +02:00
Nathaniel Guse
44a82dd083 [ticket/11628] Remove style path provider
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 12:05:04 -05:00
Nathaniel Guse
98b385bc1c [ticket/11628] Remove style resource locator
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 11:59:21 -05:00
Oliver Schramm
5af63a7860 [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
PHPBB3-10917
2013-07-24 18:15:03 +02:00
Joseph Warner
da6a8787f8 [feature/oauth] Fix SQL error found in install
PHPBB3-11673
2013-07-23 22:26:34 -04:00
Joseph Warner
2483efe9a3 [feature/oauth] Actual final schema changes
PHPBB3-11673
2013-07-23 22:18:56 -04:00
Joseph Warner
e60f4bc88b [feature/oauth] Finalize schema changes
PHPBB3-11673
2013-07-23 22:16:09 -04:00
Igor Wiedler
8928240dc3 [ticket/11574] Fix more issues in the updater
* Stupid mistake in phpbb_create_update_container
* Do not bootstrap extensions in installer/updater
* Fix template lookup in installer/updater
* Do not attempt to delete posts from bots

The latter is a really fun problem. Since deleting posts now depends
on a new db column that does not exist yet, we cannot call delete_post
from a migration, ever. By using retain, we can hack around the issue
for now.

PHPBB3-11574
2013-07-14 15:40:19 -04:00
Nils Adermann
4311cd65e3 [ticket/11700] Instantiate the class loader with namespace rather than prefix
PHPBB3-11700
2013-07-14 14:29:11 -04:00
Nils Adermann
da2752e400 [ticket/11700] Modify all code to use the new interface names
PHPBB3-11700
2013-07-14 13:30:52 -04:00
Igor Wiedler
f6865dc33a Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
2013-07-14 11:34:58 -04:00
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
2013-07-14 01:32:34 -04:00
Igor Wiedler
e6e2a50062 [ticket/11574] Add trailing slash for consistency
PHPBB3-11574
2013-07-14 01:29:49 -04:00
Igor Wiedler
c96f8936c9 [ticket/11574] Fix table prefix in database updater
PHPBB3-11574
2013-07-14 01:06:10 -04:00
Igor Wiedler
d6de892ee4 [ticket/11574] Fix various path issues in the updater
PHPBB3-11574
2013-07-14 01:06:10 -04:00
Vjacheslav Trushkin
f2c6da3975 [ticket/11687] Add assets_version to phpbb_config
PHPBB3-11687
2013-07-13 13:10:21 -04:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [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.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
2013-07-13 09:36:24 -04:00
Igor Wiedler
1dea0286a4 [ticket/11574] Use alternate DI config file for updater
PHPBB3-11574
2013-07-13 09:57:57 +02:00
Joas Schilling
6c52fae750 [ticket/11574] Include normalizer so it loads form the correct directory
PHPBB3-11574
2013-07-13 09:57:57 +02:00
Joas Schilling
fe7823b668 [ticket/11574] Use log object instead of old function
PHPBB3-11574
2013-07-13 09:57:57 +02:00
Joas Schilling
14ff1ef540 [ticket/11574] Create phpbb_log object before using it.
PHPBB3-11574
2013-07-13 09:57:56 +02:00
Joas Schilling
fcf3437338 [ticket/11574] Add correct language parameter to return links
PHPBB3-11574
2013-07-13 09:57:56 +02:00
Joas Schilling
3eaeede321 [ticket/11574] Use request object rather then request_var function
PHPBB3-11574
2013-07-13 09:57:56 +02:00
Joas Schilling
deac5f53e3 [ticket/11574] Load new language files whenever possible
PHPBB3-11574
2013-07-13 09:57:56 +02:00
Joas Schilling
f11993c038 [ticket/11574] Require new files in install/index.php and add a class loader
PHPBB3-11574
2013-07-13 09:57:56 +02:00
Joas Schilling
e12fd2fdda [ticket/11574] Require new files in database_update.php and add a class loader
PHPBB3-11574
2013-07-13 09:57:56 +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
Andreas Fischer
6f14c8375e [develop-olympus] Bumping version numbers to final for 3.0.12 releases. 2013-07-12 21:10:05 +02:00
Nathaniel Guse
ece01f0a1f Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/8319:
  [ticket/8319] Do not repeat the replacement
  [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
  [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
  [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
  [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
2013-07-11 10:09:53 -05:00
Joas Schilling
bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
Nathaniel Guse
35b628f737 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig
# By Joseph Warner (44) and others
# Via Joas Schilling (4) and others
* 'develop' of https://github.com/phpbb/phpbb3: (63 commits)
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
  ...
2013-07-04 11:19:10 -05:00
Joseph Warner
f48effb001 [feature/auth-refactor] Fix the actual cause of test failures
Enables super globals before the new container is instantiated in
the final step of installation to prevent issues caused by trying
to create a phpbb_request object when super globals are disabled.

PHPBB3-9734
2013-07-01 22:40:49 -04:00
Nathaniel Guse
bdc05b7dc8 [feature/twig] Remove resource locator dependency from template
PHPBB3-11598
2013-07-01 13:28:08 -05:00
Nathan Guse
38d8025f12 [feature/twig] Use phpbb_template_twig in tests
Replace all new phpbb_template( with new phpbb_template_twig(

PHPBB3-11598
2013-06-12 13:29:57 -05:00
Nathaniel Guse
f4247aa3fe Merge branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11588] Also use version.phpbb.com in install_update.php.
2013-06-06 12:56:36 -05:00
Andreas Fischer
55f7281f61 [ticket/11588] Also use version.phpbb.com in install_update.php.
PHPBB3-11588
2013-06-06 13:00:53 +02:00
Joas Schilling
24bfaa1327 [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
To fix http://tracker.phpbb.com/browse/PHPBB3-8319 we changed the
second_pass_replace value, so that needs updating for existing ones.

PHPBB3-8319
2013-06-03 12:37:57 +02:00
Oliver Schramm
ec2cdbed61 [ticket/11570] Fix link and make the notice more conspiciuous
PHPBB3-11570
2013-05-31 12:18:03 +02:00
Oliver Schramm
8b0a6fd2cd [ticket/11570] Add link back to update process
PHPBB3-11570
2013-05-30 21:30:09 +02:00
Oliver Schramm
a79e229c25 [ticket/11569] Add type parameter and fix language variable
PHPBB3-11569
2013-05-29 13:27:15 +02:00
Oliver Schramm
c65617479d [ticket/11569] Add parameter to URL and remove comment
PHPBB3-11569
2013-05-29 13:20:47 +02:00
Oliver Schramm
7383841af5 [ticket/11569] Fixing link to continue update
PHPBB3-11569
2013-05-26 22:39:23 +02:00
Oliver Schramm
bb67b07920 [ticket/11567] Renamed extension_manager variable to avoid fatal error
PHPBB3-11567
2013-05-26 13:12:13 +02:00
Vjacheslav Trushkin
01fb9ea3e3 [ticket/11560] Fix jQuery link in installer
PHPBB3-11560
2013-05-22 21:05:25 +03:00
Senky
930f4c70ed [ticket/11010] resolving latest comments
PHPBB3-11010
2013-05-21 11:55:45 +02:00
Vjacheslav Trushkin
854b88d139 [ticket/11010] Add HTML5 input types to installer
Add new HTML5 input types to installer

PHPBB3-11010
2013-05-20 18:42:03 +02:00