swcs/OurUmbraco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,048 Commits 12 Branches 0 Tags
master
Commit Graph

102 Commits

Author SHA1 Message Date
Sebastiaan Janssen 10335a8788 Some more error fixing after noticing them in the logs 2015-08-02 12:07:41 +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
TimGeyssens e81b3aea62 Breadcrumb update 2015-02-25 13:52:23 +01:00
Rune Hem Strand 8601b5b631 Breadcrumb fix 2015-02-04 15:20:16 +01:00
Rune Hem Strand dfdafd397a Various forum markup 
Create topic button
Reply to topic button
 2015-02-03 14:58:36 +01:00
Sebastiaan Janssen 20569a1aee Make urls protocol-relative so they'll load on SSL without browser warnings 2015-02-01 19:35:26 +01:00
ploug@umbraco.dk 56a2ace7d2 Initial commit of our WIP 
This is very likely break the dev site
 2015-01-26 13:13:06 +01:00
Sebastiaan Janssen 48dc8b0ca2 Merge branch 'master' into v7-upgrade-test 
Conflicts:
	OurUmbraco.Site/OurUmbraco.Site.csproj
	OurUmbraco.Site/packages.config
	OurUmbraco.Site/web.config
	our.umbraco.org/app.config
	packages/repositories.config
	uEvents/packages.config
	uRelease/packages.config
	uRelease/uRelease.csproj
	uRepo/RepoStartupHandler.cs
	uRepo/app.config
	uRepo/packages.config
	uRepo/uRepo.csproj
 2015-01-16 11:09:25 +01:00
Per Ploug 9ae5daa88c Create rss-help.xslt 2014-12-17 12:21:08 +01:00
Sebastiaan Janssen af6dfe3641 Merge with master and upgrade to 7.2.0 2014-12-06 14:53:53 +01:00
Sebastiaan Janssen 30bc400429 Some /base links were not yet updated 2014-09-14 17:23:04 +02:00
Sebastiaan Janssen a902176480 Update the /base calls in the our.umbraco.org project 2014-09-14 17:08:57 +02:00
Sebastiaan Janssen f3b2a564f4 Fixes some web api problems 2014-09-14 13:52:24 +02:00
Sebastiaan Janssen d9b49e4035 Forum links don't need a urlPrefix 2014-09-12 19:46:54 +02:00
Sebastiaan Janssen 970a08316d Fixes problem that umbraco.library.GetCurrentMember() and Exslt doesn't work any more 2014-09-12 19:46:22 +02:00
Sebastiaan Janssen f500ad62ff NuGet all the things! Or .. at least NuGet UmbracoCms.Core. :) 2014-09-12 17:40:14 +02:00
Sebastiaan Janssen d157bc940b Allow for deletion of members by HQ 2014-08-30 12:59:04 +02:00
Sebastiaan Janssen dd7343e39e Merge pull request #31 from greystate/paginate-notifications 
Paginate notifications on member's profile
 2014-08-30 11:37:15 +02:00
Jeavon Leopold e9112ab900 Remove "Macro" reference in docs listing 2014-08-26 15:12:14 +01:00
Paul Sterling f0da3d4b49 Updates the front page documentation widget to display current content 2014-08-24 12:16:35 -07:00
paulsterling c4428939c4 Merge pull request #26 from Jeavon/master 
Temporary replacement with fixed content for current "New documentation"...
 2014-08-22 11:37:57 -07:00
Jeavon Leopold cec2a2f39f Fix Core Contrib badge and also fix displaying multiple badges on form posts 2014-06-24 10:28:07 +01:00
Chriztian Steinmeier 5999ed8c60 Tweak styling of "current" item in pager 2014-04-17 18:10:00 +02:00
Chriztian Steinmeier 09679c6235 Implement pagination for topics - 50 per page 2014-04-17 17:58:56 +02:00
Chriztian Steinmeier 0011507d49 Add Pagination helper 2014-04-17 17:58:14 +02:00
Chriztian Steinmeier 06afb4061c Use actual XSLT syntax ⚡ 2014-04-17 17:48:27 +02:00
Chriztian Steinmeier 32cf9a1c83 Extract template for topic subscriptions 2014-04-17 17:32:56 +02:00
Chriztian Steinmeier 04fca01d19 Extract template for forum subscriptions 2014-04-17 17:30:27 +02:00
Chriztian Steinmeier e3cc1c1218 Cleanup member-notifications.xslt 2014-04-17 17:27:57 +02:00
Sebastiaan Janssen c6f8457542 If there's no "isSpam" property then it's never been spam checked, assume it's clean 2014-02-06 13:11:26 +01:00
Sebastiaan Janssen 8482922d2d Fix performance issues. 2014-02-05 17:49:58 +01:00
Sebastiaan Janssen c0af015b94 Link to ManageSpam for mods 2014-01-04 13:23:41 +01:00
Sebastiaan Janssen cd9180d1d5 Update spam handling so that all moderators can mark as ham and spam. 2014-01-03 21:26:28 +01:00
Jeavon Leopold 423d6c1a7b Update documentation homepage widget content and links for new docs structure 2013-09-16 10:13:31 +01:00
Jeavon Leopold 8c5dbecd4d Merge remote-tracking branch 'origin/master' 2013-09-16 10:03:25 +01:00
Sebastiaan Janssen 05a13a5fed Use the newly cached RSS feed as the source for the widget as well 2013-08-04 09:57:53 +02:00
Jeavon Leopold 6d17fa03b1 Temporary replacement with fixed content for current "New documentation" widget on homepage so that it leads users to the new documentation section rather than the old wiki 2013-08-02 14:43:03 +01:00
Sebastiaan Janssen 4458a81eaa Increase version of uForum.js to make sure client-side cache is invalidated 2013-07-30 11:52:55 +02:00
Sebastiaan Janssen b1d34882a9 Make Markdown editor optional 2013-07-30 11:50:34 +02:00
Sebastiaan Janssen 0db81579db Remove projects from RSS that are not live 2013-07-29 13:46:55 +02:00
Sebastiaan Janssen 03c0c826ce Fixes edit topic 2013-07-15 12:32:46 +02:00
Sebastiaan Janssen 98744c6900 Oops, non-admins also had the mark as spam button. 2013-07-12 19:55:18 +02:00
Sebastiaan Janssen f69d935aa5 Mark as spam button for admins 2013-07-11 14:38:27 +02:00
Tim Geyssens cdc44e593f Fixes issue with creator not being able to edit topic 2013-07-02 14:51:56 +02:00
Tim Geyssens 884694c5e3 Fixes issue with solution comment not having correct style 2013-07-02 14:49:25 +02:00
Tim Geyssens 76be18715c Fixes issue with go to solution link option being gone 2013-07-02 14:43:19 +02:00
Tim Geyssens 80e26f0693 Fixes issue with mark as solution option being gone 2013-07-02 14:01:14 +02:00
Sebastiaan Janssen e0b7c211be XSLT for voting was a bit off 2013-06-27 17:38:47 +02:00
Sebastiaan Janssen 39236eab5b Update nav to show when documentation is selected correctly (is umbracoInternalRedirected so a bit of a hack needed) 2013-06-24 14:03:45 +02:00
Sebastiaan Janssen ff20431e64 Make it possible to add a urlPrefix to prevent hardcoded our.umbraco.org url 2013-06-23 13:43:08 +02:00