perploug
|
9ee1584ede
|
Initial PublishedContent service for niceUrl access
|
2013-10-03 20:58:16 +02:00 |
|
perploug
|
a3d77b7e72
|
Adds RTE and stylesheet services
|
2013-10-03 20:57:36 +02:00 |
|
perploug
|
14e1e741ed
|
Added configuration fetching to tinymce service
|
2013-10-03 20:53:34 +02:00 |
|
perploug
|
94f72b3938
|
minor log.resource docs update
|
2013-10-03 20:53:16 +02:00 |
|
perploug
|
4283734a94
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-10-02 19:23:57 +02:00 |
|
perploug
|
6c20815210
|
Initial commit of rte prevalue editor
|
2013-10-02 19:23:36 +02:00 |
|
perploug
|
a371ebe841
|
Progressbart convert to css3 from gif
|
2013-10-02 19:23:20 +02:00 |
|
perploug
|
92a32a8f8d
|
rollback dialog polish
|
2013-10-02 19:23:04 +02:00 |
|
perploug
|
bb1a47aa81
|
Permissions dialog polish
|
2013-10-02 19:22:54 +02:00 |
|
perploug
|
6126a52156
|
child action icon alignment tweak
|
2013-10-02 19:22:34 +02:00 |
|
Stephan
|
3ee4399fca
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
src/Umbraco.Core/ObjectResolution/Resolution.cs
|
2013-10-02 17:40:03 +02:00 |
|
Stephan
|
f64b8d680d
|
Core.StringExtensions - switch over to the new DefaultShortStringHelper
|
2013-10-02 16:54:56 +02:00 |
|
Stephan
|
f9663a9e80
|
Core.EnumerableExtensions - refactor InGroupsOf to enumerate source only once
|
2013-10-02 16:54:47 +02:00 |
|
Shannon
|
dc42c1ebb7
|
More work on streamlining package development for views and conventions.
|
2013-10-02 21:03:51 +10:00 |
|
Shannon
|
92efd6d645
|
Got menu items working with external packages to look for views by convention inside of their package folder.
|
2013-10-02 20:48:15 +10:00 |
|
Shannon
|
6560865f61
|
Fixed view path conventions for menu items
|
2013-10-02 20:20:02 +10:00 |
|
Shannon
|
8f53bea3d7
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-10-02 20:00:34 +10:00 |
|
Shannon
|
89f7a31bef
|
Updates the Create/AddMenu overloads to ensure a name is specified, fixes all localization of all menu items for all new trees.
|
2013-10-02 20:00:01 +10:00 |
|
Stephan
|
65898411e7
|
Core.Resolution - umbraco.cms.Action should NOT reset resolution
|
2013-10-02 11:48:50 +02:00 |
|
Stephan
|
759a3619ca
|
Core.Resolution - fix concurrency issues
|
2013-10-02 11:48:30 +02:00 |
|
Stephan
|
e6bb999d83
|
Core.Resolution - umbraco.cms.Action should NOT reset resolution
|
2013-10-02 11:42:17 +02:00 |
|
Stephan
|
cdd1a0a4cb
|
Core.Resolution - fix concurrency issues
Conflicts:
src/Umbraco.Core/ObjectResolution/Resolution.cs
|
2013-10-02 11:41:48 +02:00 |
|
Stephan
|
5e0fbe5634
|
Macros - bugfix parameters
|
2013-10-02 11:16:39 +02:00 |
|
Stephan
|
9b43a86b94
|
Core.Resolution - fix concurrency issues
|
2013-10-02 11:09:26 +02:00 |
|
Shannon
|
1090248223
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-10-02 18:58:21 +10:00 |
|
Shannon
|
880077f6e9
|
Created TagRepository, added foreign key to cmsTags.ParentId
|
2013-10-02 18:57:44 +10:00 |
|
perploug
|
ffc1b62b8a
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-10-02 10:56:54 +02:00 |
|
perploug
|
17f2602ca2
|
icon finder now loads .icon-* from all registered stylesheets
|
2013-10-02 10:56:40 +02:00 |
|
perploug
|
a71e255468
|
re-adds tree cache
|
2013-10-02 10:55:58 +02:00 |
|
perploug
|
f2458b833e
|
consistent create dialogs
|
2013-10-02 10:55:48 +02:00 |
|
perploug
|
2b2d986371
|
Content copy with relation in js layer
|
2013-10-02 10:55:38 +02:00 |
|
perploug
|
1ed21a3ffb
|
Better font handling with correct weights
|
2013-10-02 10:55:20 +02:00 |
|
perploug
|
1f32373bd2
|
sample manifest with css
|
2013-10-02 10:54:59 +02:00 |
|
perploug
|
5b1c626714
|
Reverts meadia sort to legacy dialog
|
2013-10-02 10:54:37 +02:00 |
|
perploug
|
ce30153830
|
Enables the manifest to load custom stylesheets outside the js loading
|
2013-10-02 10:54:25 +02:00 |
|
perploug
|
727f3a804d
|
Removes osx shadow files
|
2013-10-02 10:53:12 +02:00 |
|
Shannon
|
be7179b962
|
Fixed up the TagRelationshipDto to have the correct columns, keys, etc.. as our upgrade, updated the old tags API to support the new changes.
|
2013-10-02 17:10:12 +10:00 |
|
Shannon
|
7eee954d4d
|
OOPS! didn't mean to delete this a couple days ago :P
|
2013-10-02 15:56:53 +10:00 |
|
Shannon
|
36cb078073
|
Tags db upgrades done, now to look at ensuring the legacy tags stuff works.
|
2013-10-02 15:51:02 +10:00 |
|
Shannon
|
8b6171bb13
|
Almost got the tags tables upgraded
|
2013-10-02 13:50:42 +10:00 |
|
Shannon
|
917d5b39ec
|
Changes auth controller post login to return an normal validation response instead of 4.3 so the err msg doesn't show up.
|
2013-10-02 13:42:36 +10:00 |
|
Shannon
|
65f809a0fb
|
chagnes IsAuthenticated to not return a 403 so the warning msg doesn't display.
|
2013-10-02 09:53:58 +10:00 |
|
Shannon
|
bad4d0c6e6
|
fixes merge issues
|
2013-10-02 09:30:53 +10:00 |
|
Shannon
|
2a1e3dc2f8
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
|
2013-10-02 09:22:33 +10:00 |
|
perploug
|
5199a5dc99
|
Move, Copy, protect, notifications dialogs polish
|
2013-10-02 00:11:10 +02:00 |
|
perploug
|
2e8a8e3623
|
Working move dialog, needs feedback and validation
|
2013-10-01 16:14:54 +02:00 |
|
perploug
|
1ec74a5ae8
|
Fixes: U4-3005 userdialog refuses to close
|
2013-10-01 15:51:39 +02:00 |
|
perploug
|
6c02eadd88
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-10-01 15:37:19 +02:00 |
|
perploug
|
60c4307f2e
|
Fixes: u4-3009 missing context menu in search results
|
2013-10-01 15:37:05 +02:00 |
|
perploug
|
e1c0e70d07
|
Fixes: U4-3001 missing root node in tree selectors
|
2013-10-01 15:36:42 +02:00 |
|