Shannon
|
15ea17e6d6
|
started on avatar directive
|
2013-06-18 12:02:34 +10:00 |
|
Shannon
|
e408d5f536
|
moves other controllers into separate files
|
2013-06-17 17:12:19 +10:00 |
|
Shannon
|
6ecfcd3767
|
Moves main controller into separate file, ignore file removes a bunch of build files that don't need to be there.
|
2013-06-17 17:02:36 +10:00 |
|
Shannon
|
a7b546527c
|
Added more methods to User Repo/Service to get an IUser by id. Upgraded to angular 1.5.5 to fix an animation bug. Got authorization working nicely now. Fixed up the animation.less files with 1.5.5's breaking animation changes. Fixed up WebSecurity class to always have an instance of HttpContextBase (still requires much more fixing though).
|
2013-06-17 16:03:27 +10:00 |
|
Shannon
|
34c98fe97b
|
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
.gitignore
|
2013-06-17 05:36:18 +02:00 |
|
Shannon
|
88b84c5bcf
|
Fixed up user login logic and works now, now to clean up the user data.
|
2013-06-17 05:34:30 +02:00 |
|
Shannon
|
c52e51b2d8
|
Fixed up external templated directives to use the templateUrl property which i didn't previously know about, this ensures that a new scope is not created for these elements which was causing issues. updated ignore file some more, removed committed files that shouldn't be there
|
2013-06-17 04:51:59 +02:00 |
|
Shannon
|
b50658121d
|
Started integrating authorization services.
|
2013-06-17 01:06:31 +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
|
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
|
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 |
|
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
|
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 |
|