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

58 Commits

Author SHA1 Message Date
Sebastiaan Janssen c8e2b632ed OUR-123 Can't choose reply for a reply 
#OUR-123 Fixed
 2015-08-10 15:33:14 +02:00
Sebastiaan Janssen b37f4e805e Merge branch 'master' into our-mvc5-cleaned 
Conflicts:
	OurUmbraco.Site/Views/MacroPartials/Spam/Overview.cshtml
	OurUmbraco.Site/macroScripts/repository-view-project.cshtml
	OurUmbraco.Site/usercontrols/our.umbraco.org/Signup.ascx
	OurUmbraco/Our/usercontrols/Signup.ascx
	OurUmbraco/Our/usercontrols/Signup.ascx.cs
 2015-07-31 16:17:40 +02:00
Sebastiaan Janssen 1eafc30829 Manually approve all new members that try to post something 2015-07-30 10:10:04 +02:00
Sebastiaan Janssen 61571ade98 Move our.umbraco.org and uProject 2015-07-26 19:57:02 +02:00
Sebastiaan Janssen e3426fe80a Move uForum and adjust uForum namespaces to be correct 2015-07-26 12:31:15 +02:00
Sebastiaan Janssen d8a80003e4 Move uPowers and adjust uPowers namespaces to be correct 2015-07-26 12:13:28 +02:00
Sebastiaan Janssen be5657622a Allow for people to flag spam, make spam notifications show up and make actions consistent in order 2015-07-11 14:58:50 +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
Sebastiaan Janssen c775a403c1 I broke it! Forgot to turn this into a list. 2015-06-24 13:18:13 +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 daa9fbe09f Moves some namespaces around so that it's a bit more nicely organized 2015-06-24 10:05:12 +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 198b6ea98b Tres Commas! 2015-06-18 16:33:08 +02:00
Sebastiaan Janssen 47e26aca1e Allow admins to edit posts 2015-06-18 10:46:10 +02:00
Sebastiaan Janssen 67ef68ecb4 Add accurate datetime title to comments 2015-06-17 23:31:35 +02:00
Sebastiaan Janssen 8188c94d2b OUR-176 Not possible to high five initial post 2015-06-17 23:07:49 +02:00
Sebastiaan Janssen a051cb9f4f Remove duplicate code and make getting avatar consistent everywhere 2015-06-17 17:23:57 +02:00
Simon Busborg 0915d0da33 Fix for OUR-105, OUR-125 2015-06-16 15:17:55 +02:00
Sebastiaan Janssen 24856f7dbb Fixes alt text on avatars and adds gravatar to LatestActivity when no other avatar is found 2015-06-16 13:51:02 +02:00
Sebastiaan Janssen fa5c53a4f7 OUR-118 Why is "Mark as solution" link available when I am not the creator of the thread 2015-06-15 12:05:38 +02:00
Sebastiaan Janssen 7b31a1d3a7 Check if commentauthor exists (spammers get deleted) 2015-06-13 19:12:26 +02:00
Sebastiaan Janssen 2c547fde10 Revert "Disable links to member profile for now" 
This reverts commit 1e9907909b.
 2015-06-02 10:17:18 +02:00
Sebastiaan Janssen 1e9907909b Disable links to member profile for now 2015-03-04 14:15:14 +01:00
Shannon 4e8edba136 Fixes comment.cshtml to get the roles for the comment member 2015-03-04 19:18:44 +11:00
Shannon 90e16bae7d renames mem to currentMember 2015-03-04 11:21:57 +11:00
Shannon 6ad3c76e0a Fixes the Thread.cshtml for comment lookup - all comments are already available even sub comments, we don't need to query them again! The comment member was already looked up at the top. 2015-03-04 10:42:16 +11:00
Rune Hem Strand 747f2795f8 Register and login views 2015-03-03 19:54:42 +01:00
Sebastiaan Janssen ae7112b2f6 Remove newing up of MembershipHelper as it was leading to There is already an open DataReader associated with this Command which must be closed first. errors 2015-03-03 12:56:37 +01:00
Sebastiaan Janssen f1cce4c2ce Make sure we can still run on SSL 2015-03-02 14:52:10 +01:00
Shannon 1ca80f1249 Saves more N+1 query in the forum. 2015-03-02 16:39:05 +11:00
Shannon 20eb62eddd Cleans up the 'Services' - they should not be idisposable unless they exist as a global lifespan, but they are not being used that way so therefore should not dispose and should def not dispose the global DatabaseContext since they are being used as a transient instance. Renames more Utills with less L's. Fixes more event handlers to be ApplicationEventHandler instead of the legacy ones. Fixes the Forum data service to actually index ALL form items, not just 1000 of them (no idea why this was occuring?) Fixes Latest.cshtml to iterate of an iteratable collection. Fixes more null ref checks. 2015-03-02 13:52:07 +11:00
Rune Hem Strand 809957413f Forum avatar resizing 2015-02-19 14:26:47 +01:00
TimGeyssens 8dfe4b1075 Same with comments 2015-02-12 14:29:58 +01:00
Rune Hem Strand 7fd5537cb1 Merge branch 'v7-upgrade-test' of https://github.com/umbraco/OurUmbraco into v7-upgrade-test 2015-02-12 11:32:47 +01:00
Rune Hem Strand e8e6020e9a Draft object, post animation 2015-02-12 11:32:38 +01:00
TimGeyssens bd8d919534 Mark as spam / ham final touches 2015-02-12 10:54:14 +01:00
Rune Hem Strand 342c5a6944 Various updates 2015-02-10 08:28:09 +01:00
TimGeyssens aa9936ad19 Restructure of the spam detection 2015-02-06 13:21:03 +01:00
Rune Hem Strand 9af92dc77a deeplink to comments 2015-02-05 12:01:22 +01:00
TimGeyssens c53d5ecf23 Editing comments 2015-02-04 23:44:33 +01:00
TimGeyssens 7b74ccba67 Delete comments 2015-02-04 22:53:12 +01:00
Rune Hem Strand 6c690682ad New actions 2015-02-04 15:25:26 +01:00
TimGeyssens 3590bdb58d Moves data attribute for h5 to correct place 2015-02-04 13:22:22 +01:00
TimGeyssens 4b985fa2e1 Only show high five option when member hasn't given h5 before 2015-02-04 13:02:22 +01:00
TimGeyssens 46da48cfe3 Adds high five score 2015-02-04 12:45:46 +01:00
TimGeyssens 00930f103c High five-ing comments 2015-02-04 11:30:41 +01:00
TimGeyssens a305980d7f Make sure you can't high five your own comments 2015-02-04 11:13:03 +01:00
TimGeyssens 2278e15a4a Correct way of doing mark as solution (with karma) 2015-02-04 10:33:37 +01:00
Rune Hem Strand d0bd99ee4f Deep link 2015-02-03 10:13:16 +01:00