Commit Graph

1174 Commits

Author SHA1 Message Date
Sebastiaan Janssen c19deaa47e Maybe removing web.config helps 2015-06-24 15:38:29 +02:00
Sebastiaan Janssen 0685fbcb15 That didn't help, maybe hardcoding DeployOnBuild will? 2015-06-24 15:31:46 +02:00
Sebastiaan Janssen 203da6c989 uProject shouldn't be a web project, it interferes with the deploy 2015-06-24 15:26:51 +02:00
Simon Busborg 5132e5b6bc Balanced width to topic / Categories 2015-06-24 15:14:55 +02:00
Sebastiaan Janssen 07cf2075f7 Attempt to deploy only this project, not all of them 2015-06-24 15:12:24 +02:00
Sebastiaan Janssen 97a582773d HtmlEncode avatar url's to avoid spaces and other weird characters breaking it 2015-06-24 15:12:24 +02:00
Rune Hem Strand 68a1e6b409 Merge branch 'master' of https://github.com/umbraco/OurUmbraco 2015-06-24 14:54:47 +02:00
Rune Hem Strand ea00aa98d3 Merge branch 'master' of https://github.com/umbraco/OurUmbraco
Conflicts:
	OurUmbraco.Site/Assets/css/style.min.css
2015-06-24 14:54:04 +02:00
Sebastiaan Janssen 4d87bb5473 Fix templatesettings 2015-06-24 14:51:30 +02:00
Sebastiaan Janssen b1715f71e0 Crop avatars larger so they'll look nice on retina as well 2015-06-24 14:31:17 +02:00
Rune Hem Strand 19d229dc11 Add "Edit on Github"
Global breadcrumb styling
Fixed header styling on pages with sidebar
2015-06-24 14:23:05 +02:00
Simon Busborg a0a0387aa1 Global BG and Border on comment 2015-06-24 14:20:18 +02:00
Sebastiaan Janssen 7b5e9f53da Fix proper 404 handling 2015-06-24 14:17:07 +02:00
Simon Busborg e83dc57760 Removed disabled class from button 2015-06-24 14:12:35 +02:00
Sebastiaan Janssen bf586d5ff8 OUR-238 Disabled forums still show create button and no notification
#OUR-238 Fixed
2015-06-24 13:43:13 +02:00
Simon Busborg 432c00f027 Changed draft button color, to match rest of our 2015-06-24 13:26:50 +02:00
Sebastiaan Janssen c775a403c1 I broke it! Forgot to turn this into a list. 2015-06-24 13:18:13 +02:00
Simon Busborg 3c1991d7a3 Changed forum thread header to use flexbox
Changed transparent buttons to use color-space instead og color-grey.
Changed version tag to use color-space instead of color-grey
Changed body-meta to use flexbox, to align topic and tags.
2015-06-24 12:28:38 +02:00
Sebastiaan Janssen c8b1b3dbe9 Forgot wiki editor!
#OUR-231 Fixed
2015-06-24 12:22:55 +02:00
Sebastiaan Janssen 8dad0921a9 Make sure that members get automatically Approved = true (has nothing to do with spam, but is needed for new membership provider after the umbraco upgrade) 2015-06-24 11:39:31 +02:00
Sebastiaan Janssen 24dfa37600 OUR-231 Legacy profile badges have returned
#OUR-231 Fixed
2015-06-24 11:39:30 +02:00
Simon Busborg 2ebe6db057 Fix: Floating karma, to much karma 2015-06-24 11:05:07 +02:00
Sebastiaan Janssen cfeb57a71e Cleans up LatestActivity.cshtml a littl 2015-06-24 10:23:41 +02:00
Simon Busborg 7930806335 Fixed equal height on forum frontpage 2015-06-24 10:19:49 +02:00
Sebastiaan Janssen daa9fbe09f Moves some namespaces around so that it's a bit more nicely organized 2015-06-24 10:05:12 +02:00
Sebastiaan Janssen 88221443d2 Copy/past snafu ;) 2015-06-23 17:20:06 +02:00
Sebastiaan Janssen 1f7e495c8b Remove deleted file from csproj 2015-06-23 17:13:21 +02:00
Sebastiaan Janssen ec746af4e1 Fix LatestActivity 2015-06-23 17:03:20 +02:00
Sebastiaan Janssen 36ec126703 Update dependencies 2015-06-23 17:02:25 +02:00
Sebastiaan Janssen c573b69c23 Fix autoprefixer 2015-06-23 17:02:12 +02:00
Sebastiaan Janssen 3aad1fb3f8 method got duplicated 2015-06-23 17:01:42 +02:00
Sebastiaan Janssen ab25334b8b move dependency to package.json
Conflicts:
	OurUmbraco.Client/package.json
	build/BuildClientFiles.bat
2015-06-23 16:33:28 +02:00
Sebastiaan Janssen e9eb73afa7 Merge branch 'v7-upgrade-test'
Conflicts:
	Notification/Notification.csproj
	Notification/packages.config
	NotificationsWeb/NotificationsWeb.csproj
	NotificationsWeb/packages.config
	OurUmbraco.Site/Assets/css/style.min.css
	OurUmbraco.Site/Assets/js/editor.min.js
	OurUmbraco.Site/Assets/js/jquery.ajaxfileupload.js
	OurUmbraco.Site/OurUmbraco.Site.csproj
	OurUmbraco.Site/Views/MacroPartials/Forum/TopicForm.cshtml
	OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml
	OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml
	OurUmbraco.Site/Views/Partials/Forum/Comment.cshtml
	OurUmbraco.Site/Views/Partials/Forum/Question.cshtml
	OurUmbraco.Site/masterpages/Master.master
	OurUmbraco.Site/masterpages/Projects.master
	OurUmbraco.Site/masterpages/Release.master
	OurUmbraco.Site/masterpages/RepositoryMaster.master
	OurUmbraco.Site/packages.config
	OurUmbraco.Site/usercontrols/our.umbraco.org/EventEditor.ascx
	OurUmbraco.Site/web.config
	our.umbraco.org/our.umbraco.org.csproj
	our.umbraco.org/packages.config
	our.umbraco.org/usercontrols/EventEditor.ascx
	uDocumentation/packages.config
	uDocumentation/uDocumentation.csproj
	uEvents/packages.config
	uEvents/uEvents.csproj
	uForum/packages.config
	uForum/uForum.csproj
	uPowers/packages.config
	uPowers/uPowers.csproj
	uRepo/packages.config
	uRepo/uRepo.csproj
	uVersion/packages.config
	uVersion/uVersion.csproj
	uWiki/packages.config
	uWiki/uWiki.csproj
2015-06-23 16:22:04 +02:00
Sebastiaan Janssen b04ccc219a Pulls in latest updates 2015-06-23 15:23:04 +02:00
Sebastiaan Janssen a35a7e9a03 Adds the client files + builds using gulp automatically on a project rebuild or using the BuildClientFiles.bat 2015-06-23 15:15:55 +02:00
Simon Busborg 9e69830b08 removed category type. added text to forum 2015-06-23 13:33:43 +02:00
Simon Busborg f122c7f0f5 removed UL in forum overview on frontpage 2015-06-23 13:21:54 +02:00
Simon Busborg 2d30329a5d changed link color on solution for more contrast 2015-06-23 11:53:05 +02:00
Sebastiaan Janssen f718a7836e Link avatar notification to the correct page 2015-06-23 11:36:44 +02:00
Simon Busborg ddb793877d Added notifications to quickmenu 2015-06-23 11:33:18 +02:00
Sebastiaan Janssen 5dc3eb618e WIP encourage people to upload larger avatars 2015-06-23 10:57:01 +02:00
Sebastiaan Janssen 6dc00ec763 #OUR-223 Fixed
OUR-223 visiting my own members page throws a server exception
2015-06-23 10:12:39 +02:00
Simon Busborg 76b055fee2 Added "recent" posts to the frontpage view 2015-06-22 17:10:54 +02:00
Simon Busborg 12be07ab90 Changed font sizes, changed button colors 2015-06-22 17:07:22 +02:00
Simon Busborg aa4adb9fce Changed button om forum frontpage 2015-06-22 15:11:47 +02:00
Simon Busborg 85501f0e18 changed styles for alertbar, added leaderboard
Added styles for leaderboard
changed styles alertbar
2015-06-22 15:04:47 +02:00
Simon Busborg 02d84b9973 Changed button to forum, to large green 2015-06-22 13:48:11 +02:00
Sebastiaan Janssen 63a31e2a3a OUR-219 Project Edit - Hot fixes can be uploaded to package files but are no longer displayed on the project page 2015-06-21 19:07:33 +02:00
Sebastiaan Janssen 7523dc997f Show error on profile page when after uploaded avatar is too small. Disable CDF for now. 2015-06-21 18:56:15 +02:00
Sebastiaan Janssen 7ffe6e1993 Corrects avatar size 2015-06-21 17:21:34 +02:00