Commit Graph

70 Commits

Author SHA1 Message Date
perploug
229b770447 fixes: U4-2854 Re-adds actions on root tree nodes 2013-10-01 11:40:56 +02:00
Shannon
42e8e9442e Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-24 13:34:36 +10:00
Shannon
972d33ccec Got macro content loading in editor async updated more of the macro plugin to ensure the macro contents cannot be edited. 2013-09-24 13:34:29 +10:00
Niels Hartvig
32f4eaf900 WIP on image uploading
UX work - broken atm.
2013-09-23 21:24:34 +02:00
Shannon
61654a370a Got TinyMCE insert macro button/dialog inserting into the rich text editor - now need to ensure it is written out correctly and then parsed on the server properly so that it works! 2013-09-23 12:15:15 +10:00
Shannon
7396b01466 Got macro parameter editors inserting macros into the template editor for both webforms and mvc, created unit tests for macro syntax in macroservice. Removed the hard coded span8 for input elements for property editors - need to figure out a different way to set their width. 2013-09-20 14:24:39 +10:00
perploug
445e749372 Fixes: Legacy dialogs couldnt close 2013-09-18 13:09:40 +02:00
Shannon
3e03fea1ae Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-18 10:49:18 +10:00
Shannon
544bb4eb81 Added ability to launch a native angular modal window from an iframe, starts creating the macro parameter dialog for templates. 2013-09-18 10:49:10 +10:00
perploug
b8ae98ab13 Updates TinyMCE to 4.0.6 2013-09-17 13:43:19 +02:00
perploug
9ba341d490 Made dialogservice return the dialog obj instead of dom 2013-09-10 18:01:03 +02:00
perploug
bd85f9b5b7 Speechbubble fixes for legacy editors 2013-09-10 18:00:34 +02:00
perploug
f1dda1b86c Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-10 15:09:36 +02:00
perploug
6adace58fd Better click detection for modal closing 2013-09-10 14:35:44 +02:00
Shannon
7061051d2c added support for the legacy closeTriggers for legacy modals. 2013-09-10 18:07:22 +10:00
Shannon
8d83dc462d Fixes: U4-2777 Get legacy tree pickers working - calls the close callback by inside of the umb client mgr instead of having to modify the dialogservice, this works well for legacy pickers. 2013-09-10 17:58:59 +10:00
perploug
c27f6e3458 merge legacy client 2013-09-04 16:02:23 +02:00
perploug
8e93cfa94d merge 2013-09-04 16:00:30 +02:00
perploug
fd06c1b785 add jqueyr sortable lib 2013-09-04 15:43:24 +02:00
perploug
b97b4eaa89 Revert "Revert "Remove jquery sourcemap reference""
This reverts commit 87df168c7d.
2013-09-04 15:39:50 +02:00
perploug
87df168c7d Revert "Remove jquery sourcemap reference"
This reverts commit fbdd94e577.
2013-09-04 15:35:57 +02:00
perploug
fbdd94e577 Remove jquery sourcemap reference 2013-09-04 15:35:32 +02:00
Shannon
0273b79935 Fixes the dialogs when used by the legacy umb manager to ensure that they only close the latest open (which is what the legacy stuff is expecting), now the xslt visualizer works with the picker as well. Completes: U4-2777 Get legacy tree pickers working 2013-09-04 20:42:37 +10:00
Shannon
ecdfecd173 Fixed the dialog service to be able to call registered callbacks even if the dialog is an iframe, this helps fix the legacy tree pickers, fixed up the legacy tree control so that it can load in new trees as well 2013-09-04 20:06:41 +10:00
perploug
623a28c158 delete fontawesome 2013-09-02 15:40:14 +02:00
Shannon
7806762b80 Implemented a real .Net configuration section for umbracoSettings.config + unit tests for every property. NOTE: This isn't referenced in the codebase yet, going to start setting default values for most of the properties so that we can remove them from the config file for shipping (ship minimal config) then reference these settings in the codebase. 2013-08-31 11:28:19 +10:00
perploug
8b1fcf3e07 Media dialog upload and folder creation 2013-08-27 16:01:39 +02:00
Anders Stentebjerg
c03839d985 ImageCropper
- Media Picker grid
- Image Cropper dialog
- Updated Font Awsome to 3.2.1
2013-08-27 09:52:13 +02:00
Per Ploug Krogslund
266840cfdb Adding jquery file upload and modal tweaks 2013-08-26 14:48:58 +02:00
perploug
789b0d1c41 Moved 1.1.5 to folder, added 1.2Rc1 2013-08-21 21:13:23 +02:00
perploug
d1d84e8be6 Delete old angular files 2013-08-21 21:09:55 +02:00
perploug
f9e6efbf8f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-21 14:57:24 +02:00
perploug
e2ddaff401 start on migration to 1.2 2013-08-21 14:57:14 +02:00
Per Ploug Krogslund
5bd1b4bef3 Angular 1.2 files 2013-08-21 14:54:11 +02:00
Shannon
5581af2d25 Fixed up the file uploading and the readonly property editors and saving/updating their data/control based on the data changed on the server side.
U4-2680 Fix file uploading
2013-08-21 17:54:30 +10:00
Per Ploug Krogslund
f13d5c48fe Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/routes.js
2013-08-14 14:30:23 +02:00
Per Ploug Krogslund
99d41ca63a added ace editor directive 2013-08-14 14:28:17 +02:00
Per Ploug Krogslund
8a32753cbc Replaced codemirror lib with ace 2013-08-14 14:26:40 +02:00
Shannon
4a8026c902 Got the Date and Date/Time new property editors created, fixed up a few date casting issues with data. These editors 'should' be compatible with the previous legacy date/datetime editors, just need to test it. 2013-08-14 20:08:45 +10:00
Shannon
4a7fbfa3fa Fixes the datepicker control, updates it so that it supports time and a format that is configurable (pre-values) fixes toIsoDateTimeString() method. 2013-08-14 11:08:40 +10:00
perploug
e825c08901 Added events.Service and xmlhelper.service 2013-08-12 15:17:34 +02:00
Shannon
66595a53c1 Fixes issue with saving to filter out the extra custom generic tab properties before submitting. Removes date filter because we aren't dealing with JS date objects from the server, only strings which are always formatted consistently. 2013-08-08 16:10:05 +10:00
Shannon
371bf785b0 Changed to jquery 2.0.3, added a few jquery ui bits and pieces, got the sort dialog working with an angular-ui sortable directive and styled it. 2013-08-07 14:25:30 +10:00
Shannon
c3737018e0 Fixes overflow on dialogs when there too much content, fixes date format for content mocks. 2013-08-07 12:27:50 +10:00
Shannon
91a2ffcf1d removes js files we aren't using, if we need them later we can add them back. 2013-08-07 12:26:49 +10:00
Shannon
b565a3468b Moves larger util classes to their own files, fixes up the notification service to ensure notifications go away properly. 2013-07-22 18:40:02 +10:00
Shannon
f2b28e6bfb Adds 'native' content deleting (not via the legacy objects) and updates the mock data to support this in the Client proj. 2013-07-15 16:48:29 +10:00
Per Ploug
22f6be61de Updates yepnope, adds markown sample editor 2013-07-12 11:36:22 +02:00
Per Ploug
410b664f7f Got legacy create dialogs working
Its not pretty, but it works, and over time these hacks should slowly
fade away
2013-07-10 15:35:38 +02:00
Shannon
0f207b01f2 Integrated auth into the UI project and unit tests (you need to log in each time with arbitrary username/password). Fixes authorization, the auth check SHOULD return a 401 so that the MainController re-fires the auth check in order to re-set the 'authenticated' scope flag. Fixed err caused by trying to launch login dialog too many times when too many http calls fail. Converted over authResource to use correct resourcePromise structure. The mock auth is done with angular cookies, so integrated that too. Removes main.js since we don't use it anymore. Fixes media mocks. Removes call to get sections in navigationService since it is irrelevant and causing more issues when not authenticated. 2013-07-10 13:24:28 +10:00