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

9363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Per Ploug Krogslund
fcbdf6c635 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-03 21:50:30 +01:00
Per Ploug Krogslund
1fda22a4e0 Merge branch '7.1.0-LocationChangeNotificatiion' into 7.1.0 2014-02-03 21:48:23 +01:00
Per Ploug Krogslund
deeaf724bd Fixes missing dependencies 2014-02-03 21:04:11 +01:00
Per Ploug Krogslund
34824ffbb0 Confirm navigating away from unsaved content 2014-02-03 21:03:43 +01:00
Per Ploug Krogslund
6f28a0a686 Updates NotificationService to support custom views 
This allows us to inject small UI components as overlays ontop of
editors
 2014-02-03 21:03:24 +01:00
Sebastiaan Janssen
b3f6a8c71b Merge branch '7.0.3' into 7.1.0 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
 2014-02-03 11:52:36 +01: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
Steve Temple
aad0e73fea Add customConfig back into rte 2014-01-31 23:18:49 +00: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
Per Ploug Krogslund
7d7fcd2093 Wip on dropper and gravity editor directives 2014-01-30 22:28:50 +01:00
Stephan
2ab1cf59a6 U4-2317 - issue with domains & languages management 2014-01-30 16:19:09 +01:00
Stephan
3ef51d7357 U4-2317 - issue with domains & languages management 2014-01-30 16:18:06 +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
Stephan
8b553dd067 U4-4144 - work around media cache exceptions on invalid properties 2014-01-29 19:30:17 +01:00
perploug
c52123e878 adds mock cropper data for WIP prototype 2014-01-29 14:30:51 +01:00
perploug
4e6ca57f7a Chore: seperate media + image helpers into 2 files 2014-01-29 14:30:35 +01:00
perploug
ce9cfbf071 Chore: update media+mediahelper mocks 2014-01-29 14:30:17 +01:00
perploug
8024bde429 Imaging directives (crop, gravity and preview) 2014-01-29 13:44:34 +01:00
perploug
9ce79e98a3 Final tweaks to TreeSource picker 
Better help text, polish icons and margins, made sure it toggles UI
correctly for each type of tree
 2014-01-29 11:21:54 +01:00
perploug
3e5553d9b0 Fixes weird issue with user language dropdown 2014-01-29 09:50: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
ccaf82d797 Fixes object extensions for dates with a 'kind' specified. 2014-01-29 11:21:35 +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
perploug
5047c7bbe7 Fixes: U4-4155 Backend CSS Rich Text Editor Path Issue 2014-01-29 00:28:56 +01:00
perploug
0c45fb1b97 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-01-28 23:50:58 +01:00
perploug
7bd745a870 WIP: Tree icon colors 2014-01-28 23:50:25 +01: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
Tim Geyssens
93a4e8f426 Removes hard coded api url from rte embed 2014-01-28 16:18:30 +01:00
Tim Geyssens
fcc115004e Updates server vars with embedApiBaseUrl 2014-01-28 16:11:57 +01:00
perploug
24062c0061 Rolls back listview items in dialog trees 2014-01-28 15:49:04 +01:00
perploug
06cbdc37b4 Fixes: U4-4143 In rich text editor, non ASCII characters in source code window are encoded 
Also at the same time fixes missing config import from serverside config
 2014-01-28 15:45:14 +01:00
Shannon
f28ae52ae3 moved logic to update a profile to MembershipHelper. 2014-01-28 21:57:00 +11:00
Shannon
cfd0973f00 Moves the registration logic to the MembershipHelper, fixes up the views to keep the indexes so props save. 2014-01-28 21:42:30 +11:00
Shannon
1bfdd83ba7 Cleans up more of the membership controllers and snippets to be using the membership helper and fixes up a few issues 2014-01-28 19:41:21 +11:00
Shannon
6fefcacc61 Adds more methods to the MembershipHelper, updates the RegisterModel and obsoletes the standard ctor so biz logic is not happening in the model, updates the snippets to use the correct way. Fixes an issue in the membership repo for persisting new members when the member type doesn't contain all the built-in props. 2014-01-28 18:59:27 +11:00
Shannon
3b639e61b2 Exposes MembershipHelper onthe UmbracoViewPage so people can use it directly in views. 2014-01-28 17:02:20 +11:00
Shannon
9959ff667e publicizes MembershipHelper and exposes it on the various base classes: SurfaceController, UmbracoApiController and UmbracoUserControl as the property "Members", will add more helper methods. 2014-01-28 16:58:55 +11:00