History | View | Annotate | Download (13.7 kB)
commit df096b6b52f9198561d689b505a8c74a0d0f86b6Merge: db70d61 2f57bfbAuthor: Oleg Pudeyev <oleg@bsdpower.com>Date: Fri Mar 11 21:55:46 2011 -0500
Merge branch 'develop-olympus' 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 36820a4f4f099b20d83044416ec208c7a4cbf63cMerge: 8943cab 67b243cAuthor: Andreas Fischer <bantu@phpbb.com>Date: Sat Oct 30 12:43:08 2010 +0200
Merge branch 'ticket/rxu/9867' into develop
Copy 3.0.x branch to trunk
Fix bug #47575 - Disable word-censor option in UCP lacks the config-setting - Patch by 00mohgta7
Authorised by: AcydBurn
Make sure users still get notifications if they set to only be notified by Jabber, but Jabber service disabled. (Bug #29715 - Patch by Paul)
#34045
Hiding everywhere little buggers, eh?
One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)Although i somehow mistakingly got #20445 and #15249 into it. :/
Removing s_watching_img from watch_topic_forum() function (Bug #20445)Changing order for post review if more than one post affected (Bug #15249)...
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
- fixing some very very nasty opera bugs by changing the clearing method we use.- also properly apply preg_quote to some strings.
Maybe we shouldn't trust the language settings in the db so much.
forgot the true
do not substract one year, only show the full date to not confuse users.
#10067
Never noticed the date output in the dropdown was dynamic... so made sense to actually use the relative days feature to actually show how it works by placing "Today" within the date, and append it with a date of how it'd be formatted it it wasn't yesterday/today/tomorrow by offsetting the time() by 1 year negatively....
#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...
- a bunch of fixes- added todos to the updater to make sure i do not forget. :)
Using a different approach for the data updates (same as the schema updates)
#4892
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. :)...
- fixing a bunch of bugs- moved the install trigger error to sessions and also disabled it for those having DEBUG_EXTRA enabled.i hope not having introduced too many new bugs.
- use the $var_ary for settings in a more logical way (hopefully removes the clutter and shows where which variable is set how)- hopefully utf8 passwords are working too now
Do not show styles select if overriding style
- no more encoding mixture, say hello to UTF-8 (I'll add a validation 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]...
- some bugfixes- set ip_check to A.B.C. by default- display postings in other encodings by default and present link to force the encoding as usual.
make sure custom profile fields are created correctly on registration (#2225)
- get swatch converted into new acp format- add page title to ucp pages- add ability to supress getting the who is online list in page_header() (saves us ideally 1-2 queries on ucp/mcp pages)- fixing pm rules a bit as well as now having complete author memberships for author_in_group (sender -> is in usergroup -> xxx)
- fixed a few bugs- added user_add() function- check posted images ([img]) for same domain/scipt and php files- auth_api.html updated to the coding guidelines look&feel- introduced ability to force non page-updates (cron is using it)- correctly resend coppa email
ok, this one is rather large... the most important change:re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different
apart from this, code cleanage, bug fixing, etc.
- introduce LA_, UA_ and A_ template variables (they allow styles to use template variables used for javascript in subSilver outside javascript in their own template while they won't break our javascript if they contain quotes) also fixes [Bug #1116]- corrected page title for search indexing progress bar [Bug #1695]...
- check m_ permission for quickmod [Bug #1317]- don't sync the global forum (id 0) [Bug #1383]- corrections to available time zones [Bug #1306]- only display open reports on mcp_front- added whois information to mcp_post [Bug #1400]- copy "dot" when copying a topic [Bug #1321]...
ok, thought about this now for too long. I think the best solution circumventing memory consumption and not introducing "hacks" is to seperate module information (and probably more in 3.2 for installation/uninstallation) from the main code.
- extended session_page and user_lastpage to hold a maximum of 200 chars (instead of 100) - session_page gets truncated to 200 chars- streamlined the process of generating text with bbcode/smilies/urls (forum rules, forum descriptions, group descriptions at the moment)...
- some adjustments for search related config options- one year is 365 days long (52 * 7 = 364, but we have one more day each year ;-)) [Bug #1181]- fixed search own posts link in UCP [Bug #1163]- corrections to timezone selection [Bug #1148]- fix quickmod tools on post details page [Bug #1188]
- streamlined reports to consist of the feature set we decided upon (Nils, your turn now)- use getenv instead of $_ENV (with $_ENV the case could be wrong)- permission fixes (there was a bug arising with getting permission flags - re-added them and handled roles deletion differently)...
- added "display_on_posting" setting to custom bbcodes (creates a button with the bbcode tag)- fixed forum editing and parent id selection- completely removed HTML support (it only creates security problems)- changed cache_moderators() to reflect permission changes
- user avatar, user signature, user attachments
- drop in the new administration panel- not finished yet: some user related items, style admin, database admin and permissions- Graham: Please add your MCP schema data to the schema data file. ;)
- added acp_language (language pack management)- minor adjustments to cope with PHP5.x
- some ucp changes (added the module info too)
- changed ucp classes to work with the new module system- mcp is no longer working, i know.
- Documentation related changes- added resend activation email dialog- fixed issue in session code- log failed/successful admin re-authentication/login- fixed simple forum dropdown box (used in mcp and posting)
- and my second attempt
- bugfixes- default sort options for posts too- adjusted format_date to remove the (time intensive) preg_ calls- temporary style.php code.
more ucp updates
- ucp register/remind/activate fixes mostly regarding account activation- general ucp fixing (profile and ucp_main)- created three new functions (return correct topic author string, generate topic related pagination and get topic type/status...). These general bits are used on several pages (subscribed topics, bookmarks, viewforum)....
my turn to break the forum (and at least pm's are no longer working - will not last long). HARRRR
This is a mass commit ... expect trouble! Changes made here are primarily to how login is handled, schema changes necessary!
- removing karma
- added folder_moved image- new feature: bookmark topics- fixed post details link- added confirmation screen to cookie deletion
ucp updates
- put consoring and smilie processing into functions (we use them all over the place) for better changing and consistency.- changed docs/AUTHORS to reflect the recent code re-use in functions_messenger.php- pleasing the users a little bit more by using table constants. :D...
Let's break lots of things
Change in format of module db data, add zebra, many things probably "damaged goods" for now ... don't panic Mr. Mainwaring, don't panic
Some re-arrangement of validation routines to improve extensibility
Updates mainly for removal of extension + header comment ... moved some aspects of ucp around, further work to be done on these areas ... not commiting search for time being
Move certain methods out of ucp class, move ucp class into ucp, break half a dozen other features, introduce x hundred new, exciting bugs
More attempts at breaking source
Majority are UCP related updates ... avatars should now work, aside from gallery, fixed a few other issues, updated schema/basic
More functions added ...
Further updates
Hello!
