Commit Graph

47 Commits

Author SHA1 Message Date
Per Ploug
e501e7fb98 chore Clean up the build/belle directory 2013-06-18 10:58:04 +02:00
Per Ploug
4b68d1950c Replaces require.js with jepnope
Gets rid of the AMD pattern, adds scriptLoader service, work on security
service started
2013-06-18 10:51:26 +02:00
Per Ploug
a2e4b6b698 Icons fixed again, F U rebase 2013-06-11 18:16:48 +02:00
Per Ploug
a8cf9b1a44 merge 2013-06-11 18:15:17 +02:00
Per Ploug
0ace3a1f74 utill.service.js update to support icons 2013-06-11 18:06:52 +02:00
Shannon
1511a5b951 Got images to work even if they are stored as legacy image data structure 2013-06-11 18:00:25 +02:00
Shannon
5dee0208f5 Fixed content title saving 2013-06-11 15:04:23 +02:00
Shannon
c055dedee9 GetByIds content method 2013-06-11 14:43:36 +02:00
Shannon
b89958af41 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-11 14:31:14 +02:00
Shannon
d4cfa57b2a Got media creation working and fixed updating node names. 2013-06-11 14:30:37 +02:00
Per Ploug Krogslund
20bac8085e Update manifest to support textstring, area, boolean and content picker 2013-06-11 13:19:58 +02:00
Shannon
16d2711177 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-11 13:16:03 +02:00
Shannon
a39e57f4d9 added null check for prop editors, got the RTE media picker working properly with correct styles and using the server data. 2013-06-11 13:12:54 +02:00
Per Ploug Krogslund
e32d0890c0 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:
	.gitignore
2013-06-11 12:29:34 +02:00
Shannon
a656911061 Updating media picker to work and look properly 2013-06-11 12:16:37 +02:00
Per Ploug Krogslund
6061190021 googlemaps update to support duncanson 2013-06-11 12:16:31 +02:00
Shannon
da146891ef Updated ignore file and ignored all Belle build files. 2013-06-11 09:32:51 +02:00
Shannon
3fee64d6eb Got media saving now.
Signed-off-by: Shannon <sdeminick@gmail.com>
2013-06-11 02:01:17 +02:00
Shannon
aea1a17a03 Last commit into mercurial!!! -- a bunch of model mapping mayhem 2013-06-10 20:24:54 -02:00
Shannon
e750fda197 added readonly view to support showing value from legacy data types. 2013-06-10 17:12:59 -02:00
Shannon
877c0b85cd Refactors content model mapper to be re-used for media, added new base model class
to deal with content similarities like media. Renamed some service methods to be consistent.
2013-06-10 16:43:42 -02:00
Shannon
e8c4063ed1 Fixes data saving services 2013-06-10 15:58:52 -02:00
Shannon
01c48b7dba Fixed content edit data issue and fixes media controller naming 2013-06-10 15:49:35 -02:00
Shannon
655a280cf1 Ensures the tree expansion doesn't happen when there are no child nodes. 2013-06-10 15:03:25 -02:00
Shannon
c8df4a08f9 missing file commit 2013-06-10 14:48:29 -02:00
Shannon
b12e59cbac Removed temp committed files for belle, added build scripts 2013-06-10 14:46:49 -02:00
Shannon
6b6dfceda0 Fixed issues with tree data loading 2013-06-10 14:03:41 -02:00
Shannon
81f10b72d7 Fixes some issues with merge changes. 2013-06-10 13:39:44 -02:00
Shannon
966531bd95 renames content controllers with correct file names 2013-06-10 13:20:46 -02:00
Shannon
fa9c259a84 Adds media views and controllers 2013-06-10 13:19:45 -02:00
Shannon
e88c28c486 Fixed JS build issues. 2013-06-10 13:16:13 -02:00
Shannon
10facc24fa ensures media picker html is correct 2013-06-10 13:10:21 -02:00
Shannon
afb4867951 Ensures resources are correct 2013-06-10 13:05:57 -02:00
Shannon
77c8b22fe1 Merges in custom controller changes. 2013-06-10 13:01:17 -02:00
Shannon
3bd7fbfa9a Ensures tree directive is using the icon filters (which we'll need to change later) Added
custom validation directives.
2013-06-10 12:56:32 -02:00
Per Ploug Krogslund
f472e139b5 clearing out legacy common folder 2013-06-10 10:48:36 -02:00
Per Ploug Krogslund
47f1dcf4e5 Missing client files, excluding node_modules 2013-06-10 10:44:40 -02:00
Per Ploug Krogslund
6b6ece01f6 Moved all JS files to umbraco.ui.client folder so naming and structure is consistent with the umrbaco 7 structure
Added locally mocked data in a seperate module
2013-06-10 10:39:34 -02:00
Shannon Deminick
47af165ad8 Got legacy icons working 2013-06-02 23:00:02 -10:00
Shannon Deminick
dd3490a2ab added extension.js, trying to add legacy sprites for tree icons, updates tree icon filters (still not working) 2013-06-02 20:34:06 -10:00
Shannon Deminick
575b5b71ab got legacy tree icons showing up now, added a couple of filters for this to work. 2013-06-02 17:09:16 -10:00
Shannon Deminick
8aba37cb10 removes container controller 2013-06-02 14:35:26 -10:00
Shannon Deminick
f3fbae7173 Updated trees to get children nodes from the server... nearly working and also works with proxying
to legacy trees. In fact there are not new trees created yet, just focusing on adapting for legacy trees
which so far seems to be good.
2013-05-31 17:20:56 -10:00
Shannon Deminick
ad1a36c0ee Changed new directives over to user proper function declaration with code comments. Added new tree data resource, using
promise api to return the data (handy!)
2013-05-31 04:28:26 -10:00
Shannon Deminick
43c7ccc5cc adds custom directives to simplify the default razor view markup so it can be managed externally. 2013-05-31 03:04:38 -10:00
Shannon Deminick
160811e190 added new tests for model mapping and serialization of the content display models. Started integrating trees. Committed the compiled
angular controllers, directives, services, resources since I'll be modifying them to work with the real data services. Then we'll have
to merge back to the belle repo with the changes.
2013-05-30 21:21:52 -10:00
Shannon Deminick
03f64521cb updated sln to have a simple website project in the Umbraco.UI.Client folder which will be the Belle development folder, its a website so it doesn't compile or anythng
just a space to be able to edit files. We can probably also update it to launch IIS Express to point to the build folder for testing. Moved the back office
scripts controller actions just to the normal back office controller. Tweaked some of the Belle POC so now it is loading and have created an index.html
file which contains all the belle stuff so people won't have to worry about the container razor file.
2013-05-29 20:25:29 -10:00