Merge Dev into Master #57
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…gos and added a generic logo.png
… Data/logos and added a generic logo.png" This reverts commit a77fcc6.
… the base pagemanager
…de of things, added a page picker
…an set allowed file extensions in the web.config. Changed some methods in the SiteUtils when checking against allowed file extensions, and changed some calls to the old methods.
…l for the non-existant file.
…here was a space dash space it wouldn't output dash dash dash
…ing to clean up their names. Cleaned up File Manager JS formatting a bit as well.
…ds to use HttpResponseMessage, generally cleaned up and refactored code
…elpLink to allow setting additional CSS classes from the theme.skin.
…s setting to use the moono-lisa skin.
Renamed "framework-3.3.7" to "framework", cleaned up the initial content message templates to use "logo.png" and cleaned out Audette's old welcome message.
…anything. Fixed WebStore FlexCartLink where ModuleGuid was actually supposed to be StoreGuid. Neither are really needed so we don't do anything with ModuleGuid on this control anymore.
Only the database setup files of the database you're building for get copied during publish.
Added setting "UseSSLForFeedLinks" to web.config and implemented with blog rss feed link, default is true. Resolves #53 Promoted SiteSettings object to protected so it can be used in the pages which are built on it. FeedManager will not properly append the InternalSecurityByPassKey GUID to urls, regardless of .aspx extension. Resolves #54 Added Display Setting "RssFeedLinkFormat" to allow skinners control over the rss feed link.
Checked for null on element before binding event.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.