| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
PHPBB3-13159
|
|
|
|
| |
PHPBB3-12990
|
|
|
|
| |
PHPBB3-11854
|
|
|
|
| |
PHPBB3-11854
|
|
|
|
| |
PHPBB3-12594
|
|
|
|
|
|
|
|
|
| |
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.
PHPBB3-12458
|
|
|
|
| |
PHPBB3-12364
|
|
|
|
| |
PHPBB3-11763
|
|
|
|
| |
PHPBB3-11722
|
|\
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11720] Add functional test for submitting report as user
[ticket/11720] Do not call $captcha->validate if $captcha is not set
|
| |
| |
| |
| |
| |
| |
| |
| | |
PHPBB3-11566 changed big parts of code. Unfortunately, a call to
$captcha->validate was added that is being called even if $captcha hasn't
been initialized. This change will fix this issue.
PHPBB3-11720
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| | |
PHPBB3-11566
|
| |
| |
| |
| | |
PHPBB3-11566
|
| |
| |
| |
| | |
PHPBB3-11566
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
When the error report is empty display error
in the template instead of trigger_error
PHPBB3-11566
|
| |
| |
| |
| |
| |
| | |
add $error which stores the captcha error when captcha validation fails
PHPBB3-11566
|
| |
| |
| |
| |
| |
| |
| | |
Add basic captcha template while reporting post
when the user is not a registered user.
PHPBB3-11566
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
# By Oleg Pudeyev (37) and others
# Via Oleg Pudeyev (24) and others
* 'develop' of github.com:phpbb/phpbb3: (179 commits)
[ticket/11323] Add tests for inclusion of defined variables
[ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
[ticket/11321] Recreate schema files with develop/create_schema_files.php
[ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
[ticket/11313] Use correct object el instead of eel in alt_text callback
[ticket/11301] Guidelines: Add spaces in front and after the / operator.
[ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
[ticket/11311] Include asset core.js in subsilver2 overall_footer.html
[ticket/10949] Remove not needed comma
[ticket/11309] phpbb_extension_interface::disable_step correct docblock.
[ticket/10949] Converted missing code to new JS coding guidelines
[ticket/11302] Correctly select first timezone or selected timezone
[ticket/11305] Mock container for cache driver in functional create_user()
[ticket/11305] Check for $cache being null before using it in db drivers.
[ticket/10805] Compare phpbbAlertTimer against null
[ticket/11305] Define hook finder as a service on the container.
[ticket/11305] Adjust comment.
[ticket/11305] Use phpbb_create_default_container.
[ticket/11305] Create a normal container during final installation step.
[ticket/11305] Retrieve cache driver from container rather than cache service.
...
Conflicts:
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
phpBB/styles/subsilver2/template/overall_footer.html
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added the variable aliases needed (to look and feel the same as
it was before)
Added the variables into the table insert.
PHPBB3-11171
|
| | |
| | |
| | |
| | |
| | |
| | | |
https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976
PHPBB3-11103
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Create a very basic user loader class to handle querying/storing
user data in a centralized location.
Use DIC collection service for notification types/methods.
Cleanup unused dependencies.
Fix some other issues.
PHPBB3-11103
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
phpBB/install/schemas/mssql_schema.sql
phpBB/report.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
|
| | |
| | |
| | |
| | |
| | |
| | | |
I onder when it got there... Maybe a wrong rebase... Don't really know.
PHPBB3-10845
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Now the bitfield and uid of the bbcode is saved in the reports table.
This will allow parsing the BBCode while loading the post to show
PHPBB3-10845
|
| | |
| | |
| | |
| | |
| | |
| | | |
This is going to require you recreate the db tables.
PHPBB3-11103
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Comments that are not needed because the actions are completely
self-explanatory
PHPBB3-11103
|
| | |
| | |
| | |
| | | |
PHPBB3-11103
|
| | |
| | |
| | |
| | | |
PHPBB3-11103
|
|/ /
| |
| |
| | |
PHPBB3-11103
|
| |
| |
| |
| |
| |
| |
| |
| | |
The name of the column was changed from reported_post AND
reported_text to reported_post_text.
This change was made by request
PHPBB3-10600
|
| |
| |
| |
| |
| |
| |
| | |
This covers all the changes so that when a report is made, the post
itself is copied and displayed in the MCP instead of the current post.
Unfortunatly, I made all commits in the wrong way and they were lost.
Now I have only the final files.
|
| |
| |
| |
| | |
PHPBB3-9916
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10266] Add "Return to forum" link after reporting a post
|
| |
| |
| |
| | |
PHPBB3-10266
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10284 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10164 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| | |
PHPBB3-9684
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .
Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;
Extensions: php, css, html, js, xml.
PHPBB3-9556
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/trunk@9337 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/trunk@9336 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/trunk@9335 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| | |
git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| |
| |
| | |
rename request:: to phpbb_request::
git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
super globals
- disabled super globals in common.php. See commit r9101 for
more information
- cleaned up/simplified a few lines along the way.
git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0
|