History | View | Annotate | Download (61.1 kB)
commit 7074d19c4087fab0e81a31bd806724d7eac7ef87Merge: ebc338b df622a1Author: Andreas Fischer <bantu@phpbb.com>Date: Tue Apr 5 00:31:42 2011 +0200
Merge branch 'develop-olympus' into develop
commit 5cc861712849392b8083577e3246803dbc95da4aMerge: ce92724 634392aAuthor: Igor Wiedler <igor@wiedler.ch>Date: Sun Mar 20 23:12:48 2011 +0100
Merge branch 'ticket/10021-develop' into develop
commit ce92724514f48a92cd88ada0c38e30fd7fa78404Merge: 30daee1 51fb493Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Mar 20 23:06:23 2011 +0100
commit 448df1cdf5d06e9457397ae439c04ad44084c2a9Merge: 6c49f95 4ac8eafAuthor: Oleg Pudeyev <oleg@bsdpower.com>Date: Tue Mar 1 16:57:00 2011 -0500
Merge branch 'ticket/9549' into develop
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
commit a885095897054c91ab68b753ce2a86ae74f2f666Merge: 9a39f55 c2ffa78Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Oct 10 18:39:44 2010 +0200
Merge branch 'feature/igorw/request-class' into develop
commit e4ff780c1370d9f743da0fffc70b98be0c7cfe92Merge: c4a65a4 dbe8fb6Author: Andreas Fischer <bantu@phpbb.com>Date: Sat Aug 28 23:34:18 2010 +0200
commit 693a2dc99bf07aeac1865d4a48ddf2589317ac7aMerge: b68de23 ac32927Author: Nils Adermann <naderman@naderman.de>AuthorDate: Wed Mar 3 23:32:09 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Wed Mar 3 23:32:09 2010 +0100
Merge branch 'develop-olympus' into develop...
merge changes from 3.0.x branch
Copy 3.0.x branch to trunk
Fix Bug #50475 - Only show "Add friend" and "Add foe" links if the specific module is enabled.
Authorised by: AcydBurn
populate who is online only where required
require link hash for switchperm
Change bug #47425 - IP data lost on pagination
Changes to r9617 Fix a template compilation issue, and reshuffle the code. The added template complexity made it more of a problem to check the variables correctly, hence simplification.
Fix bug #10519 - "View user notes" and "Warn user" links shown even if modules disabledAuthorised by: acydburn
Fixed bug #'ers 42585, 35505, 36675, and 42705Authorised by: acydburn
#43665
Fix a regression from r9075
do not display ban link for own profile
Only display special ranks to guests; no longer display normal ranks for guests (Bug #36735)[a bit ugly, but retains backward compatibility]
Do not display COPPA group in memberlist find member dialog if COPPA disabled (Bug #37175)
Fix, small cosmetic issue made in r9004 with sort urls
Fix r8929 and #35275
Make pagination work again, undoing rev8830 to fix #32515 properly
should make last_active work again
- Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting.- Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups.
Do not jump back to page 1 when hiding member search in memberlist. Closes #32515
actually, queued posts can also be in forums with no post counts
Show users posts in queue in acp and profile + link to mcp
Changes to group display #32155, #32145, #32085, #26675, #26265
#28595 (AVATAR_IMG available to memberlist_body.html)
same here, session id.
What use is a shiny banstick(TM) if nobody finds it?
#24435
Hiding everywhere little buggers, eh?
only allow users having the a_user permission to search by email address (later on there will most likely a new permission for general email visibility)
Pertain select single link on memberlist (Bug #23235 - patch provided by Schumi)
#22805
Try to sort last active date on memberlist correctly at least on current page (Bug #18665) - patch provided by phillipK
Correctly check empty subjects/messages (Bug #17915)Do not check usernames against word censor list. Disallowed usernames is already checked and word censor belong to posts. (Bug #17745)Additionally include non-postable forums for moderators forums shown within the teams list. (Bug #17265)
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
dumdidum... sorry. ;)
Ok, here comes a big one. Poor updater. Also requires testing.
#i91#i92#i93#i94#i95#i96
#i62 - #i65gone through every javascript invocation and making sure we adhere to our coding guidelines.
some fixes. :P- language authors may review their email template files...
ups
necessary changes...
- BBCode parsing order should ALWAYS be censor_text(), bbcode_secon_pass(), bbcode_nl2br(), smiley_text(), parse_attachments()- using \r on custom bbcodes to allow line breaks [Bug #10758]
do not get too excited
#13751Fixing date CPFs for multilanguage boards.
try to normalize everything...
Cleaning up (#13689)Also removed the useless login box from the ACP.
#13679#13681#13683
Adding finer error conditions to the IM contact page.Adds one language entry, moves one from viewtopic to common.
again, a lot of bug fixes
#13107#13107
some fixes. :)
some fixes...
fixing some bugs
yeah, forgot these few lines. :(
tweak the sql_like_expression feature a little bit to allow correct escaping
new wrapper for LIKE expressions to streamline the fixes. We actually need to adjust them for different DBMS as well as SQLite2 not supporting escaping characters in LIKE statements (which is a reason why we think about dropping sqlite support completely).
Changing the behaviour of the hideonline permission.
Test the current setting before altering the memory limit during install(Bug #12195)
And another language var.
ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
Adding a little more exlanation about flash.Enabling FLASH per default while leaving the default permissions to disable it.There might be no mods and admins visible one a board#12185
#10823
Make the life of style authors not too complicated.
added class for disabled options in ACPE_USER_ERROR now using language keys if available [related to #10445]UCP/MCP title tags [#10441]Check $start parameter in viewforum [#10435]Check for postable forum for moving user posts within users ACP [#10433]...
"Ghost" topics in active topics list when shadow topics and corresponding topic in same resultset [#10313]Find a member supporting hidden groups for those able to see them [#10305]Display hidden groups for all those able to see them across the board (composing messages, viewonline)...
fix wrong query for searching by group id. If not within group mode we only need the user details too (hopefully)
#10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995MCP fixes for user notes/warnings - #9981Preserving imageset values on save/editfind a member link for Mass PM's - #9925...
#9985
- m_warn is no longer a local moderation permission- magic urls should properly use html entities- speed up posting on big boards, MAX query can be simplified a lot in certain cases- user IP list should be labelled with "Other users" [Bug #9707]
my take on getting the bugs down... thanks to those also providing (usable) solutions to the problem. ;) Of course also to those reporting generally...
#9674
#9605
other fixes...
display those as admins having admin permissions and being within the administrators group (admin group does not need to be the default one)
help day!!!!it would help to limit the number of rows returned... we are not dolly the sheep. :P
grmbl
again... some more fixes.
- fix some group specific bugs- correctly determining terrafrost's birthday mod
#8470
- subtle, very subtle
- pretty sweet speed increase
fixing some bugsmore mcp links for easier moderating different aspects (all, forum, topic)i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected.
some fixes to be committed.
only some minor fixes
- fix some oddities (doubled spaces for example)- changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier.- Changed some permission namings based on suggestions by the community...
