swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,583 Commits 73 Branches 219 Tags
a4274ba76727273eb8d7cfb02b97fc5bdcd3e9cc
Commit Graph

5066 Commits

Author SHA1 Message Date
perploug 309dd5d4a2 content dashboard 2013-11-21 11:09:20 +01:00
Sebastiaan Janssen a04aef9b98 U4-3623 Text corrections in install wizard 2013-11-21 10:17:52 +01:00
Niels Hartvig 9f046f9945 Updates default dashboards 2013-11-21 09:58:27 +01:00
Shannon ffeed58f5d Fixes: U4-3576 When editing file based items and changing the file name - we need to change the route location 2013-11-21 17:23:48 +11:00
perploug c6caa6aae7 Missing dictionary items 2013-11-20 15:59:25 +01:00
perploug 1b1642ce46 fixes broken script dialog and tree sync 2013-11-20 15:33:24 +01:00
perploug 31d0450d6c fixes broke xslt visualizer 2013-11-20 15:08:04 +01:00
perploug a71d18f352 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-20 14:55:09 +01:00
perploug 12c982f170 ups, forgot an alert() 2013-11-20 14:54:27 +01:00
Sebastiaan Janssen 35af370f70 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-20 14:51:50 +01:00
Sebastiaan Janssen 2beb3c5b4c Merge branch 'master' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	.gitignore
 2013-11-20 14:50:57 +01:00
perploug f7d407e9fd various dialogs fixes 2013-11-20 14:37:46 +01:00
perploug d67db8a90a Fixes ctrl+s hotkeys in legacy editors 2013-11-20 14:37:28 +01:00
Sebastiaan Janssen 7e70253e1c U4-3340 Installer: Make SQL CE Default option 2013-11-19 16:06:14 +01:00
Sebastiaan Janssen 313b831559 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-19 15:13:18 +01:00
Sebastiaan Janssen 355137f982 U4-3469 Umbraco 7 + MVC 4 + nuget, web.config error 2013-11-19 15:12:47 +01:00
perploug d1c7a3764f enables the media picker to select current folder 2013-11-19 14:21:17 +01:00
Shannon 5fc82fef18 Fixes: U4-3440 Tempates (MVC Views) tree sync doesn't work correctly 2013-11-19 17:17:39 +11:00
Shannon 5bb68f32bf Fixes up editorState - ensures that it is set in all of the correct places (removes appState editingEntity and references), ensures that setting 'current' is not possible, ensures that editorState is reset on all route changes, adds unit tests for getting/setting editorState. 2013-11-19 10:39:18 +11:00
Marc Stöcker 997e0e5492 Initial German v7 translation/localization 
Should cover all of the already localized strings for v7 (as well as 6.x - no obsolete items removed for now).
 2013-11-18 23:39:20 +01:00
Sebastiaan Janssen e922ca88f2 U4-3553 Settings - Document Type - Tabs do not work 2013-11-18 18:54:55 +01:00
Sebastiaan Janssen 64d5533274 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-18 18:11:46 +01:00
Sebastiaan Janssen 734895c90c U4-3328 404 on zoom-in.png during install 2013-11-18 18:11:26 +01:00
Sebastiaan Janssen a009cad200 Wrong bootstrap file reference, error was hidden by Client Dependency framework 2013-11-18 18:08:38 +01:00
perploug da2f3aefe6 Improves media drag n drop sorting 2013-11-18 14:58:29 +01:00
perploug 4dbd1d3ca7 adds section to page title 2013-11-18 11:48:58 +01:00
perploug e3ec0c1019 fixes missing tinymce buttons 2013-11-18 10:48:46 +01:00
Shannon 2784e2a22d removes ref to missing file 2013-11-15 17:30:26 +11:00
Shannon 89481405b5 Fixes: U4-3534 Sorting content items 2013-11-15 12:57:28 +11:00
Shannon f1d837dfd1 fixes: U4-3539 Cannot set a scheduled publish at date/time gives a warning message 2013-11-15 12:46:55 +11:00
Marc Stöcker 376fe0bf55 changed wording to correct one in context of content 
wording was wrong until today, needed a completely different meaning in the context of the content section; ironically it's just "Alias" now ;)
 2013-11-14 22:22:25 +01:00
Shannon 6d2caaa723 Fixes: U4-3430 Save Properties not working for usercontrol macro 2013-11-14 21:56:01 +11:00
perploug f4861fb344 fixes broken font on icon picker on windows 2013-11-14 09:16:46 +01:00
Marc Stöcker 282da69d61 Fixed minor typos 2013-11-13 13:27:56 +01:00
Shannon 35315e0331 Removes touchDevice from rootScope and navigationService, now we detect this on app startup and add to the globalState which can be retrieved whenever. 2013-11-13 16:22:47 +11:00
Shannon ba72991929 refactored out the usage of "ui.showContextMenu" with the usage of appState. Added a new init.js instead of having the startup scripts embedded in the routes file (we should make a 'startup' naming convention like we have for 'controllers' to combine into one file) 2013-11-13 16:16:11 +11:00
Shannon d0c5dd208f Reverted to Newtonsoft.Json 4.5.11 2013-11-13 11:28:14 +11:00
perploug c4a0e1e923 changes options to actions 2013-11-12 19:01:24 +01:00
Shannon a532b49485 Fixes: U4-3482 keepUserLoggedIn setting ignored? and streamlines some of the auth methods. 2013-11-12 17:38:32 +11:00
Shannon c28f800fe6 Removes the re-committed app plugins property editor that shouldn't be there 2013-11-12 17:38:09 +11:00
Shannon ad0b7e4259 Changed default (development) macro error handling to throw. 2013-11-11 10:16:25 +11:00
Shannon 367cdde35e Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/umbraco.cms/businesslogic/workflow/Notification.cs
 2013-11-08 08:55:22 +11:00
yawka e0a10080b1 Add UI validation for regular expression property 2013-11-07 18:39:27 +02:00
Sebastiaan Janssen 0dc3920309 Merge pull request #191 from dipeshhirani/U4-2756 
Fixed the issue below: U4-2756
 2013-11-07 08:38:44 -08:00
Per Ploug Krogslund 7440855c72 merge 2013-11-07 17:16:22 +01:00
perploug 937bda9c16 select on focus directive 2013-11-07 17:11:32 +01:00
dipunm a5782a40af Missing languages in RTE insert link dialog. 
Also included files in csproj file to ensure proper build.
 2013-11-07 14:59:00 +00:00
mattbrailsford 7cd01fc50b Added ValidateRequest="false" on package installer page to allow user controls which postback html / code. 2013-11-07 14:35:44 +00:00
Simon Dingley e9d12ae0d8 Revert "Group jQueryTree script files" 
This reverts commit baed01518c.
 2013-11-07 14:23:53 +00:00
Simon Dingley baed01518c Group jQueryTree script files 2013-11-07 13:21:01 +00:00