| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
| |
PHPBB3-12187
|
|
|
|
| |
PHPBB3-12234
|
|
|
|
|
|
| |
Missing changes on memberlist view due to missing functionality
PHPBB3-12169
|
|
|
|
| |
PHPBB3-12115
|
|
|
|
| |
PHPBB3-12115
|
| |
|
| |
|
|
|
|
| |
PHPBB3-11031
|
|
|
|
| |
PHPBB3-11031
|
|
|
|
| |
PHPBB3-11031
|
|
|
|
| |
PHPBB3-11031
|
|
|
|
| |
PHPBB3-11031
|
|
|
|
| |
PHPBB3-11031
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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-11015
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/11135] Full replacement of credit link to https
Conflicts:
phpBB/install/convertors/convert_phpbb20.php
|
| | |
| | |
| | |
| | | |
PHPBB3-11135
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | |
| | |
| | |
| | | |
PHPBB3-9567
|
|/ /
| |
| |
| | |
PHPBB3-9567
|
| |
| |
| |
| | |
PHPBB3-9916
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
|
| |
| |
| |
| | |
PHPBB3-9416
|
| | |
|
| |
| |
| |
| |
| |
| | |
I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...)
PHPBB3-10045
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
[ticket/9953] Set focus to password on re-authentication
[ticket/9905] Add SQLite to the DSN description
[ticket/9859] Remove years from the credit line.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Call phpbb_set_encoding() on 'default_dateformat' to properly re-encode
non-ascii characters that might be in default_dateformat.
E.g. "d M Y à H:i"
PHPBB3-9348
|
|/
|
|
|
|
|
|
|
|
|
|
| |
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/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
target phpBB version number for the phpBB2 convertor and convertor version number. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10148 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
| |
- add option for minimum post chars (which is a required setting for quick reply, therefore we introduce it here)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9656 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9333 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9312 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9155 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
A_Jelly_Doughnut)t)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9113 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9036 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8619 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8492 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
|
|
|
| |
#21215
#18575
#18435
#16565
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8379 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@8274 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@8250 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@8216 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
found? If so, go, head to the bug tracker or message me through IRC. ;)
git-svn-id: file:///svn/phpbb/trunk@8191 89ea8834-ac86-4346-8a33-228a782c2dd0
|