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

109 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 730beda0d6 Move js so unobtrusive validation works 2015-08-08 13:04:17 +02:00
Sebastiaan Janssen c44129a389 Don't clear out description on postback 2015-08-08 13:01:39 +02:00
Sebastiaan Janssen ecb79cbec6 Adds some validation 2015-08-08 12:44:23 +02:00
Sebastiaan Janssen 0c51d0bae9 Change the first page of the package admin area to use mvc instead of usercontrols 2015-08-08 11:14:41 +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 81aec9d30a Adjust uForum namespaces to be correct 2015-07-26 20:31:59 +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 5d60aef294 Fix error when no logged in member 2015-07-23 16:32:22 +02:00
Sebastiaan Janssen 2dd6cc61bd Improve handling of deleted topic and add information about the member that's being 
flagged when flagging as spam so we can actually delete the member too
 2015-07-20 18:08:25 +02:00
Sebastiaan Janssen a77064736d Merge pull request #53 from greystate/issue-OUR-257 
Fix for OUR-257 (Report Compatibility display bug in Safari)
 2015-07-13 13:59:56 +02:00
Sebastiaan Janssen bc705f126d Oops, flagging and deleting got confused 2015-07-13 13:26:36 +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
Chriztian Steinmeier f03a9bef66 Clear floats for items in compatibility report 
Fixes a display bug in Safari
 2015-06-27 18:45:04 +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 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 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 bf5556921b Make timezone more accurate 2015-06-16 13:28:00 +02:00
Sebastiaan Janssen 4dae4a9514 More readable dates in the forum overview and on specific posts 2015-06-16 12:33:38 +02:00
Rune Hem Strand 8907f35e35 FIxed code syntax on Question/Topic 2015-06-15 16:28:41 +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 491ac68f92 Grab member from cache instead of database for notifications 2015-06-03 00:53:15 +02:00
Sebastiaan Janssen 83bb4087ca Upgrade to 7.2.5 2015-06-02 10:17:19 +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
Rune Hem Strand d2ba258a84 Get the correct roles on question.cshtml 2015-03-04 11:09:38 +01:00
Shannon 1a9adb86d5 Merge branch 'v7-upgrade-test' of https://github.com/umbraco/OurUmbraco into v7-upgrade-test 2015-03-04 19:19:06 +11:00
Shannon 4e8edba136 Fixes comment.cshtml to get the roles for the comment member 2015-03-04 19:18:44 +11:00
Rune Hem Strand be615fda64 Merge branch 'v7-upgrade-test' of https://github.com/umbraco/OurUmbraco into v7-upgrade-test 2015-03-04 07:32:59 +01:00
Rune Hem Strand 28e8a88b60 Profile Project Team/Forum updated 2015-03-04 07:31:03 +01:00
Shannon 9ba00b4a3e Project compatibility report + updating works - it's not pretty because I don't know how the other github project that manages JS works, so yes, this is coded in the view but its working. I also made up my own styling since there wasn't anything to work from. 2015-03-04 16:32:01 +11:00
Shannon 6ef39150df Fixes ProjectDetails - the project links now render properly, the version compatibility report is rendered correct (and not with ajax), removed the old version compatibility reports, update the logic to generate the compatibility report. Removed unnecessary files from the uProject project. Commits dashboard config (forgot in previous commit) 2015-03-04 14:27:28 +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