9cc95aba0e
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-06-11 18:02:23 +02:00
1511a5b951
Got images to work even if they are stored as legacy image data structure
2013-06-11 18:00:25 +02:00
30ebf71c15
Google maps editor
2013-06-11 17:30:00 +02:00
ab0ad9b255
Fixed drag drop upload for media in vdir
2013-06-11 16:04:28 +02:00
b89958af41
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
2013-06-11 14:31:14 +02:00
d4cfa57b2a
Got media creation working and fixed updating node names.
2013-06-11 14:30:37 +02:00
20bac8085e
Update manifest to support textstring, area, boolean and content picker
2013-06-11 13:19:58 +02:00
16d2711177
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
2013-06-11 13:16:03 +02:00
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
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
8810f7d742
gitignore file
2013-06-11 12:27:05 +02:00
a656911061
Updating media picker to work and look properly
2013-06-11 12:16:37 +02:00
da146891ef
Updated ignore file and ignored all Belle build files.
2013-06-11 09:32:51 +02:00
3fee64d6eb
Got media saving now.
...
Signed-off-by: Shannon <sdeminick@gmail.com >
2013-06-11 02:01:17 +02:00
aea1a17a03
Last commit into mercurial!!! -- a bunch of model mapping mayhem
2013-06-10 20:24:54 -02:00
e750fda197
added readonly view to support showing value from legacy data types.
2013-06-10 17:12:59 -02:00
655a280cf1
Ensures the tree expansion doesn't happen when there are no child nodes.
2013-06-10 15:03:25 -02:00
b12e59cbac
Removed temp committed files for belle, added build scripts
2013-06-10 14:46:49 -02:00
e0c68a8e1c
Resolves #U4-184 Upgrade package when installing a newer version.
...
Multiple package versions can be installed, only the latest version is listed under "Installed Packages".
When the installed package is viewed, a list of previously installed versions (of that package) are listed.
2013-06-10 13:55:58 -01:00
6e83541e05
merging in controllers.js
2013-06-10 11:55:54 -02:00
bf7eda9347
Removing items that shouldn't be there
2013-06-10 11:19:15 -02:00
bc5ef66f1a
Merge
2013-06-10 11:16:05 -02:00
df72297429
Got media picker working with real media items.
2013-06-10 11:15:33 -02:00
e09272316f
Merge
2013-06-10 10:56:44 -02:00
9c32a4ead0
Merge
2013-06-10 10:48:56 -02:00
47f1dcf4e5
Missing client files, excluding node_modules
2013-06-10 10:44:40 -02:00
47d70e858b
Getting media picker working
2013-06-10 10:36:59 -02:00
1b59c1ba6e
Got content item creation working and rte property editor working/saving
2013-06-09 11:40:52 -02:00
54bad14590
Merge
2013-06-09 06:21:09 -02:00
1f8aa65b5d
missing template to get demo working
2013-06-09 06:19:36 -02:00
0205f8a025
Merge
2013-06-09 06:19:27 -02:00
1da4f2379f
Temp removes uGoLive since the old TypeFinder isn't there anymore.
2013-06-09 06:19:08 -02:00
b341cf8b93
Commits temp js files needed for demo to work
2013-06-09 06:16:56 -02:00
e888bd39d6
Commits some directive views - temporary to get demo working
2013-06-09 05:58:06 -02:00
8e3f075fd9
missing file
2013-06-07 04:18:30 -10:00
9cfbb24f4c
Content is now saving properly in the editor.
2013-06-07 02:29:24 -10:00
9431ae7fdb
Fixed issues of using StateHelper since we do things in async which don't have an HttpContext.Current, so we use our
...
UmbracoContext.Current instead if required. Changed StateHelper to be obsolete as we need to replace all calls to it with
proper extension methods. Updated the content model mappers to ensure we ToArray property objects so they don't keep
re-processing the Linq statement when iterating. Content is now saving to the db.
2013-06-07 01:39:53 -10:00
96fac60c3f
So close to having data saving but now we have issues with HttpContext.Current because we are running async processes... fail.
2013-06-05 14:37:19 -10:00
406edc4aab
Adds a bunch of directives from my POC to do with validation but haven't implemented them. Ensures that ng-form is applied to each property item.
2013-06-04 23:01:26 -10:00
6dd48262e1
Fixed up how tabs are loading to work with async data and am now displaying real data !
2013-06-04 22:30:49 -10:00
fea28df758
Fixed more tree merge issues, fixed how property editors are rendered.
2013-06-04 15:59:14 -10:00
c932f31f40
merged in other styling and fixes from belle repo
2013-06-04 14:39:23 -10:00
55521458b4
Fixed up some merge issues
2013-06-04 14:29:41 -10:00
9e928ef0fa
Merged in latest changes from Belle repo
2013-06-04 14:05:13 -10:00
35ada35257
Updated content model mapper to re-use mappings as much as possible. Added most of the missing properties to content and inline with the expected format
...
in the UI project. Added basic user model and a mapper for that too. updated tree service in UI to automatically create the 'view' for each node based on
the section and id, the same way it updates the level for each node.
2013-06-03 23:50:20 -10:00
13c2aaf346
Fixed hard coded paths, removed html path in markup
2013-06-03 21:43:46 -10:00
bb1052c063
Started integrating the contentTypeResource with the real back office data.
2013-06-03 18:56:16 -10:00
0d071e9fe9
Changed all my custom stuff over to only be a part of the 'umbraco' module, this will just help with merging later so I'm not
...
mucking about with other module definitions. Added an icon converter so that we can automatically try to map all legacy sprite icons
to the new icons. Merged in recent chagnes from Belle repo to get sections working again.
2013-06-03 17:36:04 -10:00
76bbdcd32c
Merge with 6.1.2
2013-06-03 13:36:40 -10:00
932115585e
Fixes: #U4-2315 - CDF grouping issue, updated to new version
2013-06-03 13:35:41 -10:00
Shannon