76752f9bd8
Merge branch 'master' into lesson-documentation-controller
2017-06-07 07:42:41 +02:00
7ebb26840f
Merge remote-tracking branch 'upstream/master' into githubcontributors
...
# Conflicts:
# OurUmbraco.Site/OurUmbraco.Site.csproj
# OurUmbraco.Site/Views/Partials/Community/Home.cshtml
# OurUmbraco.Site/Views/Partials/Community/Scripts.cshtml
# OurUmbraco/OurUmbraco.csproj
2017-06-05 16:28:48 +01:00
440084e832
Merge pull request #107 from abjerner/master
...
Added a new section to the "Community" page listing Umbraco events from Meetup.com
2017-06-05 13:41:30 +02:00
593d0c31fa
HQ exclusion list
2017-06-05 10:10:37 +01:00
ad900861da
Updated the implementation
...
- We can now show logo (or image really) of the group responsible for each event
- Only the first event of each group are shown in the list
- A "NEAR YOU" label is now shown instead of the distance (the location of the group is used as fallback if no venue is specified)
2017-06-04 23:43:32 +02:00
9799071d04
Initial addition of GitHub contributors code
2017-06-04 16:19:21 +01:00
492a3e5a8d
Init API Controller to Query partial part of the MD Docs tree & WIP for the markdown alt template
2017-06-04 16:07:14 +01:00
c6de48c8e2
Added a new section to the "Community" page listing Umbraco events from Meetup.com
2017-06-04 17:02:41 +02:00
aea3c0a696
Fix OurUmbraco.Site project for loading for people who just have VS17 installed
2017-06-04 13:12:11 +01:00
68979fb8d3
Upgrade to 7.5.11
2017-03-07 09:12:17 +01:00
b3205b0904
Upgrade to 7.5.10
2017-02-21 21:06:34 +01:00
a40061c279
Upgrade to 7.5.9
2017-02-07 12:14:16 +01:00
64d3fea196
Add stats page
2017-02-02 12:06:07 +01:00
a11dd3f3ca
Remove ApplicationInsights
2017-01-28 10:55:50 +01:00
0dc9d00446
Upgrade to 7.5.8
2017-01-24 12:20:50 +01:00
c7ac4e1392
Fix some bug and adds an error view to debug where errors are coming from
2017-01-22 18:43:55 +01:00
abc21a695b
Some more macro to partial conversions
2017-01-22 17:36:11 +01:00
ee0817f7dc
Move documentation macros to partials
2017-01-22 17:12:45 +01:00
b35c2a4b49
Move Thread and TopicForm to Partials instead of Macros
2017-01-22 16:54:25 +01:00
35f6de1686
ForumTopicActions to partial from macro
2017-01-22 16:40:35 +01:00
0598124f67
Replace Breadcrumb XSLT macro
2017-01-22 16:27:24 +01:00
8eda3b367f
Add files to project that were added wrong
2017-01-22 15:42:05 +01:00
90efdfd27e
Move a lot of code that keeps repeating itself and making DB calls to central place
2017-01-22 14:59:48 +01:00
3514d765a6
Optimize and cache member data, move from unnecessary macros to regular partials in the master and community templates
2017-01-22 12:22:54 +01:00
fe254ea99f
Merge branch 'master' into move-masterpages-to-views
...
# Conflicts:
# .gitignore
# OurUmbraco.Site/OurUmbraco.Site.csproj
# OurUmbraco.Site/Views/MacroPartials/Members/ForgotPassword.cshtml
# OurUmbraco.Site/Views/Partials/Members/ForgotPassword.cshtml
# OurUmbraco.Site/Views/Partials/Members/Login.cshtml
# OurUmbraco.Site/Views/Search/Search.aspx.cs
# OurUmbraco.Site/config/imageprocessor/cache.config
# OurUmbraco.Site/masterpages/Community.master
# OurUmbraco.Site/masterpages/ReleaseProgress.master
# OurUmbraco.Site/masterpages/Repository/Projects.master
# OurUmbraco.Site/masterpages/popular.master
# OurUmbraco/Our/Controllers/LoginController.cs
# OurUmbraco/Our/MigrationsHandler.cs
# OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.cs
# OurUmbraco/OurUmbraco.csproj
# OurUmbraco/packages.config
2017-01-21 20:29:29 +01:00
4054ed9c30
More merge fixing
2017-01-21 20:08:39 +01:00
1c63409ce5
More merge fixing
2017-01-21 19:59:36 +01:00
e8565650e4
Merge branch 'master' into move-masterpages-to-views
...
# Conflicts:
# .gitignore
# OurUmbraco.Site/OurUmbraco.Site.csproj
# OurUmbraco.Site/Views/MacroPartials/Members/ForgotPassword.cshtml
# OurUmbraco.Site/Views/Partials/Members/ForgotPassword.cshtml
# OurUmbraco.Site/Views/Partials/Members/Login.cshtml
# OurUmbraco.Site/Views/Search/Search.aspx.cs
# OurUmbraco.Site/Views/Web.config
# OurUmbraco.Site/config/ClientDependency.config
# OurUmbraco.Site/config/Dashboard.config
# OurUmbraco.Site/config/imageprocessor/cache.config
# OurUmbraco.Site/masterpages/Community.master
# OurUmbraco.Site/masterpages/ReleaseProgress.master
# OurUmbraco.Site/masterpages/Repository/Projects.master
# OurUmbraco.Site/masterpages/popular.master
# OurUmbraco.Site/packages.config
# OurUmbraco/Our/Controllers/LoginController.cs
# OurUmbraco/Our/MigrationsHandler.cs
# OurUmbraco/OurUmbraco.csproj
# OurUmbraco/packages.config
2017-01-21 18:47:09 +01:00
fd12775e86
Upgrade to 7.5.7
2017-01-21 17:30:32 +01:00
d11559a25c
Actually use the global error filter
2017-01-21 16:04:22 +01:00
d4a4c43383
Update Examine and Image Processor
2017-01-21 14:46:40 +01:00
edde33de47
Adds ApplicationInsights
2017-01-21 14:21:28 +01:00
a9435022d5
Update to the correct dll versions of 7.5.7
2017-01-10 22:41:42 +01:00
e45b66fb80
Upgrade to 7.5.7
2017-01-10 08:03:51 +01:00
3507f37d74
Remove 301 URL tracker
2017-01-08 13:25:06 +01:00
b029976f54
Don't put javascript in the middle of the page
2017-01-08 12:06:35 +01:00
13bfa46c01
Don't make the twitter searcher easy to alter
...
Get the twitter filters from the settings on the home node
Makes latest forum activity on home async too
2017-01-07 13:18:50 +01:00
f8be8641f7
Get Twitter search results into the page by async
2017-01-07 12:00:24 +01:00
19ffe50215
Add Twitter search for "umbraco" to community home
2017-01-06 15:55:17 +01:00
6e1797537f
Updates Login and ForgotPassword to be MVC and have a Captcha
2016-12-07 18:50:56 +01:00
8040e55a87
Add reCaptcha for registration
2016-12-07 17:26:06 +01:00
755281570b
Upgrade to Umbraco 7.5.6
2016-12-07 17:25:12 +01:00
1e5a959f25
7.5.5 upgrade was OK after all
2016-12-07 13:48:36 +01:00
47123a7d0a
Revert "Upgrade to Umbraco 7.5.5"
...
This reverts commit a0f27739b7
2016-12-07 12:59:03 +01:00
a0f27739b7
Upgrade to Umbraco 7.5.5
2016-12-07 11:57:20 +01:00
c806b10f95
Upgrade to Umbraco 7.5.5
2016-12-07 11:43:50 +01:00
1b362dd1cb
Merge branch 'master' into move-masterpages-to-views
...
# Conflicts:
# OurUmbraco.Site/OurUmbraco.Site.csproj
# OurUmbraco.Site/masterpages/UmbracoMVP2011.master
# OurUmbraco/Our/MigrationsHandler.cs
# OurUmbraco/OurUmbraco.csproj
2016-11-27 13:38:53 +01:00
538834dcc3
Update all SqlHelper instanced to use the umbraco.Businesslogic version and wrapped them all in usings where necessary
2016-11-25 20:49:30 +01:00
efa0659742
Merge branch 'refs/heads/master' into move-masterpages-to-views
...
# Conflicts:
# .gitignore
# OurUmbraco.Client/package.json
# OurUmbraco.Site/config/Dashboard.config
# OurUmbraco.Site/masterpages/Release.master
# OurUmbraco.Site/usercontrols/Deli/Package/Editor.ascx
# OurUmbraco.Site/usercontrols/Deli/Package/Steps/Complete.ascx
# OurUmbraco.Site/usercontrols/Deli/Package/Steps/Details.ascx
# OurUmbraco.Site/usercontrols/Deli/Package/Steps/Files.ascx
# OurUmbraco.Site/usercontrols/Deli/Package/Steps/Screenshots.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectCollabRequest.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectContributors.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectEditor.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectFileUpload.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectForums.ascx
# OurUmbraco/Our/MigrationsHandler.cs
# OurUmbraco/OurUmbraco.csproj
# build/BuildClientFiles.bat
2016-11-07 08:45:46 +01:00
f04cf5bb40
Correcting the wrong version references
2016-10-22 12:51:37 +02:00
Per Ploug