History | View | Annotate | Download (114.8 kB)
commit aa8f4000d30a3f89cb876eb14e3b7522c68f90f0Merge: c78637d 9a9b156Author: Oleg Pudeyev <oleg@bsdpower.com>Date: Thu Mar 10 05:22:37 2011 -0500
Merge branch 'ticket/rxu/10035' into develop-olympus
commit 15a5d2c4bf87918dc85aec84b9017226834572d7Merge: 6944941 65020fdAuthor: Oleg Pudeyev <oleg@bsdpower.com>Date: Mon Feb 21 20:47:31 2011 -0500
Merge branch 'ticket/nickvergessen/9675' into develop-olympus
commit 250c04c8d5f7e7ee142bcdd2992abbc37b00654cMerge: dfd3c4a 3cbcff5Author: Andreas Fischer <bantu@phpbb.com>Date: Sat Aug 28 23:25:14 2010 +0200
Merge branch 'ticket/nickvergessen/7296' into develop-olympus
commit dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10cMerge: 3c02a1c 5e33004Author: Andreas Fischer <bantu@phpbb.com>Date: Sat Aug 28 23:25:05 2010 +0200
Merge branch 'ticket/nickvergessen/9519' into develop-olympus
commit cd46b399678db9f7a10f6395b2920135800c41fdMerge: e4a1f08 c3a5fd3Author: Andreas Fischer <bantu@phpbb.com>Date: Sun Aug 22 21:50:17 2010 +0200
Merge branch 'ticket/jellydoughnut/9646' into develop-olympus
commit f97d0e0195de5f7d0d6ad4a4c5663b95971f96f3Merge: e35392c 4349becAuthor: Nils Adermann <naderman@naderman.de>
Merge branch 'bug/nickvergessen/59135' into develop-olympus
Fix r10360, Bug #55665
Bug #55665 - Restrict search for styles/../style.cfg to folders.Authorised by: bantu
Fix wrong error message for non-writable template file in acp_styles.php - Bug #50045
Coding guidelines in r9629
Fix bug #47345 - Check if template file is empty before trying to read from it.Authorised by: acydburn
Fixed bug #14304
Authorised by: AcydBurn
Fix bug #46145 - Template cache error for files of template-subfolders
Authorised by: acydburn
Fix bug #45705 - Show error in the ACP when template folder is not readable.Authorised by: acydburn
late fix for #45135
add missing $super assignment - Bug #43635
#43965
Inherit the bitfield
#42985 - use path in JS instead of name
Fix imageset editing for retaining and correctly setting dimensions for images, as well as displaying correct settings for first page load.
Make sure a style set to "default" is also always active. ;) (Bug #37475)
problems with case handling #36725
Provide a way to disable the config write check and rename the ACP style editor disable constant
Fix problems with styles using an underscore within the filename. (Bug #34315)- Also display inheriting template on style installation (previously, it was only displayed on template installs)- Fixes undefined variable in error message if inheriting style does not work...
some changes for proper code documentation
more verbose style.php in DEBUG mode
cleaning tpl fallbacks up
#30735
Okay. Frozen, we never said anything about it being permafrost. Also, this is not 100% tested, expect troubel with store_db (I'm waiting for the bug reports)
Thanks NBBN
Hiding everywhere little buggers, eh?
some language/style/code fixes (refer to the diff of the changelog)
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
make sure we always check for a valid directory handle
#14850
some bugfixes
dumdidum... sorry. ;)
#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...
some bugs fixed
- properly export localized imagesets
err, forgot to commit
try to normalize everything...
again, a lot of bug fixes
- search result extract shouldn't end in the middle of a multibyte character [Bug #11863]- missing localisation for an imageset shouldn't create lots of "imageset refreshed" log messages [Bug #12027]- explain that themes which need parsing cannot be stored on the filesystem [Bug #11134]...
even more fixes. :o
basically what is listed within the changelog. ;)
do as advertised :/
different approach actually
let's try to correctly catch some conditions as well as letting the cache being updated correctly
some fixes...
#12423
Introducing the ability to manually set the dimensions of an image in the imageset editor.A little spelling.
Introduces new language variable(s).
#11925#11675
#12251
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 few safeguards to stop people from breaking their own boards ;)Translators, I'm sorry but this means some work for you.
#11255#11259#11291#11335#11457#11473#11475#11511#11523#11527
Ooops, sorry
#11144
no duplication of icons...
#11042
Revisiting #11024Making a few things prettier in the progress.
#11024
Forgot this one, bleh. :|
Theme editor replaced with something more basic, it was not robust and was more error prone
We do not support nesting code tags - #10763#10741Confirm box on pruning forums - #10619Not stripping empty lines on parsing messages - #10579Remove reports alongside with users - #10501
Better support for nested transactions...
some language-specific adjustementsfix 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)
#10125
#10127
#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...
- overhaul of imagesetsimagesets are now "intelligently" multilingual, one may use imagesets inside of CSS files now (as well as properties like the width and height of an imageset's image)all previous styles should change their imageset.cfg to be like prosilver and subsilver2 (notice how there is now an imageset.cfg in the /en folder, there should be one for each language)
#8784
- acp popup, shouldn't require 700 px width- throw an error if an image that's edited into an imageset doesn't exist- convert the password not its hash ;-)- only update user_login_attempts if necessary- make password requirements even clearer
#5194
- make required_template/required_theme/required_imageset in style.cfg work as intended
allow the template bitfield being specified by the author if he do not want to use some hardcoded tpl bits...
- Pruning doesn't lower user post counts anymore [Bug #7676]- Better resync explanations in ACP- relative link to board shouldn't result in an empty link [Bug #7762]- allow spaces to define multiple classes [Bug #7700]- forgot addslashes for password conversion [Bug #7530]...
- allow underscores in CSS class names / ids- remove control characters from clean strings, and map all space characters to ASCII space (\x20)
- 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...
- correctly check custom class names [Bug #7206]
#7274
fixing some bugs, most being submitted grammatical/spelling errors.
- fixing some bugs- removing utf8 characters from email files (has been discussed internally, you guys know why)- making sure some opendir calls are checked before calling readdir.
- new homographs or IDN confusables ( http://www.unicode.org/reports/tr39/data/international.txt )- also added character names to old homographs- pagination_sep theme option removed, PAGINATION_SEPERATOR can be set in language files and the theme can overwrite it using span.page-sep [Bug #6872]
elseif -> else if
- finally correctly calculate current time for birthday calculation [Bug #6030]- allow searching forums with unsearchable subforums [Bug #6056]- addition of an optional HTTP_X_FORWARDED_FOR check in sessions, including bans- do not index forums which have indexing disabled on index recreation [Bug #6060]...
some tiny bugfixes.
blah ..
#4892
Message for my last commit (no I didn't intent it to be "message"):- include forums without search indexing in author searches and egosearch [Bug #5530, #4782]- allow changing search options when there are no results if a pre-defined search is used- added user_pass_convert flag for unconverted phpBB2 passwords and password conversion on first login...
ok, i am an idiot...
Missed that there were 2 open against this file
