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

1331 Commits

Author SHA1 Message Date
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
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
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
Per Ploug Krogslund
7d7fcd2093 Wip on dropper and gravity editor directives 2014-01-30 22:28:50 +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
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
6338d57959 Cherry picked - Removes hard coded api url from rte embed 2014-01-29 09:34:07 +11:00
Tim Geyssens
93a4e8f426 Removes hard coded api url from rte embed 2014-01-28 16:18:30 +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
perploug
31429ad9c8 Fixes treenodes with very long names breaking the tree 2014-01-27 22:09:16 +01:00
perploug
05a8d80284 Fixes broken refresh action 
Refresh action referenced the tree, not its root node
 2014-01-27 22:08:40 +01:00
perploug
e17b32c6e5 Removes option to query media with Xpath on mntp 
Only content can be queried with Xpath in a reasonable performant manner
as its the only type of data that is cached as xml
 2014-01-27 13:49:09 +01:00
perploug
3e22598f4a fixes mntp filtering 2014-01-24 18:38:47 +01:00
perploug
d842f0f5b7 Adds support for xpath root node selection on mntp 2014-01-24 18:38:39 +01:00
perploug
8258619055 adds getByQuery to entityService 2014-01-24 18:38:08 +01:00
perploug
7d2f6c13c3 Addss template clearing when in debugmode 2014-01-24 17:20:34 +01:00
Shannon
e456dd3886 Merge branch '7.0.2' into 7.1.0 2014-01-20 18:33:54 +11:00
Shannon
697548d1c7 Fixes: U4-3897 Copy contents relations not created 2014-01-20 18:01:19 +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
1621d01992 fixes some unit tests 2014-01-17 13:18:49 +11:00
Shannon
334a56ce5c Fixes: U4-3765 v7 MultiNode Treepicker Sort not working 2014-01-17 12:25:34 +11:00
Shannon
c288734877 Fixes: U4-4054 Multinode Treepicker datatype - selecting a start node sends to content section 2014-01-16 19:47:27 +11:00
Shannon
2b1a43b40a Finally got somewhere with U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets - took ages to get this going, now to get it working when packages have custom screens. 2014-01-16 18:33:31 +11:00
Shannon
f334c3d74a playing a bit more with re-initializing the app, but think we're def gonna have to do a full browser refresh. To do that we'll have to figure out how to gen a deep link url to the installer complete screen which could include a custom screen from a package. 2014-01-15 17:47:46 +11:00
Shannon
0e6c199a7e working on U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets but unfortunately we cannot lazy load in things like directives as angular doesn't like that, we have to re-load the browser. 2014-01-15 17:18:23 +11:00
Shandem
3f0569af41 Merge pull request #285 from mrdrbob/U4-3831 
Fix for U4-3831.
 2014-01-14 20:17:32 -08:00
Shandem
80601abb27 Rename umbImageGravity.directive.js to umbimagegravity.directive.js 
Changed file name to be consistent with the rest of our file names
 2014-01-15 11:11:31 +11:00
Shandem
79384d8a0a Rename umbImageCrop.directive.js to umbimagecrop.directive.js 
changed file name to be consistent with the rest of our file names
 2014-01-15 11:11:02 +11:00
Shannon
e3da493345 Re-adds all updates for the WIP for xpath/css filtering and the cropper. 2014-01-15 11:06:20 +11:00
Shannon
c527833081 Revert "adds editing function to media picker controller" 
This reverts commit 7d051dffbb.
This will only be contained in 7.1
 2014-01-15 10:59:05 +11:00
Shannon
5caf091406 Revert "WIP: adds cropper directive" 
This reverts commit c5a7eab1d5.
new cropper is only contained in 7.1 branch
 2014-01-15 10:55:22 +11:00
Shannon
5a29441640 Reverts GetByQuery and MNTP Xpath query WIP - is contained only in 7.1 2014-01-15 10:53:14 +11:00
Bob Davidson
0da7ed8d93 Fix for U4-3831. Removes form, adds ng-click with $event.preventDefault() to prevent premature saving. 2014-01-14 15:40:22 -06:00
perploug
3df44e2990 treesource editor changes to remove the search field 2014-01-14 14:59:55 +01:00
perploug
0c5ebb2674 Fixes umbPhotoGrid Filtering 2014-01-14 14:40:00 +01:00
perploug
dc69b5a825 WIP: cropper and gravity editors 2014-01-13 10:17:16 +01:00
perploug
df7691ada3 Adds missing mocks 2014-01-13 10:14:30 +01:00
Shannon
3cb5754ff2 Fixed some null checks 2014-01-10 12:20:49 +11:00
Shannon
bf5bb8bc70 obsoletes imageHelper in favor of the new mediaHelper, updates the link picker to fix: U4-3882 Can't Link to Non-Image Media in 7.0.1 2014-01-10 12:11:52 +11:00