yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,019 Commits 4 Branches 7 Tags
db0a87e3ca87cc0a822ad51c5bd7d9cd9f102c53
Commit Graph

1921 Commits

Author SHA1 Message Date
Shannon Deminick
07a52f659d Merge pull request #463 from kgiszewski/feature/rte-config 
Fix for U4-5409 headline justification in the RTE
 2014-08-28 08:14:19 +10:00
Kevin Giszewski
5420be483c Add style attribute to the headline white-listed attributes 2014-08-27 10:32:29 -04:00
Shannon
2f2d55e24f ensure normal browser cache is busted for auth upgrade view 2014-08-26 09:39:07 +10:00
Sebastiaan Janssen
101e116baf Bump version number 2014-08-25 15:14:21 +02:00
Shannon
88da00cdd3 Merge branch '7.2.0' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
 2014-08-25 16:57:10 +10:00
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
 2014-08-24 21:35:08 -06:00
bjarnef
8609427d3c Fix for U4-3953 (modified) 
I overlooked the installing message, so here the message is still
visible below the progressbar. Furthermore the same is fixed for the
uninstalling progressbar, which I didn't noticed previously.
 2014-08-24 20:51:36 +02:00
Morten Christensen
7d52ed873e Merge pull request #449 from nul800sebastiaan/uaas-events 
Adding events for use by Courier/UaaS
 2014-08-20 14:12:38 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Sebastiaan Janssen
468cdf64ff Merge pull request #447 from Jeavon/UpdateImageProcessor 
Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0
 2014-08-19 14:37:34 +02:00
Sebastiaan Janssen
8b34b4e8a1 Merge pull request #416 from Graphicnerd/7.1.5 
Updated the sortable frame in Umbraco Backoffice
 2014-08-19 14:02:28 +02:00
Shannon
0fd37d708d Merge branch 'U4-5332' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-U4-5332 2014-08-15 12:04:54 -06:00
Sebastiaan Janssen
1ccee3f305 Moved all logic of PartialViewTasks and PartialViewMacroTasks to a base class as the only difference was 3 variables 
Added events: PartialView(Macro): Create, Save and Delete
Added events: Template: Save (there's already a legacy event, this is a new one to transition to)
PartialViewMacro.ascx.cs was adding ".cshtml" just so that it could strip it of again, crazy
 2014-08-14 17:20:25 +02:00
per ploug
5e738a2b7b Fixed: U4-4734 Remove default alt text on images from RTE 2014-08-13 11:01:56 +02:00
per ploug
dd72fd04bd Fixed: U4-5025 Backoffice spelling errors 2014-08-13 10:42:46 +02:00
per ploug
231c50319f Fixed: U4-5343 Move grid.config out of Umbraco folder 2014-08-13 10:04:54 +02:00
Jeavon Leopold
6b455aaa19 Add ImageProcessor httpmodule to web.template.config 2014-08-12 17:51:30 +01:00
Jeavon Leopold
b2ca814fdb Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0 2014-08-12 16:59:31 +01:00
antoine
9789fbdb79 tuning config for current umbraco kit starter 2014-08-07 18:11:50 +02:00
Shannon
7dfa633fb3 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Core/Sync/DefaultServerMessenger.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
 2014-08-05 12:49:51 -06:00
Shannon
62d3dc78fa Ensures all caching is disabled for editing templates (master pages and views) 2014-08-05 10:59:54 -06:00
per ploug
a0bf366c85 Fixed: U4-4485 Unsaved changes prompt not appearing for RTE 2014-08-05 13:43:07 +02:00
Declan Cook
60e81a051d U4-5110 Prevent IE Compatibility Mode 2014-08-04 16:18:43 +01:00
Sebastiaan Janssen
dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
 2014-08-04 13:32:44 +02:00
Sebastiaan Janssen
aceef2b318 Add missing grid view files. 2014-08-01 12:12:25 +02:00
per ploug
4e1214085e Split grid rendering into seperate editor views 2014-07-31 14:45:48 +02:00
Sebastiaan Janssen
e200e2fc48 Removes obsolete cachebrowser 2014-07-24 16:17:40 +02:00
Shannon
7f510c107a updates proj's with correct specific version attributes 2014-07-23 12:31:38 -07:00
Shannon
84fad1300b All nuget refs are now up to date and installed correctly with copy local set correctly for all non gac 4.5 assemblies as well as the specific version attribute. 2014-07-23 12:19:40 -07:00
Shannon
6319b10881 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
	src/SQLCE4Umbraco/app.config
	src/Umbraco.Core/app.config
	src/Umbraco.Tests/App.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/umbraco.MacroEngines/App.Config
	src/umbraco.businesslogic/app.config
	src/umbraco.datalayer/app.config
	src/umbraco.editorControls/app.config
 2014-07-23 10:08:01 -07:00
Shannon
c24775adb0 re-installs mvc, webapi and ensures running the latest 2.0.x versions of webpages and razor, now all proj's are consistent with correct versions referenced and copy local set correctly. 2014-07-23 10:03:26 -07:00
Shannon
b207521f4b Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-22 16:15:02 -07:00
Shannon
a2aaa9a1ea updates proj references to have SpecificVersion set to false 2014-07-22 16:14:13 -07:00
Shannon
217f591db0 updates proj references to have SpecificVersion set to false for libs 2014-07-22 16:13:26 -07:00
Shannon
b835cfb76d Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
 2014-07-22 15:55:06 -07:00
Shannon
d453aedd0d Microsoft.Net.Http required a reinstall command for the UI project as noted by it's persisted 'requiresReinstall' attribute in the packages.config - also ensures that ALL of the WebApi DLLs are copied local 2014-07-22 15:51:13 -07:00
Shannon
851181f861 Microsoft.Net.Http required a reinstall command for the UI project as noted by it's persisted 'requiresReinstall' attribute in the packages.config - and then the project wouldn't actually build anymore. 2014-07-22 15:39:07 -07:00
Shannon
e98ed8561a Fixes: U4-5252 2014-07-23 04:10:48 +10:00
Shannon
6167d1584a Fixes an xss vulnerability 2014-07-15 11:37:31 +10:00
Shannon
0c2d1f72b9 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-15 11:36:13 +10:00
Shannon
8c36dac67a Fixes an xss vulnerability 2014-07-15 11:36:03 +10:00
Semmeo
7e8be5fd67 Update fr.xml 
Updated french umbraco translation from scratch, by translating en.xml. Tested and working.
 2014-07-11 12:31:20 +02:00
antoine
54c3e68f32 Ignore Preview folder 2014-07-01 13:57:04 +02:00
per ploug
601fef873a Found a couple of minor issues while testing 2014-06-27 11:50:03 +02:00
per ploug
49a374dbca Fixing various grid bugs with the new structure 2014-06-26 23:36:04 +02:00
Shannon
9da7d56b9c Fixes styling on installer alert box so it's contained within the pane 2014-06-26 13:58:09 +10:00
Shandem
7bc5588d6d Merge pull request #420 from bjarnef/7.1.5_U4-3953 
Fix for U4-3953
 2014-06-26 11:38:25 +10:00
bjarnef
70514b88c5 Fix for U4-3953 
Installing package - installing message progressbar causes horizontal
scrollbar
 2014-06-26 02:57:47 +02:00
Shannon
582bafdefd Updates version 2014-06-26 10:02:09 +10:00
Shannon
3ecc974325 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
 2014-06-25 14:33:32 +10:00