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

72 Commits

Author SHA1 Message Date
Shannon
df72297429 Got media picker working with real media items. 2013-06-10 11:15:33 -02:00
Shannon
47d70e858b Getting media picker working 2013-06-10 10:36:59 -02:00
Shannon
1b59c1ba6e Got content item creation working and rte property editor working/saving 2013-06-09 11:40:52 -02:00
Shannon Deminick
6028cebc90 Fixes lookup for getting allowed child content types 2013-06-07 02:45:06 -10:00
Shannon Deminick
9431ae7fdb Fixed issues of using StateHelper since we do things in async which don't have an HttpContext.Current, so we use our 
UmbracoContext.Current instead if required. Changed StateHelper to be obsolete as we need to replace all calls to it with
proper extension methods. Updated the content model mappers to ensure we ToArray property objects so they don't keep
re-processing the Linq statement when iterating. Content is now saving to the db.
 2013-06-07 01:39:53 -10:00
Shannon Deminick
96fac60c3f So close to having data saving but now we have issues with HttpContext.Current because we are running async processes... fail. 2013-06-05 14:37:19 -10:00
Shannon Deminick
6dd48262e1 Fixed up how tabs are loading to work with async data and am now displaying real data ! 2013-06-04 22:30:49 -10:00
Shannon Deminick
35ada35257 Updated content model mapper to re-use mappings as much as possible. Added most of the missing properties to content and inline with the expected format 
in the UI project. Added basic user model and a mapper for that too. updated tree service in UI to automatically create the 'view' for each node based on
the section and id, the same way it updates the level for each node.
 2013-06-03 23:50:20 -10:00
Shannon Deminick
8bced15f56 updates icon output 2013-06-03 21:19:38 -10:00
Shannon Deminick
bb1052c063 Started integrating the contentTypeResource with the real back office data. 2013-06-03 18:56:16 -10:00
Shannon Deminick
160811e190 added new tests for model mapping and serialization of the content display models. Started integrating trees. Committed the compiled 
angular controllers, directives, services, resources since I'll be modifying them to work with the real data services. Then we'll have
to merge back to the belle repo with the changes.
 2013-05-30 21:21:52 -10:00
Shannon Deminick
c5ff9ddec9 Updated property editors deserialization method to accept more information and original values, updated the upload property editor to now save 
files in accordance with exactly how we are saving them currently and it is all working... expcept the new uploader can do multiple files. It is
now persisting to the database as well.
 2013-05-28 18:27:11 -10:00
Shannon Deminick
94786f08c6 Removes old type finder and type resolver. Updates POC postcode editor to work with new config array. 2013-05-28 16:49:01 -10:00
Shannon Deminick
cf631974a8 Updated validator definitions, updated ToXml logic to take into account new Property Editors, added Serialization and Deserialization methods 
for property editor's to override if necessary, updated the ContentItemBinder to bind the db and dto models so now that validator filter
just validates against the model and doesn't actually do any data lookups itself (much nicer). Now saves and retreives from the database !!
 2013-05-27 21:32:37 -10:00
Shannon Deminick
7d7ca4530b Getting server side integration working from ported over Belle POC including temporary custom property editors. 
Many files committed will be temporary and will be removed once development between the Belle UI project and this project are merged
and working.
 2013-05-27 18:21:07 -10:00
Shannon Deminick
cdbd1b504f upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct 
paths.
 2013-05-27 01:23:49 -10:00
Shannon Deminick
0f5d61bae8 Started importing classes and functionality from the Belle project so we can start wiring up data. 2013-05-23 22:15:52 -10:00
Shannon Deminick
cfe6ac0486 Merge with 6.0.6 2013-05-07 18:57:39 -10:00
Shannon Deminick
c52669fb05 Fixes: #U4-2094 - issue with duplicates in getting Descendants for media in mvc. 2013-05-07 18:56:24 -10:00
leekelleher
3af7958940 Updated references for alias conventions constants across the solution. 2013-03-18 17:55:02 +00:00
Shannon Deminick
c6f29a50d6 Merge with 4.11.6 2013-03-11 21:17:57 +06:00
Shannon Deminick
28c55320a1 Updates the pull request for handling macro errors. 
Backports fixes for partial view macros from 6.x - U4-1488, U4-1844, U4-1730, U4-1843
 2013-03-11 20:11:11 +06:00
Shannon Deminick
d48e339b81 Fixes: #U4-1844, #U4-1730, #U4-1843 2013-03-06 04:12:28 +06:00
Shannon Deminick
82d645a0f7 Merge with 4.11.6 2013-03-05 22:18:53 +06:00
Shannon Deminick
a765f36d24 Adds unit tests for DynamicNode and DynamicPublishedContent, fixes both when querying for recursive properties. 
Fixes: #U4-1839
 2013-03-05 21:00:16 +06:00
Shannon Deminick
3ff88bc4fa Fixing strange merge issues. 2013-03-02 03:44:43 +06:00
Shannon Deminick
1bc9d1d9c3 Merge with 4.11.6 2013-03-02 02:45:19 +06:00
Shannon Deminick
b5cbe63a4e Back merged from 6.1 the changes required for #U4-1822 and #U4-1797 2013-03-02 02:43:22 +06:00
Shannon Deminick
4882df43bd Back merged from 6.1 the changes required for #U4-1822 and #U4-1797 2013-03-02 01:50:53 +06:00
Sebastiaan Janssen
29724b352b Fixes U4-1451 2013-02-18 13:22:12 -01:00
Stephan
8b00e72bf6 Web.Routing - refactor url providing (U4-1321...) + new IUrlProvider 2013-01-31 10:06:25 -01:00
Shannon Deminick
4baecfe833 Merge with 6.0.3 2013-03-11 21:56:47 +06:00
Shannon Deminick
0852200861 Merge with 6.0.3 2013-03-06 04:12:58 +06:00
Shannon Deminick
f79d046a87 Merge with 6.0.3 2013-03-05 22:19:31 +06:00
Shannon Deminick
c137854e01 Merge with 6.0.2 2013-03-02 03:45:06 +06:00
Shannon Deminick
fe9f5b224a Fixing really strange merge issues! 2013-03-02 03:34:37 +06:00
Shannon Deminick
45f2cc9a20 Merge with 6.0.2 2013-03-02 02:52:25 +06:00
Shannon Deminick
36108df4d0 Merge with 6.0.2 2013-03-02 02:49:24 +06:00
Shannon Deminick
010893a73a Fixes: #U4-1822, #U4-1797 - Is helpers and indexes on result collections using IPublishedContent or DynamicPublishedContent were incorrect, 
added unit tests to support issues and fixes.
 2013-03-02 01:02:38 +06:00
Shannon Deminick
9324ab8e0e Merge with 6.0.1 2013-02-19 04:11:30 +06:00
Shannon Deminick
34975183d2 Changed PublishedContentHelper to use 6.0 APIs instead of relying on the WebBootManager hack to set a delegate. 
Fixed up a heap of failing unit tests.
 2013-02-02 07:06:27 +06:00
Sebastiaan Janssen
be83302b14 Fixes U4-1451 2013-02-18 13:22:12 -01:00
Shannon Deminick
880cafb0a9 Fixes: #U4-1451 2013-01-13 23:24:02 +03:00
Shannon Deminick
0e0e6b5c41 Fixes: #U4-1451 2013-01-13 23:24:02 +03:00
Shannon Deminick
b1f0e00287 Adds performance benefits for PublishedContentBase 2012-12-10 03:40:50 +05:00
Shannon Deminick
1de43347d5 Added Url support for media when the IPublishedContent item inherits from PublishedContentBase 2012-12-09 03:27:19 +05:00
Shannon Deminick
44ccfc0262 Adds 'Url', 'ItemType' and the Indexed property alias to IPublishedContent. 
Changes Properties to ICollection instead of Collection for IPublishedContent.
Creates PublishedContentBase object which handles the Url and Indexed property on IPublishedContent automatically so implementors should use this base
class instead. Moves GetPropertyValue extensions to the Umbraco.Web project instead of the
Umbraco.Core project because this method needs to parse internal links if the value is a string. We require the UmbracoContext
to do this so they must exist in the Web project.
 2012-12-09 03:22:11 +05:00
Shannon Deminick
73414f4504 Merge with default 2012-12-07 19:56:40 +05:00
Shannon Deminick
5b0057c258 Added missing files. 2012-12-04 03:29:02 +05:00
Morten Christensen
99820bf5e1 Merge with 4.11.0 2012-11-23 07:53:22 -01:00