1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

168 Commits

Author SHA1 Message Date
Nathan Guse
b4a374dc73 [ticket/11832] Fix INCLUDE(JS/CSS)
PHPBB3-11832
2013-09-13 10:58:03 -05:00
Nathan Guse
aa710df2db [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
Now symfony_request is also a service (removed the function
phpbb_create_symfony_request).

Inject symfony request into filesystem

Cleanup for the tests

PHPBB3-11832
2013-09-13 09:52:02 -05:00
Nathan Guse
a194e6ce7a Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832
# By Nathan Guse (22) and others
# Via Nathan Guse (10) and others
* 'develop' of github.com:phpbb/phpbb3: (39 commits)
  [ticket/11843] Added newlines and included numbers in the DEFINE vars test
  [ticket/11843] Add checking DEFINE variables with underscores to template_test
  [ticket/11843] The twig lexer fixes DEFINE variables with underscores again
  [ticket/11727] Fix indentation
  [ticket/11727] Fix indentation
  [ticket/11745] Correct language, coding guidelines
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
  [ticket/11833] Fix bad template loop
  [ticket/11816] !$DOESNT_EXIST test
  [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
  [ticket/11829] Use report_closed to determine status in MCP report_details
  [ticket/11816] Test !$DEFINITION
  [ticket/11822] Use namespace lookup order for asset loading
  [ticket/11727] Template loader support for safe directories to load files from
  [ticket/11816] Fix define/loop checks in IF statements containing parenthesis
  [ticket/11373] Use inheritdoc
  [ticket/11637] generate_text_for_display on search.php
  [ticket/11744] Cast to int
  [ticket/11744] Inheritdoc
  ...
2013-09-13 09:15:23 -05:00
David King
f22b959257 Merge pull request #1620 from EXreaction/ticket/11745
Group join approved notification
2013-09-12 21:25:00 -07:00
David King
d629738675 Merge pull request #1617 from EXreaction/ticket/11744
[ticket/11744] Group join request notification
2013-09-12 21:24:11 -07:00
Nathan Guse
baa73f6933 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/11832
* remotes/imkingdavid/ticket/11824:
  [ticket/11824] Revert changes in functions.php
  [ticket/11824] Reorganize test file
  [ticket/11824] Update language string for board settings
  [ticket/11824] Revert changes to functions_content.php
  [ticket/11824] Add tests for urls with mod_rewrite enabled
  [ticket/11824] Correct a comment
  [ticket/11824] Change copyright year in migration file
  [ticket/11824] Remove unused globals
  [ticket/11824] Fix smilies
  [ticket/11824] Fix logic
  [ticket/11824] Add option for mod_rewrite
2013-09-12 12:45:17 -05:00
Nathan Guse
d9fdf41ad8 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832
# By Joseph Warner (187) and others
# Via Andreas Fischer (2) and others
* 'develop' of github.com:phpbb/phpbb3: (189 commits)
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [feature/oauth] Fix tabindex
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  [feature/oauth] More small fixes
  [feature/oauth] More minor changes from review
  [feature/oauth] Fix small bug introduced by update in OAuth library
  [feature/oauth] Fix small issues on ucp pages
  [feature/oauth] Fix typo in OAuth logout method
  [feature/oauth] Make token storage service ignorant
  [feature/oauth] Update oauth::logout() to use clearAllTokens()
  [feature/oauth] Update storage implementation due to inteface change
  [feature/oauth] Update lusitanian/oauth to stable branch
  [feature/oauth] Update comment on oauth service exception
  [feature/oauth] Forgot to remove placeholder comment
  [feature/oauth] OAuth service exception
  [feature/oauth] A few more minor changes
  [feature/oauth] Changes due to code review
  [feature/oauth] Fix redirects
  [feature/oauth] Fix issues on ucp_login_link from review
  ...
2013-09-12 11:56:36 -05:00
Nathan Guse
f30b87519e [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path

PHPBB3-11832
2013-09-09 17:28:56 -05:00
Joseph Warner
3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth
Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673
2013-09-06 20:35:54 -04:00
David King
010da72f64 [ticket/11824] Add option for mod_rewrite
PHPBB3-11824
2013-09-03 16:57:27 -07:00
David King
913e5a1f2e [ticket/11215] Make controller helper url() method use correct format
PHPBB3-11215
2013-09-02 10:54:55 -07:00
Joseph Warner
310caec5d9 [feature/oauth] Fix redirects
PHPBB3-11673
2013-08-24 21:34:37 -04:00
Joseph Warner
3cbb973160 [feature/oauth] Pass users_table as parameter to OAuth in construct
PHPBB3-11673
2013-08-02 14:37:39 -04:00
Nathan Guse
46b4a405b1 [ticket/11745] Group request approved notification
PHPBB3-11745
2013-07-27 17:02:45 -05:00
Nathan Guse
e0ef10128b [ticket/11744] Group join request notification
PHPBB3-11744
2013-07-26 10:26:52 -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
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
Joseph Warner
4369cc8876 [feature/oauth] Fix more errors related to sql changes
PHPBB3-11673
2013-07-23 22:29:27 -04:00
Joseph Warner
e60f4bc88b [feature/oauth] Finalize schema changes
PHPBB3-11673
2013-07-23 22:16:09 -04:00
Joseph Warner
fe9c97cfb4 [feature/oauth] Fix errors in OAuth
PHPBB3-11673
2013-07-23 21:17:05 -04:00
Nathan Guse
b71038486e Merge pull request #1513 from nickvergessen/ticket/11582
Ticket/11582 Split permission logic from translations
2013-07-22 11:28:55 -07:00
Joseph Warner
2faaa7f63c [feature/oauth] Update service files + check for existing links
PHPBB3-11673
2013-07-18 12:51:53 -04:00
Joseph Warner
bbbe442c42 [feature/oauth] Finish clean up of removed providers
PHPBB3-11673
2013-07-18 12:24:30 -04:00
Joseph Warner
469879716d [feature/oauth] Bitly authentication method, no user_id association
PHPBB3-11673
2013-07-18 11:51:59 -04:00
Andreas Fischer
792c730f15 [ticket/10931] Add phpbb_php_ini as a service.
PHPBB3-10931
2013-07-16 20:11:58 +02:00
Joseph Warner
eb17462f90 [feature/oauth] Fix typo
PHPBB3-11673
2013-07-14 17:45:42 -04:00
Joseph Warner
0156bac3e2 [feature/oauth] Update auth provider oauth to take in service providers
PHPBB3-11673
2013-07-14 17:42:26 -04:00
Joseph Warner
80c5a42525 [feature/oauth] Add constructor arguments to services file
PHPBB3-11673
2013-07-14 17:26:38 -04:00
Joseph Warner
440904a0c8 [feature/oauth] Add OAuth services to service file
PHPBB3-11673
2013-07-14 17:03:19 -04:00
Joseph Warner
5942eac5da [feature/oauth] Pass table in constructor
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
24bf333e16 [feature/oauth] Use DB for OAuth token storage
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
93f7ed4fb5 [feature/oauth] Continue work on OAuth login
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
232a8c6740 [feature/oauth] OAuth as a symfony service
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joas Schilling
7f9a1c8116 [ticket/11582] Add event in constructor and add docs
PHPBB3-11582
2013-07-14 11:51:33 -04:00
Joas Schilling
573987d2d2 [ticket/11582] Add new service for permissions
Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
2013-07-14 11:51:29 -04:00
Joas Schilling
057d860d07 [ticket/11696] Rename db_tools.php so it can be autoloaded
PHPBB3-11696
2013-07-14 10:10:05 -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
Joas Schilling
9aed758c13 [ticket/9657] Use the service instead of the static class
PHPBB3-9657
2013-07-11 14:24:07 +02:00
Joas Schilling
9f89cb4cfb [ticket/9657] Make content visibility a service and inject everything
PHPBB3-9657
2013-07-11 13:31:39 +02:00
Nathan Guse
13c3565454 [feature/twig] Remove style dependency for controller helper
If a controller wants to use set_style, it can just use phpbb_style

PHPBB3-11598
2013-07-05 12:11:59 -05: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
Nathaniel Guse
2fb48d60f1 [feature/twig] Attempt to automatically set style dir for ext controllers
Extension authors can change it themselves if necessary

PHPBB3-11598
2013-07-04 11:08:36 -05:00
Nathaniel Guse
884a5b06fa [feature/twig] Add set_style function to controller helper
PHPBB3-11598
2013-07-04 10:13:05 -05:00
Nathaniel Guse
d7cff78443 [feature/twig] Use adm_relative_path to build admin namespace
PHPBB3-11598
2013-07-01 13:39:51 -05:00
Nathaniel Guse
bdc05b7dc8 [feature/twig] Remove resource locator dependency from template
PHPBB3-11598
2013-07-01 13:28:08 -05:00
Joseph Warner
95f38b457e [feature/auth-refactor] Create an auth.provider_collector service
Creates an auth.provider_collector service for all auth providers.

PHPBB3-9734
2013-06-20 22:50:35 -04:00
Joseph Warner
c9062fc1ee [feature/auth-refactor] Convert provider_apache to a service
Removes globals from provider_apache and turns it into a service.

PHPBB3-9734
2013-06-20 22:21:22 -04:00
Joseph Warner
c253189e85 [feature/auth-refactor] Convert provider_ldap to a service
Removes globals from provider_ldap and converts it into a service.

PHPBB3-9734
2013-06-20 22:11:53 -04:00
Joseph Warner
24825b9dc8 [feature/auth-refactor] Turn provider_db into a service
Removes globals from provider_db and turns it into a service.

PHPBB3-9734
2013-06-20 21:56:01 -04:00