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

16962 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
b3487b3167 Merge remote-tracking branch 'VSEphpbb/ticket/11577' into develop 
* VSEphpbb/ticket/11577:
  [ticket/11577] Readjust min-height to 35px
  [ticket/11577] Correct over-sized Topic Rows
 2013-07-03 22:56:30 +02:00
David King
73c289ae49 Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into develop 
* Hardolaf/feature/auth-refactor: (44 commits)
  [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
  [feature/auth-refactor] Forgot @inheritdoc on methods
  [feature/auth-refactor] Finish and clean up documentation
  [feature/auth-refactor] Change phpEx to php_ext in new classes
  [feature/auth-refactor] Fix two session tests broken by changes
  [feature/auth-refactor] Removed no longer used variable
  [feature/auth-refactor] Fix errors in acp_board
  [feature/auth-refactor] Fix indentation on acp_board
  [feature/auth-refactor] Refactor auth in acp_board
  [feature/auth-refactor] Don't truncate name then reattach same thing
  [feature/auth-refactor] Remove old auth plugins
  [feature/auth-refactor] Remove references to old auth plugins
  [feature/auth-refactor] Fix auth tests to use mock objects correctly
  [feature/auth-refactor] Test validate_session on provider_apache
  [feature/auth-refactor] Test autologin() on provider_apache
  [feature/auth-refactor] Test login() for provider_apache
  [feature/auth-refactor] Test for init on provider_apache
  ...
 2013-07-03 12:46:18 -04:00
Joas Schilling
8ce7d36f70 Merge remote-tracking branch 'dhruvgoel92/ticket/11437' into develop 
* dhruvgoel92/ticket/11437:
  [ticket/11437] avoid $start becoming negative when no search results are found
 2013-07-03 11:51:28 +02:00
Andreas Fischer
3c3f203f14 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
 2013-07-03 04:03:39 +02:00
Andreas Fischer
44de24f1b8 Merge remote-tracking branch 'VSEphpbb/ticket/11617' into develop-olympus 
* VSEphpbb/ticket/11617:
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
 2013-07-03 04:03:22 +02:00
Matt Friedman
5ef4987ffe [ticket/11617] Remove spaces and tabs from empty lines 
PHPBB3-11617
 2013-07-02 18:47:56 -07:00
Matt Friedman
fba3a9d600 [ticket/11617] Missing U_ACTION in acp_captcha.php 
http://tracker.phpbb.com/browse/PHPBB3-11617

PHPBB3-11617
 2013-07-02 16:52:15 -07:00
Joseph Warner
f9672e9b45 [feature/auth-refactor] Fix code style issue 
PHPBB3-9734
 2013-07-02 14:03:43 -04:00
Joas Schilling
f1b057102d Merge branch 'develop-olympus' into develop 
* develop-olympus:
 2013-07-02 13:08:58 +02:00
Joas Schilling
ec4a43c91c Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566-develop' into develop 
* remotes/dhruvgoel92/ticket/11566-develop:
  [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-02 13:07:53 +02:00
Joas Schilling
d4531c9cea Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566' into develop-olympus 
* remotes/dhruvgoel92/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
 2013-07-02 13:07:14 +02:00
Joseph Warner
2743081489 [feature/auth-refactor] Fix comment grammar 
PHPBB3-9734
 2013-07-02 00:04:32 -04: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
Andreas Fischer
fb777b3e20 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [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/10838] Updated RUNNING_TESTS.md
 2013-07-01 21:23:07 +02:00
Andreas Fischer
1a292750f2 Merge remote-tracking branch 'dhruvgoel92/ticket/10838' into develop-olympus 
* dhruvgoel92/ticket/10838:
  [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/10838] Updated RUNNING_TESTS.md
 2013-07-01 21:22:51 +02:00
Dhruv
440986dc3f [ticket/10838] Fix URL for wiki and remove irrelevant line 
PHPBB3-10838
 2013-07-02 00:50:16 +05:30
Dhruv
89393e11e8 [ticket/10838] Remove php 5.4 and builtin server references 
PHPBB3-10838
 2013-07-02 00:50:15 +05:30
Dhruv
9c9f09d640 [ticket/10838] Fix missing data 
PHPBB3-10838
 2013-07-02 00:50:14 +05:30
Dhruv
5ed4dbb5b7 [ticket/10838] separate database used mentioned in unit tests 
Separate database used for tests which is deleted each time
tests are run information is added to unit tests.

PHPBB3-10838
 2013-07-02 00:47:32 +05:30
Andreas Fischer
60e474c551 Merge remote-tracking branch 'dhruvgoel92/ticket/11585' into develop 
* dhruvgoel92/ticket/11585:
  [ticket/11585] Make $auth_admin class property
 2013-07-01 20:43:34 +02:00
Dhruv
9e3d5420ad [ticket/11585] Make $auth_admin class property 
$auth_admin is class property and used via $this reference in all
methods

PHPBB3-11585
 2013-07-02 00:10:30 +05:30
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
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
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
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
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