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

9028 Commits

Author SHA1 Message Date
Sebastiaan Janssen bb5d373923 Merge pull request #506 from sitereactor/7.2.0-compositions-fix 
Fixes U4-5077 doc types with compositions
 2014-10-07 14:11:09 +02:00
per ploug be8e4b9fe5 grid partials 2014-10-07 14:01:48 +02:00
Morten Christensen e6820ad52a Fixes U4-5077 Umbraco 7.2 Alpha - doc types with compositions get moved in doc type tree 
Return 0 if parent is the root
 2014-10-07 13:59:22 +02:00
per ploug b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
per ploug bba4db46d2 Breaking change: Renames GetGridHtml() to RenderCanvas() 2014-10-07 11:17:24 +02:00
Shannon ec30251271 Fixes most tree pickers to show/hide the header correctly, updates the entitycontroller to be able to search from a start node and use the user's assigned start node if one is not passed in. Ensure the search bar is visible for the treepicker at all times. Now to get the remaining bits working... 2014-10-07 17:22:26 +11:00
Shannon Deminick 173d298d21 Merge pull request #503 from arknu/angular-test-fixes 
U4-5589: Fix broken Angular app test setup
 2014-10-07 16:38:50 +11:00
Shannon 98eeaca5d5 Fixes: U4-5597 ServerVariables cannot include dynamic data like a users start node Ids 2014-10-07 14:59:07 +11:00
Shannon 6ab03d4c98 puts website proj back in sln 2014-10-07 14:09:46 +11:00
Shannon 7a172c4253 Fixes: U4-4974 Umbraco v7.1.3 - Users cannot insert images in RTE 2014-10-07 14:08:22 +11:00
Shannon b28f1d86c9 Merge branch '7.1.8' into 7.2.0 2014-10-07 12:57:47 +11:00
Shannon 8824ab2b27 reverts JS from tree controller and updates the c# method to create the tree child node URLs to ensure the custom start node param is ignored, this is a bit cleaner. 2014-10-07 12:52:02 +11:00
Shannon b60e292d5f Fixes: U4-5578 MNTP with root node, recursive output 2014-10-07 11:51:11 +11:00
Shannon e1dcf6b061 reverts IQuery 2014-10-07 11:50:35 +11:00
Shannon Deminick 9058358004 Merge pull request #501 from Alain-es/U4-5400-Bugfix 
U4-5400 BugFix
 2014-10-07 10:14:57 +11:00
per ploug 6d4deb8da5 Fixes U4-5531 7.2.0 Nightly: Preview of desktop, height is 150px 2014-10-06 13:54:30 +02:00
per ploug 4da98c1697 temp forms copy 2014-10-06 13:31:43 +02:00
per ploug 7ae9a2bda6 Canvas add delay to overlay 2014-10-06 11:55:34 +02:00
arknu 95c4fb740a Fix broken Angular app test setup 2014-10-04 23:37:46 +02:00
Alain-es ad4b90dbe5 U4-5400 BugFix 
BugFix: U4-5400 Tags Data Type Doesn't Always Auto-Complete/Typeahead.
New feature: Filters the shown list items to not show the tags that are
currently selected.
 2014-10-04 08:48:04 +02:00
antoine 0ce83630d7 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-03 09:45:19 +02:00
antoine bc733132a6 Right ng-include for the canvas additem 2014-10-03 09:44:50 +02:00
Shannon 58a0de086f fixes unit test 2014-10-03 17:07:27 +10:00
Shannon cc9ca02843 Merge branch 'BatJan-7.1.5-localizatiob-5025' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
 2014-10-03 13:29:04 +10:00
Shannon 12e49f186e Merge branch '7.1.5-localizatiob-5025' of https://github.com/BatJan/Umbraco-CMS into BatJan-7.1.5-localizatiob-5025 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
 2014-10-03 13:28:02 +10:00
Shannon 967df0949b Merge branch 'abryukhov-7.1.0' into 7.2.0 2014-10-03 13:15:30 +10:00
Shannon a0602e6b2a merges PR #243 2014-10-03 13:03:52 +10:00
Shannon c078a1c12f Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2014-10-03 13:01:00 +10:00
Shannon 8cfb5915ac Manually merge branch 'allyen-6.1.4-shibboleth' into 7.2.0 2014-10-03 12:58:30 +10:00
Shannon 19595ba887 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-03 12:51:38 +10:00
Shannon 2b2891b6f4 Merge branch '7.1.5' of https://github.com/henrikrossen/Umbraco-CMS into henrikrossen-7.1.5 2014-10-03 12:51:27 +10:00
Shannon Deminick 0b41f1e85e Merge pull request #488 from jhauge/7.2.0 
This commit fixes U4-1115
 2014-10-03 12:03:49 +10:00
Shannon 1d42a9225f Removes desktop media uploader - not used anymore AFAIK 2014-10-03 11:53:06 +10:00
Shannon 8012c909c0 removes angular web app from sln 2014-10-03 11:50:10 +10:00
Shannon 7368cc6b28 Style fixes 2014-10-03 10:37:30 +10:00
Shannon 68480ebd56 Fixes: U4-5492 Distributed calls won't work if IIS sites between servers have the same HttpRuntime.AppDomainAppId 2014-10-03 09:44:17 +10:00
Shannon 0d74642e56 fixes U4-5492 Distributed calls won't work if IIS sites between servers have the same HttpRuntime.AppDomainAppId 2014-10-03 09:44:03 +10:00
Shannon Deminick cce63d6eaa Merge pull request #498 from AndyButland/u4-5461 
U4-5461 - Further amends to date picker behaviour
 2014-10-03 09:21:23 +10:00
AndyButland 3090339962 Removed incorrect option value 2014-10-02 22:08:19 +02:00
AndyButland d9074da3fd Removed close of date/time picker on date selection when set up with time picker; close picker on click on document 2014-10-02 22:02:41 +02:00
Shannon 8e89a43311 Merge branch '7.1.7' into 7.2.0 2014-10-03 00:33:10 +10:00
Shannon e60dcfa144 Merge branch '7.1.7' of https://github.com/umbraco/Umbraco-CMS into 7.1.7 2014-10-03 00:26:25 +10:00
Shannon 3f8b779ae4 adds note 2014-10-03 00:23:38 +10:00
Shannon 72dc5fc477 Removes unused method 2014-10-03 00:23:28 +10:00
Shannon 737f2fb707 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-03 00:07:40 +10:00
Shannon a13ead0d10 unescapes @ symbols now that sql params are in place 2014-10-03 00:06:09 +10:00
Shannon 1c16764605 Merge branch '7.2.0_progressbar' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_progressbar 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
 2014-10-02 21:46:39 +10:00
Shannon 414dbe45a6 Fixes: U4-5460 User with start content set won't see the selected node. 2014-10-02 13:38:44 +02:00
Shannon Deminick 69494c20f4 Merge pull request #491 from AndyButland/u4-5461 
U4-5461 - Close date picker once date is selected
 2014-10-02 21:18:21 +10:00
Shannon Deminick caa0e82d77 Merge pull request #495 from AndyButland/u4-5012 
U4-5012 Moved preview step for RTE embed dialog to a button press
 2014-10-02 21:16:44 +10:00