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

338 Commits

Author SHA1 Message Date
Shannon
db86f6e1ee Fixes up issues reported on review and adds a null check 2017-02-03 11:49:22 +11:00
Shannon
ff6ea0b42e Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
 2017-02-01 15:23:29 +11:00
Shannon
384a31e3c6 Gets member picker working with UDI, ensures that the GUID is indexed for all things - can't believe this wasn't being done, updates the search model mapper to return the UDI 2017-02-01 15:19:52 +11:00
Claus
74c167ed03 U4-9413 moving links to document and media to top of generic properties. 2017-01-30 13:18:30 +01:00
Shannon
9ef53536bf Updates the base editor models to include a readonly UDI, updates all model mappers to map the UDI, 2017-01-28 01:14:24 +11:00
Shannon
547351a719 Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310 2017-01-28 00:25:25 +11:00
Shannon
a5af5ba1a9 Adds new property to PropertyEditor's to mark them as deprecated so they don't show up in the data type list unless they are already selected 2017-01-17 18:54:50 +11:00
Niels Hartvig
a162f21a70 Fixing missing mapping - let the green build lights appear 2017-01-16 19:49:57 +01:00
Niels Hartvig
ace111aefb Adding support for get, save and rename to new Partial View editor 2017-01-16 16:50:22 +01:00
Niels Hartvig
e7f7631d1e Fixes merge conflicts (needs updated ng-if in insert overlay) 2017-01-13 13:22:43 +01:00
Warren Buckley
5041a459d4 Merge pull request #1681 from umbraco/temp-template-editor 
Temp template editor
 2017-01-12 15:56:08 +00:00
Per Ploug
f036bc90c3 Fixes failing mapper test 2017-01-10 16:54:46 +01:00
Niels Hartvig
5a2687d520 Merge of temp-template-editor 2017-01-10 14:47:33 +01:00
Niels Hartvig
4c330c8654 Implements CodeFileController 2017-01-09 22:54:28 +01:00
Sebastiaan Janssen
770f96b6d5 Merge branch 'dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2017-01-05 09:47:51 +01:00
Shannon
790e30defd Simplifies all creation of UrlHelper, creates GetUmbracoApiServiceBaseUrl extensions for WebApi 2017-01-03 11:13:38 +11:00
Brian Powell
afa39866ad Fix U4-9298 2016-12-17 21:12:45 -05:00
Stephan
d800a4198d fix meh 2016-11-15 09:14:55 +01:00
Mads Rasmussen
f6d8a980a6 Merge branch 'dev-v7' into temp-template-editor 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-11-14 11:04:15 +01:00
Claus
ff2805c428 mostly just formatting and cleanup - no changes as such. 2016-11-09 11:13:35 +01:00
Claus
69c45a4b05 Merge pull request #1612 from tnielsenskybruddk/dev-v7 
Link to member type from member properties
 2016-11-09 10:29:49 +01:00
Thomas Nielsen
cbfd04e950 Link to member type from member properties 2016-11-08 23:37:29 +01:00
Thomas Nielsen
981c0b83d3 Oops wrong pull request 2016-11-08 23:16:10 +01:00
Thomas Nielsen
16ae5cf634 Link to member type from member properties 2016-11-08 23:00:14 +01:00
Thomas Nielsen
ea67e21796 Link to mediatype from media properties 2016-11-02 21:20:03 +01:00
Shannon
ba0ef3676d U4-9109 changes all usage of automapper ResolveUsing<T> to instantiate the resolver explicitly - this prevents IoC frameworks registered against automapper to not explode if these resolvers have not been added to the container. 2016-10-27 18:32:16 +02:00
Sebastiaan Janssen
40b0a62cc3 Use int.MaxValue instead of 0 2016-10-19 14:58:56 +02:00
Callum Whyte
a1a90d5bff Fixes backoffice members list view for custom membership providers by using key instead of id in edit URL 2016-10-17 16:26:20 +01:00
Warren Buckley
5397f2c53a Merge pull request #1447 from umbraco/temp-u4-8906 
U4-8906 - optimize member perfs
 2016-09-15 15:14:34 +01:00
Stephan
fa45cd1a88 tmp 2016-09-02 14:44:16 +02:00
Stephan
9e82b8d693 U4-8906 - optimize member perfs 2016-09-01 12:11:12 +02:00
Stephan
4133574db0 U4-8906 - optimize member perfs 2016-08-26 15:30:24 +02:00
Shannon
c331ba134a Fixes 301 redirect js naming conventions, fixes URL handling, moves c# classes to the correct/constistent namespaces, fixes up models and N+1 requests, adds model mapping to not return the business logic model, adds controller method to check if it's enabled instead of returning the result as part of the search. 2016-08-08 14:40:53 +02:00
Shannon
2c15db5950 U4-8530 Make it possbile to hide preview button by DocumentType or ContentItem 2016-08-04 18:34:20 +02:00
Sebastiaan Janssen
b7264b58f9 Fixed the mapping for HasPublishedVersion 2016-08-04 12:19:24 +02:00
Marc Goodson
379661e302 Fixes U4-8772, adds HasPublishedVersion property to mapping of IContent to ContentItemBasic, then adds existing 'has-unpublished-version' css class to list view row if item is published but has unpublished changes 2016-07-25 09:17:27 +01:00
Sebastiaan Janssen
d0e47fe1ff Merge pull request #1339 from dannydrogt/temp-u4-8613 
U4-8613 Link to DocType from "Properties" tab is not localized
 2016-07-07 15:38:00 +02:00
Danny Drogt
5b417f6241 U4-8613 Link to DocType from "Properties" tab is not localized - Added call to TextService 2016-06-20 15:32:27 +02:00
Per Ploug
2368ea7cf8 Serverside template services 2016-06-12 18:49:05 +02:00
Shannon
bab693f2ba fix build 2016-05-25 10:56:41 +02:00
Shannon
f243133b95 Merge remote-tracking branch 'origin/dev-v7' into temp-U4-265 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
 2016-05-25 09:51:46 +02:00
Shannon
2504586c26 removes initial idea of performing conversion on the server since this would be a breaking change, instead we can easily do this on the client side - and this works much better. Have added pre-values to the date/time picker to be able to enable offset times. This is enabled for the publish-at pickers since those must be offset. When the datetime is offset, it shows the server time in small text underneath the picker. Have added js unit tests for the date conversions. Have updated the datepicker controller to set the model date in a single place/method so it's consistent. 2016-05-25 09:43:31 +02:00
Shannon
877b7d4af7 U4-8358 Writers can't schedule publish/unpublish times 2016-05-23 19:23:59 +02:00
Sebastiaan Janssen
c856795cb7 Fix hilariously wrong copy/pasted TODO comments.. 2016-04-05 08:03:47 +02:00
madden-tom
2d514ac09e Added check for publish permissions to remove option for Publish At a… 
U4-287 "Publish at" circumvents "Send for approval/publishing"
 2016-04-05 08:01:05 +02:00
Stephan
ecdca378c6 U4-8175 - fix PropertyType.PropertyGroupId inconsistencies 2016-03-16 13:41:58 +01:00
Stephan
800e02bccf Bugfix model mapper for PropertyTypeDisplay 2016-03-16 10:19:06 +01:00
Stephan
8e82ff5450 Merge pull request #1173 from umbraco/temp-U4-8012 
U4-8012 Generic properties tab disappears on the edit Member Type win…
 2016-03-15 16:24:21 +01:00
Shannon
d5fe8c11c8 U4-8065 Inherited from is empty - reverts 10617d1bd5, turns out this is why we needed that property value 2016-03-15 15:08:53 +01:00
Shannon
3fdb122e91 U4-8012 Generic properties tab disappears on the edit Member Type window after upgrade to 7.4 2016-03-15 14:44:03 +01:00