| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Instead of using post_reported of the post or message_reported of the pm, use
report_closed of the report itself to reliably determine whether this
particular report is closed or not in the report_details view of the MCP.
This fixes a bug where the report_details view would not show that the report
shown was closed and display a "Close report" button that had no effect.
PHPBB3-11829
|
| | |
| |
| |
| | |
PHPBB3-11774
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (480 commits)
[ticket/6723] Show info that message has been deleted before delivery
[ticket/11385] Fix issue with migration module tool not getting extension module info
[ticket/11386] Fix failing tests from constructor changes
[ticket/11386] Fix circular reference error & serialize error
[ticket/11386] Remove tests that check if finder cache is working
[ticket/11386] Forgot to get the migration classes
[ticket/11386] Update tests with new constructors for ext.manager/migrator
[ticket/11386] Use finder to find migration files
[ticket/11363] Fix to make get_module_infos get from all extensions
[ticket/11381] Make finder able to search in all available extensions
[ticket/11103] Revert whitespace changes
[ticket/11103] Few more minor language things
[ticket/11103] Don't call generate_board_url many times
[ticket/11103] Case time in queries as an int
[ticket/11103] Fix effectively installed check
[ticket/11103] Remove padding from notifications for now.
[ticket/11363] Fix a couple bugs and throw errors if the file not found
[ticket/11372] Migrator should only check if effectively installed if not
[ticket/11363] Load module info files for extensions too
[ticket/11103] Notifications Migration file
...
Conflicts:
phpBB/includes/functions_posting.php
phpBB/includes/mcp/mcp_queue.php
phpBB/includes/search/fulltext_mysql.php
phpBB/includes/search/fulltext_native.php
phpBB/includes/search/fulltext_postgres.php
phpBB/includes/search/fulltext_sphinx.php
phpBB/install/database_update.php
phpBB/styles/prosilver/template/ajax.js
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
# 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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
I didn't notice that there were actually leftovers from the other
PR. Anyway, this will remove all the leftovers I noticed from the
other PR.
PHPBB3-11171
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added what's needed so that the post in the report is parsed the
same way as it was being parsed when the post was reported
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
feature/softdelete-merge-develop
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10780] Use L_COLON on LDAP page.
[ticket/10780] Use L_COLON on search backend ACP pages.
[ticket/10780] Use L_COLON for "download all attachments".
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
[ticket/10780] Replace colon usage in template output with {L_COLON}
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
[ticket/10172] Show prosilver birthday list even if there are no birthdays.
[ticket/11050] make all properties protected in all search backends
[ticket/11050] get_common_words() returns empty array for sphinx
[ticket/11050] fix tidied search query docblock language
[ticket/11050] fix min/max length docblock language
[ticket/11050] multi sentences separated by period in docblocks
[ticket/11050] fix separated spelling in docblock
[ticket/11050] fix split words doc block language
[ticket/11050] remove class word from docblocks
...
Conflicts:
phpBB/install/database_update.php
phpBB/install/schemas/mssql_schema.sql
phpBB/language/en/acp/permissions_phpbb.php
phpBB/styles/prosilver/template/posting_editor.html
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* brunoais/ticket/10845:
[ticket/10845] Removed one empty line that wasn't supposed to be there
[ticket/10845] Two of the three colouns were missing in the DB update file
[ticket/10845] Remove censor from text
[ticket/10845] Now it shows the preview post parsed
[ticket/10845] Changed the report system. Now it saves posts with the bbcode
Conflicts:
phpBB/includes/functions_content.php
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In order to remove the censor, I added a new parameter to
generate_text_for_display(), that new parameter is used to tell if the text
should be censored or not. Defaults to true.
PHPBB3-10845
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
With this addition, the preview post in the report details now shows with the
BBCode parsed.
Note: Tested with all BBCodes I have including one personalised to write the <s>
BBCode.
PHPBB3-10845
|
| | | |/ /
| |/| |
| | | |
| | | | |
PHPBB3-11023
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-9567
|
| |/ / /
| | |
| | |
| | |
| | |
| | | |
So far, I've added no new functionality. The biggest change here is adjusting the DB column names to "visibility" rather than "approved". Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)
PHPBB3-9657
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add a new parameter to hold the name of the start variable. This
fulfills ticket PHPBB3-8535.
PHPBB3-10968
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.
PHPBB3-10968
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.
PHPBB3-10968
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.
PHPBB3-10968
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.
Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.
PHPBB3-10968
|
| | |
| |
| |
| |
| |
| |
| | |
New lines were missing in the reported_post_text.
By adding the bbcode_nl2br() became as it is supposed to.
PHPBB3-10600
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| | |
PHPBB3-10345
|
| |\ \
| | |
| | |
| | |
| | | |
* nickvergessen/ticket/10344:
[ticket/10344] Add attachment icons to list of reported and queued posts/topics
|
| | | |
| | |
| | |
| | | |
PHPBB3-10344
|
| |\ \ \
| | |/
| |/|
| | |
| | | |
* develop-olympus:
[ticket/10402] Fixed a formatting issue with report details.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Line returns were being removed and links weren't being made clickable.
This commit adds a line (contributed by AmigoJack) to retain the link
breaks and make links clickable.
PHPBB3-10402
|
| | |/
|/|
| |
| |
| |
| | |
Topic-Tracking is still missing.
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
|
| |
|
|
|
|
|
|
| |
Changed the wrong word "new" to "unread" as that is, what we show with the
red-icons, not whether the post is new or not. Language variables were
kept for backwards compatibility.
PHPBB3-7720
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10252 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
Authorised by: naderman
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10162 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9789 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
read. #31085
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9015 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8995 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
#33805
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8940 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8840 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8833 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8598 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8520 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8430 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@8223 89ea8834-ac86-4346-8a33-228a782c2dd0
|
