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

17254 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joseph Warner
69c1b1aea8 [feature/auth-refactor] Prevent fatal error in php < 5.3.23 
PHPBB3-9734
 2013-07-11 11:06:59 -04:00
Joseph Warner
3c11052fb3 [feature/auth-refactor] Have a base auth class 
PHPBB3-9734
 2013-07-11 10:56:04 -04:00
Nathaniel Guse
648e1e51fa [ticket/11388] INCLUDEJS test for //(url) 
PHPBB3-11388
 2013-07-11 08:44:48 -05:00
Nathaniel Guse
99c7483ade [ticket/11388] INCLUDEJS supports //(url) 
PHPBB3-11388
 2013-07-11 08:36:16 -05:00
Andreas Fischer
2fcae1ca16 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11630] Improvements to the PHP lint pre-commit hook
 2013-07-11 00:51:07 +02:00
Andreas Fischer
13c087d4f1 Merge remote-tracking branch 'EXreaction/ticket/11630' into develop-olympus 
* EXreaction/ticket/11630:
  [ticket/11630] Improvements to the PHP lint pre-commit hook
 2013-07-11 00:50:05 +02:00
Nathaniel Guse
8d8979eda7 [ticket/11388] Fixing includejs test 
Changed expected output to file?(any supplied argument string)&asset_version
=($config['asset_version'])#(any supplied anchor string)

Testing lines one at a time to make checking them easier.

PHPBB3-11388
 2013-07-10 13:23:36 -05:00
Nathaniel Guse
ab5a79a823 [ticket/11388] includejs inherit from includeasset 
Copied from the INCLUDECSS PR, since this needed to be modified.

Added checks for argument strings/anchors/http/https paths in asset files
to load files properly

PHPBB3-11388
 2013-07-10 13:19:34 -05:00
Nathaniel Guse
f88cdce43a Merge remote-tracking branch 'remotes/cyberalien/feature/twig/includejs_tests' into feature/twig 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/twig/includejs_tests:
  [feature/twig] Unit tests for includejs
 2013-07-10 11:38:48 -05:00
Vjacheslav Trushkin
9725eb19f8 [feature/twig] Unit tests for includejs 
PHPBB3-11598
 2013-07-10 11:43:52 -04:00
Joas Schilling
19f7d12328 [ticket/8319] Add migration file for update change 
PHPBB3-8319
 2013-07-10 17:25:27 +02:00
Joas Schilling
34ad665c8b Merge branch 'ticket/8319' into ticket/8319-develop2 
* 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

Conflicts:
	phpBB/install/database_update.php
 2013-07-10 17:24:49 +02:00
Joas Schilling
9210d735a5 [ticket/8319] Do not repeat the replacement 
PHPBB3-8319
 2013-07-10 17:13:02 +02:00
Nathan Guse
47ec38c011 [feature/twig] Add simple test to make sure Twig filters/tags are working 
PHPBB3-11598
 2013-07-08 15:21:27 -05:00
Nathan Guse
70a553e0b5 [feature/twig] Variable regular expressions should be lazy 
PHPBB3-11598
 2013-07-08 15:16:37 -05:00
David King
b9c290b548 [ticket/11215] Correct for different URL but same path info 
When Symfony Request calculates path info, both of the following URLs give "/"
as the path info: ./app.php and ./app.php/
This commit ensures that the proper correction is made.

PHPBB3-11215
 2013-07-06 23:21:57 -04:00
David King
0f522ddf5f [ticket/11215] A few minor optimizations for phpbb_get_web_root_path() 
PHPBB3-11215
 2013-07-06 23:21:56 -04:00
David King
c20f92ba1e [ticket/11215] Correct paths when path info is used for controller access 
PHPBB3-11215
 2013-07-06 23:20:21 -04:00
Nathan Guse
0894a13770 [feature/twig] If DEBUG, EVENT will always look for new/missing tpl event files 
If debug mode is enabled, lets check for new/removed EVENT templates on
page load rather than at compile. This is slower, but makes developing
extensions easier (no need to purge the cache when a new event template
file is added)

PHPBB3-11598
 2013-07-06 16:26:56 -05:00
Nathan Guse
9f85a4d118 [ticket/11420] Use !==, === when comparing strings 
PHPBB3-11420
 2013-07-06 12:59:26 -05:00
Nathan Guse
bdaa40bb55 [ticket/11420] Fix comments, license link 
PHPBB3-11420
 2013-07-06 12:58:52 -05:00
Matthew Fonda
300867ab1a [ticket/11630] Improvements to the PHP lint pre-commit hook 
The PHP lint pre-commit hook fails to display any output when an error
other than a parse error is decteced.

Additionally, the hook may not display any meaningful output depending
on php.ini settings. This commit removes the dependency on php.ini.

PHPBB3-11630
 2013-07-06 12:16:59 -05:00
Nathan Guse
2d7a91ebd6 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11253' into develop 
# By David King
# Via David King
* remotes/imkingdavid/ticket/11253:
  [ticket/11253] Put AND clause in correct SQL query
  [ticket/11253] Fix a few things brought up in the PR
  [ticket/11253] Fix typo in constant
  [ticket/11253] Add migration to add auth check to UCP signature module
 2013-07-06 11:15:04 -05:00
Nathan Guse
e03586f2cf Merge branch 'develop-olympus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathan Guse (1)
* develop-olympus:
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
 2013-07-05 18:21:38 -05:00
Nathan Guse
7c84a12f39 Merge remote-tracking branch 'remotes/bantu/ticket/11619' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11619:
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
 2013-07-05 18:21:01 -05:00
Nathan Guse
921d44aa4d [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for core 
Moved below overall_footer_after so events can add JS files in that event.

PHPBB3-11598
 2013-07-05 14:17:46 -05:00
Nathan Guse
8d11a147f5 [feature/twig] Use Twig mask for IF statements instead of our own tokenparser 
PHPBB3-11598
 2013-07-05 14:10:57 -05:00
Nathan Guse
0ffbdc80d1 [feature/twig] context_recursive_loop_builder isn't used anymore, removing it 
PHPBB3-11598
 2013-07-05 13:15:10 -05:00
Nathan Guse
c5c34ff831 [feature/twig] Add check for defined IN_PHPBB in all new Twig related files 
PHPBB3-11598
 2013-07-05 13:10:35 -05:00
Nathan Guse
99ddbe1adc [feature/twig] Can't use typehint here, causes tests to fail 
PHPBB3-11598
 2013-07-05 12:55:32 -05:00
Nathan Guse
9ac61565fd [feature/twig] Add template tests for S_NUM_ROWS and S_BLOCK_NAME 
PHPBB3-11598
 2013-07-05 12:48:02 -05:00
Nathan Guse
05984be2c0 [feature/twig] Fix S_NUM_ROWS assignment 
PHPBB3-11598
 2013-07-05 12:47:50 -05: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
Nathan Guse
1f4a717f9e [feature/twig] Add template test for ===, !== 
PHPBB3-11598
 2013-07-05 10:29:24 -05:00
Nathan Guse
81f0715b8e [feature/twig] Clarify comment 
PHPBB3-11598
 2013-07-05 10:05:20 -05:00
Nathan Guse
2674740573 [feature/twig] Spacing 
PHPBB3-11598
 2013-07-05 10:03:48 -05:00
Nathan Guse
c1a600277d [feature/twig] Nicer code for get_user_style.php() 
PHPBB3-11598
 2013-07-05 09:57:55 -05:00
Nathan Guse
576d8d7072 [feature/twig] Docs/typehinting for Twig extension 
PHPBB3-11598
 2013-07-05 09:56:25 -05:00
Nathan Guse
192c9d8f86 [feature/twig] Removing template/renderer.php (no longer used) 
PHPBB3-11598
 2013-07-05 09:37:40 -05:00
Andreas Fischer
4aef3d0ab9 Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into develop 
* Hardolaf/feature/auth-refactor:
  [feature/auth-refactor] Move auth providers to separate directory
 2013-07-05 16:06:07 +02:00
Joseph Warner
5746c8d96f [feature/auth-refactor] Move auth providers to separate directory 
Moves the provider files to their own directory per bantu's
suggestion.

PHPBB3-9734
 2013-07-04 17:14:19 -04:00
Nathaniel Guse
25b4732845 [feature/twig] Remove debug code 
PHPBB3-11598
 2013-07-04 15:32:04 -05:00
Nathaniel Guse
0f3086a54b [feature/twig] Spacing 
PHPBB3-11598
 2013-07-04 15:24:42 -05:00
Nathaniel Guse
53496e6a47 [feature/twig] acp module tpls are in ext/adm, ucp/mcp in styles/ 
PHPBB3-11598
 2013-07-04 15:21:57 -05:00
Nathaniel Guse
38700a80f8 [feature/twig] Fix copy/pasted code 
PHPBB3-11598
 2013-07-04 14:09:50 -05:00
Nathaniel Guse
24be216366 [feature/twig] Attempt to automatically set style dir for ext modules 
Extension authors can change it themselves if necessary

PHPBB3-11598
 2013-07-04 13:49:56 -05:00
Nathaniel Guse
8cf6dbd950 [feature/twig] Trying some new debug code for this mkdir error 
PHPBB3-11598
 2013-07-04 13:40:37 -05:00
Nathaniel Guse
fdbdd8bfd9 [feature/twig] Fix a regular expression 
PHPBB3-11598
 2013-07-04 13:22:41 -05:00
Nathaniel Guse
4f6cb9acbd [feature/twig] Fix helper URL test 
PHPBB3-11598
 2013-07-04 13:19:21 -05:00
Nathaniel Guse
864465761f [feature/twig] Fix debug code 
PHPBB3-11598
 2013-07-04 13:19:03 -05:00