yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,400 Commits 4 Branches 7 Tags
01f50a243b3fcec4a3bc49dc6b1c86dfb97efa3b
Commit Graph

147 Commits

Author SHA1 Message Date
Claus
c3035f26a7 Merge branch 'dev-v7-U4-8597' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-8597 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
 2016-08-08 11:31:29 +02:00
bjarnef
ed392cd252 Fix issue where subsequent submit of reset password form cleared error message 2016-07-21 02:31:40 +02:00
bjarnef
e39f818389 Fix indent 2016-05-22 13:53:43 +02:00
bjarnef
5fab1ca207 Localize move and copy overlay titles opened from listview actions. Prepare localization of bulk messages. 2016-05-22 13:46:48 +02:00
Simon Busborg
2a87c926f3 Merge pull request #1234 from bjarnef/dev-v7-U4-8343 
Localize "unsaved changes" dialog.
 2016-05-02 10:44:47 +02:00
bjarnef
fcdf212c4c Rename area alias 2016-04-24 18:42:46 +02:00
Shannon
7e13781d8b fixes merge issue 2016-04-20 16:04:35 +02:00
bjarnef
3564e70259 Localize "unsaved changes" dialog. 2016-04-18 20:42:19 +02:00
Lars-Erik Aabech
d0de54e2d3 Grid translations: 
Fixed a silly long translation of "Add content".
Added missing keys.
Fixed a few spelling mistakes.
 2016-02-16 08:50:07 +01:00
bjarnef
0be5c31d4a Adjust styling for sort table + localize 2016-01-25 15:31:07 +01:00
Sebastiaan Janssen
49bafe51b7 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 15:24:39 +01:00
Sebastiaan Janssen
0fbc0d5431 U4-7715 Update Gallery snippet for ImageCropper instead of the upload in 7.4.0 
#U4-7715 Fixed
 2016-01-15 10:19:35 +01:00
Per Ploug
cec1f6dae3 Merge remote-tracking branch 'refs/remotes/origin/7.4.0' into dev-7.4.0-ModelsBuilder 
# Conflicts:
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/Editors/ContentTypeController.cs
 2016-01-13 12:10:08 +01:00
Shannon
b0060a9592 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/InstallGit.cmd
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
	src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
	src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
	src/Umbraco.Web/WebServices/SaveFileController.cs
 2016-01-06 10:46:38 +01:00
Sebastiaan Janssen
4ef7b7735e Fixes U4-6510 again as merging PR apparently went wrong 2016-01-05 17:04:11 +01:00
Shannon Deminick
9cc57479da Merge pull request #957 from umbraco/temp-U4-7186 
Fixes: U4-7186 Go through the remaining dialogs and check for consistency
 2015-12-16 16:35:02 +01:00
Sebastiaan Janssen
5b825bdeae Merge branch '7.4.0' into temp-U4-7448 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2015-12-15 17:16:15 +01:00
Sebastiaan Janssen
d123967b14 Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2015-12-15 15:31:47 +01:00
Rune Strand
fc0fe61c2f Add ysodOverlay to listview and localized dialog buttons 2015-12-15 15:18:32 +01:00
Mads Rasmussen
191f82aaaa Fixes: U4-7448 Grid - Sorting view 2015-12-15 14:34:13 +01:00
Rune Strand
7431ed4db1 Better wording 2015-12-08 13:42:05 +01:00
Rune Strand
cb07ec3157 Add dialog localization and new keys to all lang 2015-12-07 18:07:08 +01:00
Sebastiaan Janssen
9949e2676d Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-12-01 15:16:57 +01:00
Shannon
ba4f0cc6a4 remove file that shouldn't be checked in 2015-11-26 10:35:28 +01:00
Claus
9a07e206d8 Merge pull request #874 from andydale1982/U4-7323_(#871)‏ 
U4 7323 (#871)‏
 2015-11-25 10:51:41 +01:00
Sebastiaan Janssen
05c592860d Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-11-17 13:43:19 +01:00
Claus
ffb0de4050 Merge branch 'U4-4641' of git://github.com/Jeavon/Umbraco-CMS into Jeavon-U4-4641 2015-11-17 12:46:24 +01:00
Jeavon Leopold
c8cb5b26b0 Basic implementation for U4-4641 Feature Request: template and code editors should have insert Section, Define section buttons 2015-10-29 17:14:45 +00:00
andydale1982
5749f80a7f Added instructions to manually install node_modules. 2015-10-29 17:10:39 +00:00
Marcin Zajkowski
aac208c0e8 U4-6282 Add note to Register Partial Macro 2015-10-29 10:53:29 +00:00
Per Ploug
44226a22e9 Removes legacy files 2015-10-16 15:16:43 +02:00
Per Ploug
ebbde5f64b Rolling back members tree alias to "tree" due to UI issues 2015-09-29 11:05:38 +02:00
Per Ploug
6c5e35ec2c Fixed: U4-7150 Inconsistent tree aliases 
Changes all translation files and tree classes to have consistent
naming, updates trees.config to these new alias's
 2015-09-28 08:54:00 +02:00
Shannon
aad82360ad Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/app.dev.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/less/panel.less
	src/Umbraco.Web.UI.Client/src/loader.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-06-23 18:27:18 +02:00
Shannon
8e1e7a8676 Gets the IsConfigured check checking the migration data, updates the install controller to ensure there's no infinite redirects and to use the IsUpgrading flag. Now to add entries to the table when the migrations have executed. 2015-06-22 16:22:47 +02:00
Shannon
f167f84c7f doc type folders are a thing 2015-06-08 19:02:35 +02:00
Shannon
a321d4d1b8 Allows the ability to use external logins to login to authorize upgrades, this means being able to add reserved paths at startup dynamically which is now built in as part of the AuthenticationOptionsExtensions for registering external logins for the back office. 2015-04-02 14:46:53 +11:00
Shannon
df6bb36876 moves notification logic to umbnotifications.directive instead of in main (not sure why it was there). Updates the AuthorizeUpgrade screen to be able to show YSOD or alert messages when there are server errors. Adds htmlhelper extensions to share between Default.cshtml and AuthorizeUpgrade.cshtml. Adds null check for BackOfficeUserManager. 2015-04-01 16:04:19 +11:00
Shannon
cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Sebastiaan Janssen
7a644b6681 U4-6133 Update builtin razor snippets to follow Query Builder conventions 
#U4-6133 Fixed
 2015-01-15 10:38:07 +01: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
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
db087a9e78 pretty much got 5966 working just need to do some more tests. 2014-12-17 17:08:12 +11:00
Shannon
86e82c7674 Updates PartialView & PartialViewMacros models/services/repositories, streamlines their operations, fixes up other underlying problems with the FileRepository, fixes tree syncing for partial views, partial view macros and scripts, fixes scripts being created in folders, allows partial views and partial view macros to be managed and created in folders, fixes FileUnitOfWork to use a queue, publicizes some internal test classes, fixes tree syncing when dealing with invariant case, adds correct validation to the create dialogs of scripts and partial views (and partial view macros) 2014-10-22 16:44:45 +10:00
Shannon
4494d8cc91 Merge branch 'partial-view-folders' of https://github.com/pynej/Umbraco-CMS into 7.2.0 2014-10-21 13:21:12 +10:00
antoine
b8034fa325 canvasdesigner.*.js added to ignore file 
Conflicts:
	.gitignore
 2014-09-30 09:24:38 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
Jeremy Pyne
fbed14a9e0 Partial Views and Partial View Macro's should allow for folder hierarchy for organization. This changes makes them work much like the Scripts and css folders. 
I didn't add a Type drop down like the scripts screen has.  This is unnecessary and cumbersome.  Instead it works like other screens and the user can generate a hierarchy in their files by adding /'s in the names.  This is how it works in Stylesheets works and its a lot cleaner.  I added a note of this to the creation dialogs as well.

For example create a view file with the name myFolder/myView and the system will take care of folder creation automatically.  There is also a delete option.

Other errors fixed:
 Selecting a folder in the scripts lists was generating an error.
 Stylesheets would not create a new folder(but they wold make nested children in existing folders.
 Partial and Macro Views would not use the proper elpers for generating syncTree code.
 2014-09-04 10:17:54 -04:00
Shannon
2f2d55e24f ensure normal browser cache is busted for auth upgrade view 2014-08-26 09:39:07 +10:00
antoine
54c3e68f32 Ignore Preview folder 2014-07-01 13:57:04 +02:00