| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| | |
Conflicts:
phpBB/styles/subsilver2/template/posting_body.html
|
| | |
| |
| |
| |
| | |
As per request in the PR.
PHPBB3-14695
|
| | |
| |
| |
| | |
PHPBB3-14695
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
phpBB/adm/style/acp_icons.html
phpBB/includes/acp/acp_groups.php
phpBB/includes/acp/acp_users.php
phpBB/includes/functions_acp.php
phpBB/includes/ucp/ucp_groups.php
phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
phpBB/styles/subsilver2/template/mcp_topic.html
phpBB/styles/subsilver2/template/posting_attach_body.html
phpBB/styles/subsilver2/template/posting_body.html
phpBB/styles/subsilver2/template/posting_poll_body.html
phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
|
| | |
| |
| |
| | |
PHPBB3-14272
|
| | |
| |
| |
| | |
PHPBB3-14447
|
| |\ \
| | |
| | |
| | | |
[ticket/14157] Allow to set the alt/title attribute on post icons
|
| | |/
| |
| |
| | |
PHPBB3-14157
|
| |/ |
|
| |
|
|
| |
PHPBB3-7362
|
| |
|
|
| |
PHPBB3-13997
|
| |
|
|
|
|
|
|
| |
Events added in events.md
Add in template posting_editor.html for link to custom panel
Add in template posting_layout.html for include of custom panel template body
PHPBB3-13843
|
| |
|
|
| |
PHPBB3-13710
|
| |
|
|
| |
PHPBB3-13346
|
| |
|
|
| |
PHPBB3-13346
|
| |
|
|
| |
PHPBB3-12862
|
| |
|
|
| |
PHPBB3-12648
|
| |
|
|
| |
PHPBB3-12648
|
| |
|
|
| |
PHPBB3-12648
|
| |
|
|
| |
PHPBB3-12648
|
| |
|
|
| |
PHPBB3-12640
|
| |
|
|
| |
PHPBB3-8785
|
| |
|
|
| |
PHPBB3-8785
|
| |
|
|
| |
PHPBB3-8785
|
| |
|
|
| |
PHPBB3-8785
|
| |
|
|
| |
PHPBB3-8785
|
| |
|
|
| |
PHPBB3-8785
|
| |
|
|
| |
PHPBB3-11915
|
| |
|
|
| |
PHPBB3-11915
|
| |
|
|
| |
PHPBB3-11972
|
| |
|
|
| |
PHPBB3-11972
|
| |
|
|
| |
PHPBB3-11972
|
| |
|
|
| |
PHPBB3-11972
|
| |
|
|
|
|
| |
Responsive PM editor, fix quickmod tools
PHPBB3-11552
|
| |
|
|
| |
PHPBB3-11552
|
| |\
| |
| | |
Fix subPanels() in forum_fn.js
|
| | |
| |
| |
| | |
PHPBB3-11563
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Fix subPanels() code
Modernize subPanels() with jQuery
Use HTML5 data attributes instead of including JS
PHPBB3-11563
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
feature/softdelete-1-permission
* phpbb/develop: (704 commits)
[ticket/11630] Improvements to the PHP lint pre-commit hook
[feature/auth-refactor] Move auth providers to separate directory
[ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
[ticket/11619] Some tests for get_remote_file().
[ticket/11617] Remove spaces and tabs from empty lines
[ticket/11617] Missing U_ACTION in acp_captcha.php
[feature/auth-refactor] Fix code style issue
[feature/auth-refactor] Fix comment grammar
[feature/auth-refactor] Fix the actual cause of test failures
[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/11585] Make $auth_admin class property
[feature/auth-refactor] A possible fix for the functional test failures
[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
...
Conflicts:
phpBB/docs/sphinx.sample.conf
phpBB/feed.php
phpBB/styles/prosilver/template/search_results.html
phpBB/styles/prosilver/template/viewforum_body.html
|
| | |
| |
| |
| | |
PHPBB3-11010
|
| | |
| |
| |
| | |
PHPBB3-11556
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
feature/softdelete-1-permission-rebase
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
[feature/events] Fix improperly named event in documentation
[feature/events] Fix alphabetization of events
[feature/events] Put events in alphabetical order
[feature/events] Make EVENTS.md lowercase
[ticket/11285] Use more granularity in dependency checks in compress test
[ticket/10880] The m_approve permisson no longer implies f_noapprove.
[ticket/10803] Show failure message until user dismisses it
[ticket/10954] Add missing semi-colon
[ticket/10954] Make sure to mark subforums unread and add small fixes
[feature/events] Use ` to escape HTML tags in markdown
[feature/events] Remove HTML tags from markdown so they don't get parsed
[ticket/10954] Miscellaneous coding fixes
[feature/events] Remove extraneous space
[feature/events] Add markdown template event documentation file
[feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
[feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
[feature/events] Fix typo in event name
[ticket/10763] Use self when calling get_extension() in filespec class
[feature/events] Fix more subsilver2 events
[feature/events] Fix some subsilver2 events
...
Conflicts:
phpBB/install/database_update.php
phpBB/posting.php
|
| | |
| |
| |
| | |
PHPBB3-9550
|
| | |
| |
| |
| |
| |
| | |
Apply change to existing ledges
PHPBB3-9550
|
| | |
| |
| |
| |
| |
| | |
This is needed for options for posts and is used by topic as link MOD
PHPBB3-9550
|
| | |\
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10879] Remove arrow icon from attachment link in editor
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If you upload a file with a long filename the filename will partially
cover the arrow icon background image. Remove the icon as it's not needed
anyways.
PHPBB3-10879
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Replace all the instances (I could find) where the colon is displayed
to the user with {L_COLON} so it can be localised.
PHPBB3-10780
|
| | |\ \
| | |/
| | |
| | |
| | | |
* develop-olympus:
[ticket/10661] Added to enumerated recipients (prosilver)
|