yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,098 Commits 4 Branches 7 Tags
0558fbd7ff331a4668b89ffd6c101d4ff35e3a3a
Commit Graph

16098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lars-Erik Aabech
0558fbd7ff Unit test for template editor. Currently testing that masterpage and layout is set. 2016-06-13 20:51:58 +02:00
hemraker
49d5e9a29e Add page field to overview 2016-06-13 19:58:02 +02:00
hemraker
221438c5fc Fixe merge confusion 2016-06-13 19:44:05 +02:00
hemraker
a29de2f910 Close pageFieldOverlay on submit 2016-06-13 19:40:54 +02:00
hemraker
8de155c1a4 Merge remote-tracking branch 'refs/remotes/origin/temp-template-editor' 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/templates/edit.html
 2016-06-13 19:36:50 +02:00
hemraker
846da6763a Add page field overlay 2016-06-13 19:31:40 +02:00
Per Ploug
40c9357adb merge 2016-06-13 19:12:01 +02:00
Per Ploug
fba91b203c merge 2016-06-13 19:04:22 +02:00
Per Ploug
93891a6a71 Make the template tree use the new view for create 2016-06-13 19:03:06 +02:00
Per Ploug
5091f60bb2 create template tweaks 2016-06-13 19:03:06 +02:00
Mads Rasmussen
1bbcf47d07 add "insert overlay" with insert dictionary item and insert macro 2016-06-13 18:48:26 +02:00
Lars-Erik Aabech
7ef98207cb Organize dialog can now insert sections, rendersections, renderbody, and select master. 
Cursor stays where it was before editor was blurred.
 2016-06-13 17:27:57 +02:00
Per Ploug
646b3c6efb Insert dictionary item dialog 
Includes a way to override the tree picker as it currently thinks
everything is an entity, which it isn't
 2016-06-13 17:22:11 +02:00
Lars-Erik Aabech
aef659cc92 merge the merge of the fork of the fork 2016-06-13 16:05:07 +02:00
Lars-Erik Aabech
a0660c6696 merged 2016-06-13 16:03:43 +02:00
Per Ploug
eb0166ae7a Merge remote-tracking branch 'origin/temp-template-editor' into temp-template-editor 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.html
 2016-06-13 16:01:31 +02:00
Lars-Erik Aabech
44cde95b47 organize controller added with list of templates for master selection 2016-06-13 16:00:33 +02:00
Per Ploug
746072a65d sample use of insert layout 2016-06-13 15:49:57 +02:00
Per Ploug
f17aadccda adds setLayout to the editor 2016-06-13 15:49:00 +02:00
Per Ploug
b2ea92940e Moves querybuilder to a overlay 2016-06-13 15:48:47 +02:00
Mads Rasmussen
e18a668e13 add toolbar 2016-06-13 15:22:13 +02:00
Mads Rasmussen
db2dafd40c make it possible to lock a description in the editor header 2016-06-13 15:19:30 +02:00
hemraker
a3614fee0d Added ace to gruntFile.js 2016-06-13 13:08:33 +02:00
Per Ploug
8a66943f4a Makes template tree load the new angular editor 2016-06-12 18:49:19 +02:00
Per Ploug
2368ea7cf8 Serverside template services 2016-06-12 18:49:05 +02:00
Per Ploug
ebd2bf149c Basic editor + macro dialog implemented 2016-06-12 18:48:46 +02:00
Mads Rasmussen
7dfc288f93 setup view + load ace editor 2016-06-12 12:26:08 +02:00
Shannon
38e59373c6 U4-8569 Saving a member type changes the UniqueId of custom properties and tabs 
This fixes the tab/group unique id mappings
 2016-06-08 09:47:06 +02:00
Shannon
50f4bbdd1e U4-8569 Saving a member type changes the UniqueId of custom properties 
This fixes the member property type UniqueID SQL and mapping.
This ensures that the main repositories fully assert/compare all fetched properties.
 2016-06-07 12:20:10 +02:00
Simon Busborg
111ef37bfb Merge pull request #1286 from bjarnef/dev-v7-U4-8525 
Fix tiny issues with dropzone border and sticky header
 2016-06-06 12:04:48 +02:00
Shannon Deminick
6681e48c57 Merge pull request #1301 from dampee/dev-v7 
update examine documentation links
 2016-06-03 11:41:41 +02:00
Damiaan
7b101caf0b update examine documentation links 2016-06-03 11:36:07 +02:00
Shannon
aff03997d9 Moves static event binding for prop editors to startup handlers 2016-06-01 11:27:08 +02:00
Sebastiaan Janssen
cff7dbc81a Temp u4 8495 (#1293) 
* U4-8495 Create YML file for AppVeyor

* Secret token needs to be in single quotes

* Secure token instead of a configuration variable should make the slack notification work

* Only post to Slack when build fails
 2016-05-31 15:21:37 +02:00
Sebastiaan Janssen
1121362ca9 Merge pull request #1295 from umbraco/temp-U4-8511 
U4-8511 Update moment.js to the version to 2.10.3 for release
 2016-05-30 16:08:51 +02:00
Sebastiaan Janssen
6ad4390d20 Merge pull request #1294 from umbraco/temp-U4-8331 
Fixes: U4-8331 Umbraco.MultipleMediaPicker 'pick only images' should not allow a folder to be picked
 2016-05-30 14:57:14 +02:00
Mads Rasmussen
8d5742acb7 Merge pull request #1281 from umbraco/temp-U4-8445 
U4-8445 Validation on the Email field for Members will not allow the …
 2016-05-30 14:41:46 +02:00
Shannon
4aa4a03013 U4-8511 Update moment.js to the version to 2.10.3 for release 2016-05-30 14:25:47 +02:00
Mads Rasmussen
9190855bcf add configuration to disable folder select 2016-05-30 14:08:30 +02:00
Sebastiaan Janssen
720a46686b U4-8500 Get c# docs building (#1291) 
fetches docfx, builds the metadata and builds the docs with the correct filters
builds the UI docs from the same powershell script
 2016-05-30 12:02:13 +02:00
Mads Rasmussen
11c1b5a2c4 Merge pull request #1126 from KevinJump/dev-v7-StylesheetProperties-U4-7160 
U4-7160: Stylesheet RegEx to capture multi class properties
 2016-05-30 10:51:30 +02:00
Simon Busborg
885d14bcb6 Fixes: U4-8455 IE11 - Image Cropper stretches the image when zooming 2016-05-30 10:01:39 +02:00
Mads Rasmussen
654f130105 Merge pull request #1275 from bjarnef/dev-v7-U4-8489 
Ensure correct font is used for icon-check
 2016-05-30 09:56:05 +02:00
Mads Rasmussen
2f445543f4 Merge pull request #1263 from lars-erik/U4-8443 
U4-8443 - Immediately create node from list view when only one available document type
 2016-05-30 09:39:38 +02:00
Simon Busborg
216c70becc Merge pull request #1273 from gkonings/disable-submit-overlay 
U4-8332
disable/enable submit button on overlay window
 2016-05-30 09:35:42 +02:00
Simon Busborg
7046fca333 Merge pull request #1274 from bjarnef/dev-v7-U4-8486 
Fixes some styling for login screen on narrow screen sizes
 2016-05-30 09:27:42 +02:00
Simon Busborg
43ece1aba4 Merge pull request #1272 from gkonings/slider-default-round 
Removed required attribute from slider-handle
 2016-05-30 09:19:28 +02:00
bjarnef
cd3140af21 Fix tiny issues with dropzone border to the left for fixed header and header jump by 1px when it get sticky. 2016-05-26 21:13:25 +02:00
Mads Rasmussen
b3b4cd4654 Fixes: U4-8480 Allow deleting empty tab when creating a doctype 2016-05-25 15:30:35 +02:00
Shannon
def8ee4962 fixes ysod when indexing grid content when the value is not a string (sub json value) 2016-05-25 14:38:24 +02:00