yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,612 Commits 4 Branches 7 Tags
8c8f10ea2094de648ad9542352c7c5b26030f50e
Commit Graph

13612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
e89d053914 unbind list view watcher 2015-08-17 20:15:51 +02:00
Mads Rasmussen
22632e5230 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-08-14 11:30:40 +02:00
Mads Rasmussen
d61ab5ff1a Reorder flow when adding a property to a group so you enter settings after choosing one + rearrange editor picker dialog with tabs. 2015-08-14 11:22:01 +02:00
Mads Rasmussen
4fa08f28f9 add extra class to old header tabs to compensate for new styles 2015-08-14 10:35:27 +02:00
Mads Rasmussen
1891bea3e5 Add support for tabs to umb-editor-header 2015-08-14 10:34:15 +02:00
Mads Rasmussen
ea766af41f Make directive for tabs 2015-08-14 10:31:53 +02:00
Shannon
930b61a7ff Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/belle.less
 2015-08-13 11:09:04 +02:00
Shannon
9e6a2d8a7c Fixing: U4-6942 During upgrade MUST make sure that the new Property Type GUIDs are consistent ... just needs some testing now; 2015-08-11 15:56:48 +02:00
Per Ploug Krogslund
e1fd1ab5e5 include property type editor 2015-08-11 13:22:33 +02:00
Shannon
cfb84cae44 removes license txt that doesn't make any sense. 2015-08-11 12:23:15 +02:00
Shannon
4239833713 updates NotificationService 2015-08-11 12:12:34 +02:00
Per Ploug Krogslund
0c125736a1 client side change for getting grouped editors 2015-08-11 11:52:30 +02:00
Per Ploug Krogslund
fc565fbae2 Simplified the merging of property editors VS types 2015-08-11 11:52:30 +02:00
Per Ploug Krogslund
1ff7b34b86 revalue flag on basic datatype 2015-08-11 11:52:29 +02:00
Shannon
4fa1a3948e updates how versions are sorted before being sent. 2015-08-11 11:52:06 +02:00
Shannon Deminick
1b78e854f0 Merge pull request #759 from umbraco/U4-5180 
Fix: U4-5180 Notifications email highlighting is incorrect. Ensured t…
 2015-08-11 11:50:57 +02:00
Shannon Deminick
c62a2362d2 Merge pull request #761 from umbraco/U4-6808 
U4-6808 Bug in umbRequestHelper service causing exceptions to end up …
 2015-08-11 11:48:01 +02:00
Shannon Deminick
eb1855fcb7 Merge pull request #760 from umbraco/U4-6798 
U4-6798 Rollback Dialog Displays Incorrect Author.
 2015-08-11 11:44:10 +02:00
Mads Rasmussen
d7f9cb0278 show content type, when data is ready. 2015-08-11 11:04:41 +02:00
Mads Rasmussen
69a9461c3e Clean up header + used directives - remove $parent, set more focus on name field, place alias inside name field to show relation. 2015-08-11 11:03:55 +02:00
Mads Rasmussen
ce127ad215 Remove unnecessary headline in data type settings dialog 2015-08-11 11:01:07 +02:00
Mads Rasmussen
c32165a838 remove validation from locked field directive - need to place it somewhere else 2015-08-11 10:57:53 +02:00
Mads Rasmussen
a9b7d43502 Umb auto resize: Only resize length of text inputs and height of textareas. Set inputs with no data the width of the placeholder. 2015-08-11 10:53:17 +02:00
Mads Rasmussen
91b405795e Add more descriptive labels to grid selector 2015-08-11 10:52:08 +02:00
Mads Rasmussen
8f248479d3 Only allow adding new tabs when there are properties in the previous 2015-08-11 10:50:30 +02:00
Mads Rasmussen
597687c2ae show text when reordering with no tabs added 2015-08-11 10:46:35 +02:00
Mads Rasmussen
69ddf5f1ba Close confirm delete on out side click 2015-08-11 10:43:55 +02:00
Shannon
d4863239cd adds null check to query builder 2015-08-11 10:40:18 +02:00
Shannon
4b7ddb9c15 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-08-10 18:06:50 +02:00
Shannon
e5bb35b335 Updates to latest Examine 2015-08-10 18:06:23 +02:00
Claus
7eabd09b3a Ignoring test causing CI to fail occasionally. 2015-08-10 15:11:08 +02:00
Shannon
087f0c0ede updates internals visible for courier. 2015-08-10 13:09:48 +02:00
Shannon
db9d6d9109 Makes the getter for InternalSearcher lazy, fixes up the LocalTempStorageDirectory so that it properly deals with both directories the same, including lock files. Fixes up the LocalTempStorageIndexer with a ton more error checks and retry attempts to acquire locks if it cannot do so during initialization. This has proven to work seamlessly with my load tests now including the functionality for Sync. Need to test LocalOnly with the tests now too. Also, this should work if an index gets corrupted in temp storage for some odd reason (shouldn't do now btw). More testing required but this so far is showing to be much more stable especially with the new changes in Examine core. 2015-08-07 00:06:56 +02:00
Shannon
700e180522 Updates ensuring db connection so that it's not waiting arbitrarily to exit. 2015-08-07 00:02:35 +02:00
Claus
8584997f5f U4-6808 Bug in umbRequestHelper service causing exceptions to end up in backoffice. 2015-08-06 16:03:12 +02:00
Claus
4710b3b641 U4-6798 Rollback Dialog Displays Incorrect Author. 2015-08-06 14:53:56 +02:00
Claus
227e2489c1 Fix: U4-5180 Notifications email highlighting is incorrect. Ensured the versions of content used in comparison is sorted correctly so the highlighting is based on previous version and not the base version of the content. 2015-08-06 10:32:41 +02:00
Shannon
91a5b19378 Fixes: U4-6891 Can't get to the "Rebuild" button when Lucene index folder is empty as well as how the polling works. 2015-08-05 18:32:59 +02:00
Shannon
9313b8b74a Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-08-05 17:27:53 +02:00
Shannon
925757afc5 Merge branch 'dev-v7' into dev-v7-contenttypeeditor 2015-08-05 17:27:40 +02:00
Shannon
4c20441c4e Fixes: U4-6915 Txt Starter Kit install fails on 7.3.0 beta3 2015-08-05 17:17:49 +02:00
Shannon
edfe1e6d54 Fixes: U4-2793 There doesn't seem to be a way to un-assign a template from a content item with the new API. Fixes issue with content type cache clearing when templates are deleted. Fixes the legacy packager to use the new template service to delete templates which does it in a much more graceful way, otherwise we need to do a try catch. 2015-08-05 16:30:21 +02:00
Mads Rasmussen
71b3982ad8 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-08-05 15:58:45 +02:00
Mads Rasmussen
68955b04c8 Preselet matching validation type in property settings 2015-08-05 15:56:58 +02:00
Mads Rasmussen
1b4b9469f3 rename save to overwrite because it confused testers that it did not create a new data type 2015-08-05 15:50:27 +02:00
Mads Rasmussen
62403313f4 clean up add init property so it only happens from function 2015-08-05 15:49:16 +02:00
Shannon
7869f77704 Fixes up deleting templates, fixes up legacy template code to ensure things are saved when they are updated 2015-08-05 15:00:28 +02:00
Shannon
270491a04d reverts media controller ... now need to figure out where to put showing notifications on drag/drop file uploads. 2015-08-05 13:45:20 +02:00
Shannon
2f1877c2cd Merge branch 'dev-v7' into dev-v7-contenttypeeditor 2015-08-05 13:39:30 +02:00
Shannon
34fd405bca Downgrades AutoMapper to the version before the assembly was signed (breaking!), we're stuck on < 3.1 because Automapper decided to sign an assembly in a minor version, nothing we can do till v8 2015-08-05 13:35:42 +02:00