History | View | Annotate | Download (10.2 kB)
commit adfa1656fb9d8b5bb601af1d7a6720884954d87aMerge: bd579c8 af5b9a9Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 16:35:55 2010 +0100
Merge branch 'ticket/igorw/9556' into develop
merge changes from 3.0.x branch
Copy 3.0.x branch to trunk
Send emails for manual user activation if admin activation is enabled not through queue in ACP (Bug #50925)
[Feature] Added new functionality to inactive users module:- Ability to set users per page.- Ability to sort by posts/number of reminders/last reminded date.- Show number of posts and ability to search posts.- Show number of reminders sent to user.- Show date of last reminder sent to user.
Add anti-abuse email headers to acp_inactive.php and correct activation reminders
removed executable props [Bug #6464]
Hiding everywhere little buggers, eh?
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
#15914 (bogus log entry if answering NO on confirming removing inactive users)
some further fixes- re-introduce grabbing random number from /dev/urandom
forgot something
- Re-populate arrays on cache purge/save to allow re-using some functions without warnings- fix the annoying "last page empty" bug on inactive users page.
#14985
And one more confirm box.
dumdidum... sorry. ;)
Ok, here comes a big one. Poor updater. Also requires testing.
#i91#i92#i93#i94#i95#i96
again, a lot of bug fixes
- telling the admin for what the board contact and board email addresses are used for and also making sure this explanation is correct ;)- fixes for bugs #6694, #6664 and #6662
some fixes today- most important change is the consolidation of the display attachment functions; merging them together to have one function we need to call.
- re-add script_path for "strange configurations" to let them force the generated urls correctly- show rank title if no rank image present in memberlist- other fixes.
rather large update, most important things done:- implemented provided patch/diff file for bug #5350 (Highway of Life) with some tiny changes and alterations- more username/colour changes/fixes- added a note about PM rule-dependant message removals so the user is not wondering too much if he can't remember his rules. :)...
ok, i am an idiot...
- make sure the sql layer for mysql always states mysql4 and get to mysql if using mysql < 4- assign some default vars to email templates (we always need some basic ones)
- implemented the suggested html_entity_decode function made by david- fixed string length checking by also decoding entities for the sake of checking- used the new html_entity_decode function
- extend config checking to include check for writeable path- removed not utilized user_allow_email column from schema- removed inactive groups (they had no use at all, since inactive users are not able to login) The only benefit those brought are distinguish users - but this is no longer needed too due to the inactive code present. This also allows us to retain group memberships as well as default settings for users being set inactive due to profile changes....
consistent acp layout regarding backlinks and messages.
A reworking of how we handle inactive users
