Commit Graph

1300 Commits

Author SHA1 Message Date
perploug
e69dea26a5 Adds extra null checking when looking up active tree 2014-02-19 00:19:11 +01:00
perploug
6944f25c9f Fixes Assets.Service callback not firering 2014-02-17 16:17:16 +01:00
perploug
45c7699a33 Footer breadcrumb navigation 2014-02-17 16:17:09 +01:00
perploug
2bd2f12831 ImageCropper Upload enabled
The cropper can now fully replace the upload datatype
2014-02-17 16:17:02 +01:00
perploug
fa4e9d0cd1 Merge remote-tracking branch 'origin/7.1.0-ImageCropper-WIP' into 7.1.0 2014-02-11 14:56:41 +01:00
perploug
764644fc5d Merge 2014-02-11 14:55:22 +01:00
perploug
0bf27f4371 Make sure the formcontroller reset dirty state on save 2014-02-11 14:48:06 +01:00
perploug
36a8599e62 Adds cache bursting to production mode
Package installer bumps CDF version, we make sure to purge the angular
cache
initial js loader gets a cache burst as well
2014-02-10 13:02:16 +01:00
perploug
2850c3c3de Improved caching in debug mode by adding global yepnope filter 2014-02-07 15:45:52 +01:00
perploug
cec8001c38 Fixes issue with MediaHelper and complex property values 2014-02-07 09:16:05 +01:00
perploug
7dbd21a854 ImageCropper Added as a real property editor + polish
Polishing the UI, it can now edit actual image data and store crop
points / center point as json, next add configuration service
2014-02-07 09:15:44 +01:00
perploug
9ff82f3a00 Removes unneeded loging in umbpanel.directive 2014-02-04 13:58:13 +01:00
perploug
25999be0c9 Improves sticky footer button detection
Refactored the event hooks, added a watch on the buttons position
2014-02-04 12:53:09 +01:00
perploug
853baf9462 Final tweaks to the unsaved changes dialog 2014-02-04 11:40:16 +01:00
Per Ploug Krogslund
6f36384a35 Merge branch '7.1.0-LocationChangeNotificatiion' into 7.1.0 2014-02-04 09:46:54 +01:00
Per Ploug Krogslund
d55e492d17 Route change confirm notification dialog 2014-02-04 09:46:14 +01:00
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
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
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