yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,114 Commits 4 Branches 7 Tags
fed5a14e1ba6792b82c43b6558f6a4c6672dce6b
Commit Graph

2059 Commits

Author SHA1 Message Date
Shannon
3f8df66385 Merge branch 'dev-v7' into 7.3.0 2015-01-21 13:28:10 +11:00
AndyButland
4775b638a4 Reverted previous commit and changed anchor removal to target the correct tag (the elipsis) 2015-01-19 08:05:32 +01:00
Shannon
0a0d845173 Merge branch 'dev-v7' into 7.3.0 2015-01-19 13:26:30 +11:00
AndyButland
17906b505d Removed code in tree synchronisation that removes anchor tag containing node name for certain nodes 2015-01-18 21:13:24 +01:00
Shannon
d9d8bae376 ensures that the html form attribute is set to POST if for some very strange reason someone visited that html page and tries to submit it with a real password 2015-01-16 10:58:22 +11:00
Shannon
19037ee1ba Ensures all stylesheet usages in RTE are working as expected 2015-01-15 12:40:09 +11:00
Asbjørn Riis-Knudsen
778d8e0afa Added missing apostrophes 2015-01-14 09:00:12 +01:00
arknu
f8ed9e60f6 U4-6103: Replace style with ng-style (again) 2015-01-12 22:13:01 +01:00
Shannon
023c7f3fe7 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-01-07 15:54:08 +11:00
Shannon
dc846e7ff6 Fixes installer email validation. Ensures all validation directives are registered under the correct module: umbraco.directives.validation, then we load this module in the installer so we can use the correct email validation directive. 2015-01-07 15:02:58 +11:00
Shannon
322bd4e41e Fixes: U4-5717 Member email validation does not allow valid domains (Umbraco 7.1.4) 2015-01-07 14:32:39 +11:00
Shannon
89b8fe93b7 Updes more code for U4-337 2015-01-06 15:36:14 +11:00
Shannon
8509aef99a Merge branch 'U4-337' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-337 2015-01-06 12:23:31 +11:00
Shannon
97a05008b3 Makes the umbProperty directive check optional since these validators can exist outside of an umbProperty directive (i.e. like in a dialog for a parameter editor) 2015-01-06 12:03:19 +11:00
Shannon Deminick
69e1dd1c73 Merge pull request #612 from gildebrand/patch-3 
Fix for macrocontainer making it possible to edit
 2015-01-06 11:50:31 +11:00
Shannon
a4f7c49f50 Merge branch 'Alain-es-Fix_for_U4-5875' into dev-v7 - And updates quite a lot: changes directive name to valPropertyValidator and changes how it works to be ultra flexible for custom validation of property data. Updates umbProperty directive to expose an API for other directives to utilize (like the new set setPropertyError method). Updates valServer to use the better way to access the current property object from the umbProperty directive API. Updates both valServer and valPropertyMsg to only perform a watch when necessary when there has been server side errors, this will speed up client side performance quite a bit. Now the tags, color picker and upload property editors performs correct client side and server side validation for the required validation flag. 2015-01-06 10:55:38 +11:00
Anton Gildebrand
11b53a5dcc Fix for macrocontainer making it possible to edit 2015-01-05 15:17:50 +01:00
Shannon
d4c0ea9c48 working on U4-5875 - Updated RequiredManifestValueValidator to automatically check for empty json strings if the value type is JSON. Updates the TagsPropertyEditor to check for empty json in it's required validator. Updated the tags JS to always update the model value so if there's a server side validation, it gets cleared on change. 2015-01-05 14:25:16 +11:00
Shannon
459d9b34e7 Fixes: U4-5974 User which is not administrator getting logged out when clicking recycle bin 2015-01-05 12:22:49 +11:00
leekelleher
8a32f02781 Added custom event handler to create the relation for trashed nodes. 
Removed the additional (AJAX) resource call from the Angular controller, as the relation removal is handled in server-side code during the move.
 2015-01-04 20:46:00 +00:00
leekelleher
f21265c7ae Added "DeleteById" method to the Relation Resource/Service. 2015-01-03 22:22:54 +00:00
leekelleher
458e7dde94 Created "relationResource" to expose methods from RelationService to angular controllers. 
Added view for the "restore" menu option.
 2015-01-03 20:10:39 +00:00
Shannon
201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
Shannon
a68fed42ad Merge branch 'madsoulswe-7.2.1' into dev-v7 2015-01-02 11:58:56 +11:00
per ploug
2e2ea57ba6 Fixes grid editor always rending 12 columns 
When a user change grid cols, the editor keeps rendering 12 column
layouts - this fixes the 12 cols issue and falls back to 12 in case of
invalid/missing information
 2014-12-19 16:11:33 +01:00
Shannon
3323138232 Fixes up js localization service so that it doesn't make a ton of requests on first load, Fixes: U4-2675 Create new controller service to output the json for localization for use in angular service 2014-12-18 12:35:38 +11:00
Dennis Öhman
5b63a8e9d9 Colspan change 
Changed colspan from fixed 5 to includeProperties.length + 3
 2014-12-17 17:10:22 +01:00
Shannon
0807597a3c Fixes: U4-5977 The debounce timeout on the main search is too big which produces a lag in searching & U4-5994 Global search needs to only show results for the 'last' search request made and ignore previous ones 2014-12-16 15:50:54 +11:00
Alain
55dbc82d75 no-dirty-check all lower case 2014-12-15 09:11:21 +00:00
Alain-es
8bfcd4ce3f using noDirtyCheck directive instead of removing valFormManager directive 2014-12-11 11:41:17 +00:00
Alain-es
9c10145869 Fix for U4-5852 2014-12-10 15:18:41 +00:00
Sebastiaan Janssen
c20c93e648 Fixes merge issue 2014-12-09 21:14:22 +01:00
Shannon
a1fcdac896 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-09 19:05:11 +11:00
Shannon
ae2d9e6c55 Fixes: U4-5977 The debounce timeout on the main search is too big which produces a lag in searching 2014-12-09 19:05:00 +11:00
Shannon Deminick
bf7473145f Merge pull request #577 from abjerner/patch-4 
Moved the right click action for the tree header
 2014-12-09 16:06:56 +11:00
arknu
30042aae6d U4-5101: Localize Grid property editor 2014-12-08 17:46:32 +01:00
arknu
8bc9fb9242 U4-5101: Localize Image Cropper property editor 2014-12-08 17:41:03 +01:00
arknu
482e90dbc0 U4-5101: Localize Content Picker property editor 2014-12-08 17:41:02 +01:00
arknu
0b61546633 U4-5101: Localize Tags property editor 2014-12-08 17:41:01 +01:00
arknu
ca69e64846 U4-5101: Localize Related Link property editor 2014-12-08 17:37:47 +01:00
Anders Bjerner
0feb65c455 Moved the right click action for the tree header 
See http://issues.umbraco.org/issue/U4-5961
 2014-12-07 17:21:30 +01:00
Sebastiaan Janssen
788a0241d8 Remove Forms preview notice 2014-12-04 13:17:29 +01:00
per ploug
ed75109829 Removes textstring editor controller - not needed 
functionality moved to directive
 2014-12-04 12:27:33 +01:00
per ploug
6738a25bfa Fxes grid datatype config to handle cols > 12 and <= 0 2014-12-04 12:27:10 +01:00
per ploug
aa9c753455 Forms installer cookie check fixed 2014-12-04 12:26:32 +01:00
per ploug
0e5f9b92e8 adds autocomplete=off to installer password 
To avoid autocomplete to pick up peoples secret passwords
 2014-12-04 12:26:05 +01:00
per ploug
77fd4d383b Fixes grid cell resizing timing bug 2014-12-04 12:25:33 +01:00
Sebastiaan Janssen
98a03a0127 Fixes nonodes a:visited bug 2014-12-04 08:55:19 +01:00
Shannon
464130a102 Fixes: U4-5930 Lock "Save and publish" once activated 2014-12-04 13:09:28 +11:00
Shannon
dfb324b003 Fixes: U4-5706 Listview search bar enter button in IE11 submits form 2014-12-04 12:44:46 +11:00