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

20228 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathaniel Guse
6f925552a5 [feature/twig] Fix includephp_from_subdir_test.php 
PHPBB3-11598
 2013-07-01 13:06:37 -05:00
Nathaniel Guse
341bae40eb [feature/twig] Remove the twig loader class that I started (don't use it) 
PHPBB3-11598
 2013-07-01 12:58:31 -05:00
Dhruv
c80b80ca0f Merge branch 'ticket/11566' into ticket/11566-develop 
* ticket/11566:
  [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

Conflicts:
	phpBB/report.php
 2013-07-01 23:25:29 +05:30
Joseph Warner
66118ea49e [feature/auth-refactor] A possible fix for the functional test failures 
I don't like this fix as it really shouldn't be needed. But it
makes the functional tests pass.

PHPBB3-9734
 2013-07-01 13:33:14 -04:00
Nathaniel Guse
6c30441ad4 [feature/twig] Changing INCLUDEJS behavior slightly 
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
 2013-07-01 12:26:01 -05:00
Nathaniel Guse
e9bbeeb1a4 [feature/twig] Fix includephp node 
PHPBB3-11598
 2013-07-01 12:23:25 -05:00
Nathaniel Guse
1b2e5503ac [feature/twig] PHP test moved to a separate file 
This had to be done because cached template files are available in memory,
so Twig doesn't ever reparse a template on the same page load

PHPBB3-11598
 2013-07-01 12:07:29 -05:00
Nathaniel Guse
f08330f762 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig 
# By Dhruv (7) and others
# Via Andreas Fischer (7) and others
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11593] initialize $is_expr as null before being passed to get_varref
  [ticket/9341] Assert that page doesnt contain next or prev page posts
  [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
  [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
  [ticket/11618] Replace glob() with scandir() and string matching
  [ticket/9341] Add tests for checking Next and Previous template vars
  [ticket/9341] Move create_topic and post into functional test case
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
  [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
  [ticket/9341] Correctly named template vars

Conflicts:
	tests/template/template_test_case.php
 2013-07-01 12:03:24 -05:00
Nathaniel Guse
8c75d1c1bc [feature/twig] Fix template_test.php 
Various tests were broken completely, and some things such as whitespace
changed with Twig

PHPBB3-11598
 2013-07-01 11:58:16 -05:00
Nathaniel Guse
ddaccaf63e [feature/twig] A bit of cleanup in twig.php 
PHPBB3-11598
 2013-07-01 11:52:03 -05:00
Dhruv
045e04fb6f [ticket/11566] Subsilver template error displayed after table headers 
PHPBB3-11561
 2013-07-01 21:54:47 +05:30
Dhruv
d4645575fd [ticket/11566] Remove extra pair of brackets from conditional statement 
PHPBB3-11566
 2013-07-01 21:54:34 +05:30
Dhruv
84ec1f5423 [ticket/11566] Check that guest doesn't have reporting permission by default 
PHPBB3-11566
 2013-07-01 21:49:06 +05:30
Dhruv
ea8a4abe66 [ticket/11566] Add captcha to report post template in subsilver 
PHPBB3-11566
 2013-07-01 21:49:05 +05:30
Dhruv
4ad1d9aa65 [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init 
PHPBB3-11566
 2013-07-01 21:49:04 +05:30
Dhruv
88b5180aa1 [ticket/11566] Rename var to $visual_confirmation_response 
PHPBB3-11566
 2013-07-01 21:49:02 +05:30
Dhruv
434d14e1d5 [ticket/11566] Revert forum permission changes 
Revert the f_report permission for guests in the functional tests

PHPBB3-11566
 2013-07-01 21:49:01 +05:30
Dhruv
1abc3d91d0 [ticket/11566] Use language variable instead of hardcode 
Add language variable in tests

PHPBB3-11566
 2013-07-01 21:49:00 +05:30
Dhruv
43053c541a [ticket/11566] add tests for reporting post 
Functional test for reporting post and check if captcha validation
is required for guests and not for registerted users

PHPBB3-11566
 2013-07-01 21:48:59 +05:30
Dhruv
c4fbed251d [ticket/11566] add captcha reset and hidden fields 
If captcha is solved and some other error pops up, store the
captcha in a hidden field.
Reset captcha if reporting the post is successful

PHPBB3-11566
 2013-07-01 21:48:57 +05:30
Dhruv
2c240f8a7b [ticket/11566] display error instead of trigger_error 
When the error report is empty display error
in the template instead of trigger_error

PHPBB3-11566
 2013-07-01 21:48:56 +05:30
Dhruv
7c9a1cbca9 [ticket/11566] add error in template 
Check if error exists, then display it
in the report post template.

PHPBB3-11566
 2013-07-01 21:48:54 +05:30
Dhruv
eafd0ae29f [ticket/11566] add error functionality 
add $error which stores the captcha error when captcha validation fails

PHPBB3-11566
 2013-07-01 21:48:53 +05:30
Dhruv
7a2e3b4354 [ticket/11566] add interface for captcha 
Add basic captcha template while reporting post
when the user is not a registered user.

PHPBB3-11566
 2013-07-01 21:48:51 +05:30
Nathaniel Guse
4ee7fb1a9d [feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_block 
PHPBB3-11598
 2013-07-01 10:57:57 -05:00
Nathaniel Guse
42e3a4bfb9 [feature/twig] Add addslashes filter (to use on LA_ instead of escape) 
To match previous parser behavior

PHPBB3-11598
 2013-07-01 10:17:58 -05:00
Nathaniel Guse
8d3fd1fcdd [feature/twig] Remove the get_rootref and get_tpldata functions prev added 
These are not really necessary

PHPBB3-11598
 2013-07-01 09:38:51 -05:00
Nathaniel Guse
9749405129 [feature/twig] Transform {L_, {LA_ to use the lang() function 
PHPBB3-11598
 2013-07-01 09:32:21 -05:00
Nathaniel Guse
658d1b6afe [feature/twig] Fixing include node 
PHPBB3-11598
 2013-07-01 09:20:46 -05:00
Nathaniel Guse
ecdc73a81a [feature/twig] Fixing define node 
PHPBB3-11598
 2013-07-01 09:19:54 -05:00
Nathaniel Guse
2c55671767 [feature/twig] Fixing div by replacement 
PHPBB3-11598
 2013-07-01 09:19:30 -05:00
Nathaniel Guse
c49d27329d [feature/twig] Adding ! operator 
PHPBB3-11598
 2013-07-01 09:18:58 -05:00
Nathaniel Guse
c477f865fb [feature/twig] Add S_NUM_ROWS to loops in context 
PHPBB3-11598
 2013-06-29 19:22:58 -05:00
Nathaniel Guse
82aa4edeab [feature/twig] Adding some operators to the extension 
PHPBB3-11598
 2013-06-29 19:22:01 -05:00
Nathaniel Guse
f18cbd50f0 [feature/twig] Fixing more stuff for DEFINE/INCLUDE 
PHPBB3-11598
 2013-06-29 19:19:18 -05:00
Matt Friedman
5701c753a7 [ticket/11577] Readjust min-height to 35px 
Changing min-height to 35px in order to get pixel-for-pixel accurate
height settings as before for topic-rows.

PHPBB3-11577
 2013-06-29 12:17:12 -07:00
Nathaniel Guse
64963b5962 [feature/twig] Fixing DEFINE statements 
PHPBB3-11598
 2013-06-29 11:07:10 -05:00
Joas Schilling
8233c3e340 Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into develop 
* dhruvgoel92/ticket/9341:
  [ticket/9341] Assert that page doesnt contain next or prev page posts
  [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
  [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
  [ticket/9341] Add tests for checking Next and Previous template vars
  [ticket/9341] Move create_topic and post into functional test case
  [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
  [ticket/9341] Correctly named template vars
 2013-06-29 15:49:23 +02:00
Andreas Fischer
c0c4ce8b8b Merge remote-tracking branch 'dhruvgoel92/ticket/11593' into develop 
* dhruvgoel92/ticket/11593:
  [ticket/11593] initialize $is_expr as null before being passed to get_varref
 2013-06-29 14:07:42 +02:00
Dhruv
5182ec09a5 [ticket/11593] initialize $is_expr as null before being passed to get_varref 
PHPBB3-11593
 2013-06-29 15:26:36 +05:30
Nathaniel Guse
abb7901edb [feature/twig] New Twig filter, subset 
This filter grabs a subset of a loop for output (according to past
functionality).

PHPBB3-11598
 2013-06-28 15:40:30 -05:00
Joseph Warner
27f0b9ff43 [feature/auth-refactor] Forgot @inheritdoc on methods 
PHPBB3-9734
 2013-06-28 14:42:26 -04:00
Dhruv
91e773a795 [ticket/9341] Assert that page doesnt contain next or prev page posts 
PHPBB3-9341
 2013-06-28 01:02:00 +05:30
Dhruv
22998ee5ee [ticket/9341] Follow the Next/Prev link in tests 
follow the next/prev link and then assert if the page contains
its last post or not

PHPBB3-9341
 2013-06-28 00:52:36 +05:30
Joseph Warner
24e323d593 [feature/auth-refactor] Finish and clean up documentation 
PHPBB3-9734
 2013-06-27 14:20:07 -04:00
Dhruv
69001902b9 [ticket/9341] remove PREV_PAGE tpl var used for backward compatability 
PHPBB3-9341
 2013-06-27 20:47:03 +05:30
Joseph Warner
5af7d2b07f [feature/auth-refactor] Change phpEx to php_ext in new classes 
PHPBB3-9734
 2013-06-26 21:45:37 -04:00
Andreas Fischer
f2b174c8b5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11618] Replace glob() with scandir() and string matching

Conflicts:
	tests/template/template_test.php
 2013-06-27 02:23:57 +02:00
Andreas Fischer
960b20e45b Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympus 
* Hardolaf/ticket/11618:
  [ticket/11618] Replace glob() with scandir() and string matching
 2013-06-27 02:08:48 +02:00
Joseph Warner
8e575487ff [ticket/11618] Replace glob() with scandir() and string matching 
Removes glob from template tests as glob() does not work on all
systems according to PHP documentation as has been noticed by users.

PHPBB3-11618
 2013-06-26 19:51:52 -04:00