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

9066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
d12a9e046f Fixes: U4-4172 Change password in users section not working (u7.0.3) 
Signed-off-by: Shannon <sdeminick@gmail.com>
 2014-02-17 20:41:30 +11:00
Sebastiaan Janssen
98684e6292 Add 100 to the ClientDependency.config version to avoid conflicts with older caches 2014-02-03 10:23:13 +01:00
perploug
9687b2abee Special rule for installer password change 2014-01-31 13:03:46 +01:00
perploug
4ea589e954 Missing changes on ContentPickerControler re-added 2014-01-31 11:38:24 +01:00
perploug
621a19d4bd Final tweaks to TreeSource picker 
Better help text, polish icons and margins, made sure it toggles UI
correctly for each type of tree

(cherry picked from commit 9ce79e98a3)

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
 2014-01-31 11:38:23 +01:00
perploug
5821444678 Fixes inconsistently named private method 
Replaces delegates with lambdas

(cherry picked from commit 2a81162756)
 2014-01-31 11:38:22 +01:00
perploug
7533baf368 fixes mntp filtering 
(cherry picked from commit 3e22598f4a)
 2014-01-31 11:38:21 +01:00
perploug
d691e525b3 Adds support for xpath root node selection on mntp 
(cherry picked from commit d842f0f5b7)

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
 2014-01-31 11:38:20 +01:00
perploug
02d9d42ae2 adds getByQuery to entityService 
(cherry picked from commit 8258619055)

Conflicts:
	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
	src/Umbraco.Web/Editors/EntityController.cs
 2014-01-31 11:38:19 +01:00
perploug
17838e044c Addss template clearing when in debugmode 
(cherry picked from commit 7d2f6c13c3)
 2014-01-31 11:38:18 +01:00
Stephan
73173f92d6 U4-4144 - fix 2014-01-31 10:33:23 +01:00
Stephan
2ab1cf59a6 U4-2317 - issue with domains & languages management 2014-01-30 16:19:09 +01:00
Stephan
56cd1cee81 U4-4160 - make sure string properties are returned as strings 2014-01-30 15:08:13 +01:00
Stephan
002988ce86 U4-4144 - Media Cache dies due to new 'key' property in XML 2014-01-30 08:48:35 +01:00
perploug
81c32716fe Removes pre-checkpassword check 2014-01-29 22:04:37 +01:00
Shannon
c2f34cefb5 Merge branch '7.0.2' of https://github.com/rsoeteman/Umbraco-CMS into rsoeteman-7.0.2 2014-01-29 11:26:05 +11:00
Shannon
2f7727af68 Fixes: U4-3894 Date picker with time resets to "måndag januari 1, 0001" on Republish entire site 2014-01-29 11:20:25 +11:00
Shannon
5a9874bfad Fixes U4-3894 Date picker with time resets to "måndag januari 1, 0001" on Republish entire site 2014-01-29 11:19:59 +11:00
Shannon
68b4a493c6 updates versions and port 2014-01-29 09:46:25 +11:00
Shannon
6338d57959 Cherry picked - Removes hard coded api url from rte embed 2014-01-29 09:34:07 +11:00
Shannon
7de1b2d09d Fixes ServerVariablesParser to have a proper event declared! :P 2014-01-29 09:33:14 +11:00
Richard Soeteman
06ae6ad15e Fix media.save throws an error in Umbraco 7.0.x 
See http://issues.umbraco.org/issue/U4-3928 width and Height properties
are assigned on the file media types.  This was because of always
assigning a value to
content.getProperty(uploadFieldConfigNode.WidthFieldAlias).Value

Added an if statement to make sure the media item is an image when
assigning those values.
 2014-01-27 10:15:14 +01:00
Shandem
81dac97917 Merge pull request #284 from markvantilburg/patch-1 
Update booting.aspx
 2014-01-23 17:33:22 -08:00
Sebastiaan Janssen
10a4eb3ddc Fix Duplicate attribute YSOD (key was already added in the base class) 2014-01-20 12:02:52 +01:00
Morten Christensen
51f46cf871 Not raising export events for content/media ToXml extension for the time being 2014-01-20 10:37:46 +01:00
Shannon
697548d1c7 Fixes: U4-3897 Copy contents relations not created 2014-01-20 18:01:19 +11:00
Shannon
f717628322 Ensures username is escaped in user service 2014-01-20 16:13:41 +11:00
Shannon
e91b297cc2 updates user task creation for release 2014-01-20 16:04:49 +11:00
Shannon
c92441e544 Ensures user name is escaped in member service query. 2014-01-20 14:37:26 +11:00
Shannon
f0573fc68c Fixes: U4-4084 Macro's with non alphanumeric chars in their aliases cannot render in the rich text editor 2014-01-20 13:59:25 +11:00
Shannon
eb44480fdf fixes package installer path redirect when installing from the repo 2014-01-20 11:58:52 +11:00
Shannon
1ad05fbfc9 Clears the auth cookie after install if there is one which forces the login screen to display so that the csrf tokens are created - this is required if you are upgrading from a previous version and are logged in but don't have a version with csrf tokens. 2014-01-20 10:53:14 +11:00
Shannon
673e24a2ea Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-20 10:37:36 +11:00
Shannon
4842be01cd Ensures app domain restarted after db upgrade to clear PetaPoco's mapping cache. 2014-01-20 10:36:37 +11:00
Morten Christensen
dddb38d4ee Adding comment to private method for clarity 2014-01-19 15:23:05 +01:00
Morten Christensen
727ce0f795 Additional tests for Macro import and export 2014-01-19 15:23:04 +01:00
Morten Christensen
ba27acead9 Adding unique key to xml for contentbase exports 2014-01-19 15:23:04 +01:00
Morten Christensen
a026a81a8a Adding test for import of Macros from uBlogsy package xml 2014-01-19 15:23:03 +01:00
Morten Christensen
5e7ee0c236 Adding ImportMacros to PackagingService interface 2014-01-19 15:23:03 +01:00
Morten Christensen
bb30d5ebd2 Refactoring Macro import method in PackagingService 2014-01-19 15:23:02 +01:00
Morten Christensen
2ae3b09b8c Updating PackagingService to use the newly added event args 2014-01-19 15:23:02 +01:00
Morten Christensen
473d76f1b7 Adding Event Args for import and export 2014-01-19 15:23:01 +01:00
Sebastiaan Janssen
918e454c42 Make sure the build does a complete rebuild so that the Belle build gets triggered 2014-01-19 15:21:47 +01:00
Shannon
7e32fdb682 changed buildbelle to do a grunt build instead of running the default grunt build. 2014-01-19 13:11:23 +11:00
Sebastiaan Janssen
171a472966 Split out the Belle build and integrate it in the build of the Web.UI project 2014-01-17 18:56:04 +01:00
Sebastiaan Janssen
8194655ad1 Update the readme file with a pointer to the build.bat file to get started quickly 2014-01-17 16:07:29 +01:00
Sebastiaan Janssen
80c1812bc8 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-17 15:51:01 +01:00
Morten Christensen
6c37b33509 Adding export method for macros in the PackagingService and changing the ctor to accept the MacroService, so we can also add an import method. 2014-01-17 15:29:51 +01:00
Morten Christensen
509bcee540 Changing the name of the private field to be more inline with the Property 2014-01-17 15:28:53 +01:00
Morten Christensen
3dec881848 Removing extra line spaces 2014-01-17 15:28:12 +01:00