 Shannon
|
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 |
|
|
Shannon
|
1511a5b951
|
Got images to work even if they are stored as legacy image data structure
|
2013-06-11 18:00:25 +02:00 |
|
|
Per Ploug
|
30ebf71c15
|
Google maps editor
|
2013-06-11 17:30:00 +02:00 |
|
|
Shannon
|
750b5fcaa3
|
updates ignore
|
2013-06-11 16:44:43 +02:00 |
|
|
Shannon
|
d32ea915e1
|
publishing is working
|
2013-06-11 15:13:45 +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 |
|
|
Per Ploug Krogslund
|
8810f7d742
|
gitignore file
|
2013-06-11 12:27:05 +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 |
|
|
Sebastiaan Janssen
|
4bf09089e6
|
Merge branch '7.0.0' of https://umbmigrate.kilnhg.com/Code/Repositories/Group/UmbMigrate into 7.0.0
|
2013-06-11 01:05:33 +02:00 |
|
|
Sebastiaan Janssen
|
f4fe0636d8
|
Update README.md
|
2013-06-11 00:58:23 +02:00 |
|
|
Sebastiaan Janssen
|
ca4f5a39da
|
Add missing files
|
2013-06-11 00:49:19 +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
|
711cc3629b
|
Fixed up some model mapping.
|
2013-06-10 17:01:50 -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
|
5a51a8440a
|
updates ignore
|
2013-06-10 14:51:21 -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 |
|
|
Shannon
|
6e83541e05
|
merging in controllers.js
|
2013-06-10 11:55:54 -02:00 |
|
|
Shannon
|
bf7eda9347
|
Removing items that shouldn't be there
|
2013-06-10 11:19:15 -02:00 |
|
|
Shannon
|
bc5ef66f1a
|
Merge
|
2013-06-10 11:16:05 -02:00 |
|
|
Shannon
|
df72297429
|
Got media picker working with real media items.
|
2013-06-10 11:15:33 -02:00 |
|
|
Per Ploug Krogslund
|
e09272316f
|
Merge
|
2013-06-10 10:56:44 -02:00 |
|
|
Per Ploug Krogslund
|
9c32a4ead0
|
Merge
|
2013-06-10 10:48:56 -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
|
47d70e858b
|
Getting media picker working
|
2013-06-10 10:36:59 -02:00 |
|