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

237 Commits

Author SHA1 Message Date
Nathan Guse
9c535da528 [ticket/11850] page_name contains controller request rather than query string
Fixing tests

PHPBB3-11850
2013-09-17 22:00:06 -05:00
Nathan Guse
f4317bc864 [ticket/11850] Fix $user->page on pages through the controller
PHPBB3-11850
2013-09-17 11:44:42 -05:00
Nathan Guse
9e8babbf6e [ticket/11832] get_url() from phpbb_template_asset should return web path
PHPBB3-11832
2013-09-15 16:42:02 -05:00
Nathan Guse
b4a374dc73 [ticket/11832] Fix INCLUDE(JS/CSS)
PHPBB3-11832
2013-09-13 10:58:03 -05:00
Nathan Guse
8b2653dae3 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832
# By David King
# Via David King (1) and Joas Schilling (1)
* 'develop' of github.com:phpbb/phpbb3:
  [ticket/11824] Fix comment wording
2013-09-13 09:52:50 -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
Joas Schilling
958f3e9503 Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00
David King
ee44dff3be [ticket/11824] Fix comment wording
PHPBB3-11824
2013-09-13 07:28:00 -07: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
rechosen
42884546cc [ticket/11843] The twig lexer fixes DEFINE variables with underscores again
https://github.com/phpbb/phpbb3/pull/1708 accidentally stopped the twig lexer
from fixing DEFINE variables with underscores in them. This commit restores
that functionality.

PHPBB3-11843
2013-09-13 12:05:20 +02:00
David King
fc7a35be38 Merge pull request #1622 from EXreaction/ticket/11373
[ticket/11373] Prune old read notifications with cron
2013-09-12 22:01:11 -07:00
David King
5925ea1f45 Merge pull request #1689 from EXreaction/ticket/11727
[ticket/11727] Mark style directories safe to load from
2013-09-12 21:35:17 -07:00
Nathan Guse
f723491527 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373
# By Joseph Warner (188) and others
# Via Andreas Fischer (41) and others
* 'develop' of github.com:phpbb/phpbb3: (435 commits)
  [ticket/11745] Correct language, coding guidelines
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [ticket/develop/11832] Fix path detection
  [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
  [ticket/11833] Fix bad template loop
  [feature/oauth] Fix tabindex
  [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/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  ...
2013-09-12 23:34:34 -05:00
Nathan Guse
288649dd5e [ticket/11727] Fix indentation
PHPBB3-11727
2013-09-12 23:32:45 -05:00
Nathan Guse
088dfc1200 [ticket/11727] Fix indentation
PHPBB3-11727
2013-09-12 23:32:08 -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
David King
f02a8cf0e6 Merge pull request #1705 from EXreaction/ticket/11833
Fix invalid template loop & prevent Twig from throwing errors in invalid uses of BEGINELSE
2013-09-12 21:17:22 -07:00
Nathan Guse
32b9254740 [ticket/11745] Correct language, coding guidelines
PHPBB3-11745
2013-09-12 22:59:42 -05:00
Nathan Guse
bcb1392351 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By Joseph Warner (187) and others
# Via Nathan Guse (6) and others
* 'develop' of github.com:phpbb/phpbb3: (195 commits)
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [ticket/develop/11832] Fix path detection
  [feature/oauth] Fix tabindex
  [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
  [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
  [ticket/11822] Use namespace lookup order for asset loading
  [feature/oauth] Update comment on oauth service exception
  [feature/oauth] Forgot to remove placeholder comment
  ...

Conflicts:
	phpBB/phpbb/template/twig/lexer.php
	tests/template/template_test.php
2013-09-12 22:56:54 -05:00
David King
12ede5f2a7 Merge pull request #1708 from EXreaction/ticket/11828
[ticket/11828] Fix greedy operators in lexer
2013-09-12 20:51:29 -07:00
David King
484d457363 Merge pull request #1690 from EXreaction/ticket/11822
[ticket/11822] Use namespace lookup order for asset loading
2013-09-12 20:49:27 -07:00
Nathan Guse
8c2f73bb09 [ticket/11828] Fix greedy operators in lexer
Use lazy operators and use stricter validation

PHPBB3-11828
2013-09-12 14:15:41 -05: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
4c00c77739 [ticket/11832] Changing comments to say app.php rather than index.php
PHPBB3-11832
2013-09-12 11:08:40 -05:00
Nathan Guse
b06c8a80d1 [ticket/11832] Fix the web path corrections
Add some real life examples to test

PHPBB3-11832
2013-09-12 10:25:49 -05:00
Nathan Guse
7435c40b5c [ticket/11835] Fix ucp_auth_link adding in migration
PHPBB3-11835
2013-09-10 21:31:19 -05:00
Joseph Warner
18f6a16101 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 2013-09-10 16:19:39 -04:00
Nathan Guse
3a4efa7959 [ticket/11832] More extensive testing
PHPBB3-11832
2013-09-10 11:15:24 -05:00
Nathan Guse
6692db892f [ticket/11832] update_web_root_path helper and tests
PHPBB3-11832
2013-09-09 18:19:50 -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
Nathan Guse
5166240d62 [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
PHPBB3-11833
2013-09-09 11:26:40 -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
50b24662bd [ticket/11824] Change copyright year in migration file
PHPBB3-11824
2013-09-06 13:07:02 -07:00
Nathan Guse
65f52d7575 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By David King (16) and others
# Via David King (13) and others
* 'develop' of github.com:phpbb/phpbb3: (67 commits)
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [ticket/11791] Load adm/ events from styles/adm/event/
  [ticket/11215] Fix helper_url_test.php tests
  [ticket/11215] Add newline back to .htaccess, fix wording
  [ticket/11215] Update comment in .htaccess
  [ticket/11215] Uncomment rewrite rules in .htaccess
  [ticket/11215] Make controller helper url() method use correct format
  [ticket/11215] Add commented-out URL rewrite capability to .htaccess
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11215] Use new URL structure for controllers
  [ticket/11215] Everything appears to be working...
  ...

Conflicts:
	phpBB/phpbb/template/twig/lexer.php
	tests/template/template_test.php
2013-09-06 09:08:53 -05:00
David King
010da72f64 [ticket/11824] Add option for mod_rewrite
PHPBB3-11824
2013-09-03 16:57:27 -07:00
Dhruv
19074a3420 [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
PHPBB3-11825
2013-09-03 19:44:07 +05:30
David King
6e028a5ecc Merge remote-tracking branch 'EXreaction/ticket/11755' into develop 2013-09-02 16:12:30 -07:00
Nathan Guse
4fd99a7b2e Merge pull request #1102 from imkingdavid/ticket/11215
[ticket/11215] Correct paths when path info is used for controller access
2013-09-02 15:55:22 -07:00
Nathan Guse
536eeb7afa [ticket/11755] MySQL upgrader out of date
De-duplicating code from create_schema_files, mysql_upgrader.

New file phpbb/db/schema_data which contains all the current schema data.

New function in db_tools public static function get_dbms_type_map() to make the
type map available everywhere (without requiring $db be setup already)

PHPBB3-11755
2013-09-02 16:58:34 -05:00
Nathan Guse
c8d5ec8927 [ticket/11812] Fix empty define
PHPBB3-11812
2013-09-02 16:35:42 -05:00
Joseph Warner
29e3768ecc [feature/oauth] More minor changes from review
PHPBB3-11673
2013-09-02 16:47:53 -04:00
Joseph Warner
63ba064065 [feature/oauth] Fix small bug introduced by update in OAuth library
PHPBB3-11673
2013-09-02 16:32:40 -04:00
Joseph Warner
6420fdcc05 [feature/oauth] Fix typo in OAuth logout method
PHPBB3-11673
2013-09-02 16:04:46 -04:00
Joseph Warner
4348fd8350 [feature/oauth] Make token storage service ignorant
PHPBB3-11673
2013-09-02 16:04:35 -04:00
Joseph Warner
a2be0aab5f [feature/oauth] Update oauth::logout() to use clearAllTokens()
PHPBB3-11673
2013-09-02 16:04:24 -04:00
Joseph Warner
6df2bd4fd3 [feature/oauth] Update storage implementation due to inteface change
PHPBB3-11673
2013-09-02 16:04:15 -04:00
David King
a1b4c6f82a [ticket/11215] Fix helper_url_test.php tests
PHPBB3-11215
2013-09-02 12:53:37 -07:00
Nathan Guse
4233575814 [ticket/11822] Use namespace lookup order for asset loading
PHPBB3-11822
2013-09-02 14:01:51 -05:00