perploug
|
35538d0fa2
|
Makes the grid work in chrome, ff, and ie10
|
2013-08-21 14:24:42 +02:00 |
|
perploug
|
fc87a91e14
|
Adds a delay to the navigation hide
|
2013-08-21 14:24:29 +02:00 |
|
perploug
|
50845c63a8
|
Makes the grunt engine faster and only acts on specific files
|
2013-08-21 14:24:16 +02:00 |
|
perploug
|
4e1c915781
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-08-21 13:10:16 +02:00 |
|
perploug
|
a75cfc5a2d
|
legacy dashboard url fix
|
2013-08-21 13:10:05 +02:00 |
|
Per Ploug Krogslund
|
3c55ccb590
|
loader.js
|
2013-08-21 13:08:52 +02:00 |
|
Per Ploug Krogslund
|
39ae3f6160
|
Fixes firefox height scale issues
|
2013-08-21 13:08:52 +02:00 |
|
perploug
|
1cff6d99ef
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-08-21 10:35:06 +02:00 |
|
perploug
|
e18a07e908
|
Unlocks the login button, failed attempt to test the keyboard service reverted
|
2013-08-21 10:34:53 +02:00 |
|
Shannon
|
ed68f2d28f
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-08-21 17:55:31 +10:00 |
|
Shannon
|
5581af2d25
|
Fixed up the file uploading and the readonly property editors and saving/updating their data/control based on the data changed on the server side.
U4-2680 Fix file uploading
|
2013-08-21 17:54:30 +10:00 |
|
perploug
|
6c9f4c6353
|
Removes missing files from web.ui csproj
|
2013-08-21 09:32:50 +02:00 |
|
Shannon
|
466b2a1cb2
|
Fixes: U4-2677 Fix content/media creation for media
|
2013-08-21 14:13:22 +10:00 |
|
Shannon
|
0dab52e8f6
|
Fixes creating content: U4-2677 Fix content/media creation - now to fix media
|
2013-08-21 13:38:49 +10:00 |
|
Shannon
|
b2eac9ab8f
|
Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/BusinessLogic/BaseTest.cs
|
2013-08-21 11:36:37 +10:00 |
|
Shannon
|
e233cffb9d
|
Changes the cache keys in PluginManager to reference a const to make it a bit more clear.
|
2013-08-21 11:19:27 +10:00 |
|
Shannon
|
9e58ebed24
|
Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4
|
2013-08-21 11:14:59 +10:00 |
|
Shannon
|
f51c4e332e
|
Fixes: U4-2653 BeginUmbracoForm should use absolute path with query string URLs without the protocol
|
2013-08-21 11:14:37 +10:00 |
|
Sebastiaan Janssen
|
8cfb39ba2b
|
Fix a strange VS2012 build targets problem
|
2013-08-20 18:08:34 +02:00 |
|
Sebastiaan Janssen
|
03a0a0a0e9
|
Fix a strange VS2012 build targets problem
|
2013-08-20 18:06:09 +02:00 |
|
Sebastiaan Janssen
|
0939a31c84
|
Merge branch '7.0.0' of github.com:umbraco/Umbraco-CMS into 7.0.0
|
2013-08-20 16:43:59 +02:00 |
|
Sebastiaan Janssen
|
9b70c0fbbf
|
Fix wrong path and don't include index.html in build
|
2013-08-20 16:43:36 +02:00 |
|
perploug
|
121d5462e9
|
Missing $scope in content edit controller
|
2013-08-20 16:07:46 +02:00 |
|
perploug
|
d09b1d9949
|
7.0.0 merge changed .cs from shannon
|
2013-08-20 15:26:53 +02:00 |
|
perploug
|
5c59269340
|
Fixes broken scope reference for rebinder
|
2013-08-20 15:22:30 +02:00 |
|
perploug
|
ff5afb91e6
|
Set a default avatar on navivation
|
2013-08-20 15:22:06 +02:00 |
|
perploug
|
3b7f12c883
|
set content to default section in the routes
|
2013-08-20 15:21:27 +02:00 |
|
perploug
|
dd7e4f19ba
|
Removed keyboard service debug logging
|
2013-08-20 15:21:12 +02:00 |
|
perploug
|
2e90e354bc
|
Fixes dashboard redirect on login
|
2013-08-20 15:20:46 +02:00 |
|
Sebastiaan Janssen
|
e71fa681e6
|
Update build to v7 and include belle files
|
2013-08-20 14:18:02 +02:00 |
|
Shannon
|
7df641cf2b
|
Got Data Type Creation working. Need to look at fixing up the issues with creating content/media tomorrow.
|
2013-08-20 18:10:19 +10:00 |
|
Shannon
|
b901ae3269
|
Updated the data type controller post method and moved validation, etc... over to a filter, updated data type tree with the create menu action to launch into a blank element.
|
2013-08-20 17:25:17 +10:00 |
|
Shannon
|
ddef2cc7ff
|
Got validation working properly with pre-values, updated the content editing helper to be more generic and work with different editors like the data type editor that supports umb-property.
|
2013-08-20 16:02:10 +10:00 |
|
Shannon
|
949748a7f7
|
Added some overloads to the data type service to be able to save data types + pre-values in one transaction, and also to be able to update pre-values (before we could only insert). Got the data type editor now validating and saving values back to the db. Updated the content views (content/media) to have a correct form structure with ng-submit working.
|
2013-08-20 14:44:59 +10:00 |
|
Shannon
|
ea8d7c842e
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-08-20 11:33:56 +10:00 |
|
Shannon
|
a29706b5ce
|
Updated the model mappers to include the pre-value value which is now wired up to the display, now just need to get the data type's persisting.
|
2013-08-20 11:33:41 +10:00 |
|
Sebastiaan Janssen
|
dcb381770f
|
Fix unit test that was looking at the wrong filename
|
2013-08-19 12:54:20 +02:00 |
|
Sebastiaan Janssen
|
65db0e69a9
|
Fixes: U4-2642 Make SQL CE more resilient to server crashes
|
2013-08-19 12:26:01 +02:00 |
|
Sebastiaan Janssen
|
23c6a91e9c
|
Fixes merge issue
|
2013-08-19 11:47:53 +02:00 |
|
Sebastiaan Janssen
|
a03c6dcf13
|
Merge pull request #80 from ThomasSkyldahl/6.1.4
UmbracoViewPage.WriteLiteral(object value) optimized memory usage and combined markup injection
|
2013-08-19 02:34:13 -07:00 |
|
Sebastiaan Janssen
|
3029d97f33
|
Merge pull request #78 from dprothero/6.1.4
Fixed membership provider to correctly log failed attempts.
|
2013-08-19 02:06:15 -07:00 |
|
Sebastiaan Janssen
|
f41d967864
|
Fixes: U4-2637 Error adding a User using AD Membership Provider when no Email Address Defined
|
2013-08-19 10:41:49 +02:00 |
|
perploug
|
ab2be923ff
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-08-19 10:06:46 +02:00 |
|
perploug
|
b357989f18
|
Keyboard service test WIP
|
2013-08-19 10:06:32 +02:00 |
|
Shannon
|
e783b35a3a
|
Updated the data type controller to return the correct data for the editor, including more models and model mappings.
|
2013-08-19 17:39:50 +10:00 |
|
Shannon
|
78e836025b
|
Fixes EntityController to have a correct model mapper and removes invalidly named 'map' method. Removes the key from entity since we don't need it. Added some notes to the controller since we have to implement security for the results.
|
2013-08-19 16:49:07 +10:00 |
|
Shannon
|
024511a605
|
got data type editor dynamically loading pre-vals when the drop down changes, got the mock services to save the data.
|
2013-08-19 12:37:04 +10:00 |
|
perploug
|
bcf49c440a
|
Fix create dialog paths
|
2013-08-16 15:42:10 +02:00 |
|
perploug
|
5ff32b5c11
|
Fx url list
|
2013-08-16 15:41:59 +02:00 |
|
perploug
|
c85ca2b65b
|
Fix content picker url listing
|
2013-08-16 15:41:50 +02:00 |
|