| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
PHPBB3-12594
|
|
|
|
|
|
| |
Also fixed the empty option which is not allowed.
PHPBB3-12045
|
|
|
|
| |
PHPBB3-11236
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/develop: (2171 commits)
[ticket/11164] Update composer.phar
[ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
[ticket/10933] Dependency inject template context.
[ticket/10933] Expanded prose documentation for phpbb_extension_provider.
[ticket/10933] Specify empty template path for absolute includephp test.
[ticket/10933] Useful documentation for template locate function
[ticket/10933] Typo fixes
[ticket/10933] Initialize template context when template is constructed.
[ticket/11099] Mark acp_ban::display_ban_options() as static.
[ticket/11158] Require acl_u_sig for ucp signature module.
[ticket/11158] Revert old fix in PHPBB3-10186.
[ticket/11159] static public is the currently approved order.
[ticket/11157] static public is the currently approved order.
[ticket/11157] Fix remaining captcha spam.
[ticket/11157] get_captcha_types is an instance method.
[ticket/11156] Delete "Misc" tab of forum based permissions + move items
[ticket/10848] Move include up.
[ticket/11014] Fix old pagination assignment
[ticket/11018] Fix several paginations in ACP
[ticket/11014] Fix IF statements for new template pagination
...
Conflicts:
phpBB/includes/functions_user.php
|
| |
| |
| |
| | |
PHPBB3-9916
|
| |
| |
| |
| | |
PHPBB3-9622
|
|/
|
|
|
|
|
| |
Adjust two language strings for ACP prune feature to include descriptions for
new features.
PHPBB3-9622
|
|
|
|
|
|
|
|
|
|
|
|
| |
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@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
| |
#14596
info file changes
git-svn-id: file:///svn/phpbb/trunk@8135 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
|
|
| |
#10741
Confirm box on pruning forums - #10619
Not stripping empty lines on parsing messages - #10579
Remove reports alongside with users - #10501
git-svn-id: file:///svn/phpbb/trunk@7527 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7524 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
| |
fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)
git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7043 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@6975 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@6623 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@6428 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@6416 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
nothing
has blown up! ;)
The basic style guide is:
1) British English, Cambridge style... ie: -ise, not -ize, etc.
2) Sentence-case pervasively with exception of acronyms/abbreviations, which if not in their contracted form, shall be in title-case. If you don't like it, you can
restyle it via CSS using text-transform: none|uppercase|lowercase|capitalize; ...
additional hooks may be added to the strings to assist this.
3) For those that have missed the switch to UTF-8, it means that the language files need not use numeric entities anymore. <, > and & stay though, as
they must always be entitised.
There'll be more tweaks and changes, though this "big 'un" is out of the way and will get progressively chilly so that it can be frozen for RC1 after
however many betas there may be. ;) Wooh! :P
git-svn-id: file:///svn/phpbb/trunk@6399 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
|
|
|
|
| |
solution for PHP 4.3.3/4 ASAP) [side effect: fixes Bug #3762]
- take local server time into consideration for birthday/age calculation
- faster active topic search
- allow changing active topic time frame [Bug #4150]
- reload stylesheet on language change [Bug #4222]
git-svn-id: file:///svn/phpbb/trunk@6380 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
| |
- removed a few duplicates with equal contents [Bug #1193]
git-svn-id: file:///svn/phpbb/trunk@5904 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
|
| |
different forum types [UI])
- Changed += for arrays into array_merge. We do not want to append, we want to merge. ;)
git-svn-id: file:///svn/phpbb/trunk@5330 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
- prune users
- prune forums
git-svn-id: file:///svn/phpbb/trunk@5325 89ea8834-ac86-4346-8a33-228a782c2dd0
|