yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,073 Commits 4 Branches 7 Tags
2e9e8f23e96f0b785e5d0af48592c71ef71de2c9
Commit Graph

2690 Commits

Author SHA1 Message Date
Claus
2e9e8f23e9 adjustments for paddings. 2016-06-12 20:40:39 +02:00
Claus
a099c40d93 U4-8584 Starterkit thumbnails are not really thumbnails 
adding a parameter to the image url to avoid loading a massive image when its only rendered in a thumbnail size.
 2016-06-12 20:39:53 +02:00
Damiaan
7b101caf0b update examine documentation links 2016-06-03 11:36:07 +02:00
Sebastiaan Janssen
720a46686b U4-8500 Get c# docs building (#1291) 
fetches docfx, builds the metadata and builds the docs with the correct filters
builds the UI docs from the same powershell script
 2016-05-30 12:02:13 +02:00
Mads Rasmussen
adebd4acd6 Merge pull request #1169 from AndyButland/u4-7468 
Fixes U4 7468 - mis-assigned translator when sending to translation
 2016-05-17 13:18:15 +02:00
Mads Rasmussen
6a593d8b5e Merge pull request #1245 from greystate/U4-8377 
Fix for U4-8377
 2016-05-17 10:42:12 +02:00
Mads Rasmussen
38bc38486a Merge pull request #1229 from bjarnef/dev-v7-U4-8300 
Wrap text "Include all child nodes" in a label
 2016-05-17 10:13:06 +02:00
Claus
acb1aeabda Merge pull request #1261 from umbraco/temp-U4-8371 
U4-8371 Dont ship with the {machinename} token for Examine
 2016-05-12 10:55:52 +02:00
Simon Busborg
924eac1b95 Merge pull request #1235 from bjarnef/dev-v7-U4-8347 
Fix localization of listview buttons/links actions.
 2016-05-11 10:06:51 +02:00
Shannon
fb55b0a60b U4-8371 Dont ship with the {machinename} token for Examine 2016-05-10 18:32:32 +02:00
Stephan
271f4e7a4a U4-8413 - fix missing ServersLock object 2016-05-10 12:29:13 +02:00
Stephan
5f8747b4d3 U4-1780 - detect colliding urls (#1243) 
* U4-1780 - detect colliding urls

* U4-1780 - fix error message

* U4-1780 - fix XmlHelper issue with sortOrder

* U4-1780 - bugfix
 2016-05-04 12:45:20 +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
Chriztian Steinmeier
066ef6809b Change the language keys necessary for the fix 2016-04-26 23:36:42 +02:00
Stephan
fb99e375d0 U4-5699 - update template alias in gui after saving 2016-04-25 14:14:55 +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
Shannon
72cef006d3 bumps version 2016-04-20 15:56:06 +02:00
bjarnef
9174029126 Fix localization of listview buttons/links actions. 2016-04-18 22:33:38 +02:00
bjarnef
3564e70259 Localize "unsaved changes" dialog. 2016-04-18 20:42:19 +02:00
bjarnef
e9bf41e869 Wrap text "Include all child nodes" in a label 2016-04-14 23:22:26 +02:00
Shannon Deminick
a015032442 fixed typo 2016-04-13 16:45:47 +02:00
Shannon Deminick
38f6a7a8b6 fixed typo 2016-04-13 16:45:01 +02:00
Shannon
82b4b4e668 Merge remote-tracking branch 'origin/7.5-ListViewCustomFieldSorting' into dev-v7.5 
Conflicts:
	src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
 2016-04-13 14:44:22 +02:00
Shannon
ce0ecd8114 Ensures that the emails sent our are in the culture of the user, fixes issue of logging in after resetting password and then logging out again 2016-04-13 14:35:40 +02:00
Shannon
e610a5ef54 Changes the password reset link to be a real link (not an angular deep link), this means there is less logging of the reset code in a query string and less visibility of it, this also means that the validation of the code happens instantly. The premise for this is the same as how we deal with external authentication requests and uses ViewData/TempData with redirects. Fixes the models to have the correct attributes to be able to directly json serialize them. 2016-04-13 13:51:12 +02:00
Shannon
f279000d00 removes unecessary methods from user.service.js, ensures correct error msg when resetting password on the server, fixes email copy and allows for non-html emails if the copy is plain text, removes the need for more than one email msg in the lang files and uses the correct way to replace tokens, 2016-04-12 19:54:04 +02:00
Shannon
d424b13ac4 Fixes some styling, wording and validation 2016-04-12 18:59:39 +02:00
Shannon
1361e017a2 Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222 
Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-04-12 18:07:25 +02:00
Shannon
80d7443bd3 fix build 2016-04-05 16:00:49 +02:00
Sebastiaan Janssen
8e8b8bdea1 Revert "Removes old obsoleted ping.aspx" 
This reverts commit 453efc02a5.

Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

U4-8274 '/umbraco/ping.aspx' is missing
 2016-04-04 09:20:59 +02:00
Sebastiaan Janssen
680396daab Localize server-side error message for disallowed file uploads 2016-04-03 12:08:23 +02:00
Stephan
4cca364511 U4-8103 - refactor YSOD overlay to display inner exceptions 2016-03-31 16:36:36 +02:00
Stephan
9e0ed94d77 Fix typo in lang xml files 2016-03-31 12:56:24 +02:00
Shannon
61f9845db0 bumps version 2016-03-23 10:06:53 +01:00
Stephan
d955daab0f Upgrade ModelsBuilder to 3.0.2 2016-03-18 16:13:19 +01:00
Mitton
6ad56863d4 Grid translation - French 2016-03-18 06:15:37 +02:00
Mitton
2703fa7ea2 Grid translation - French 2016-03-18 06:12:44 +02:00
Shannon
b3c6654d41 bumps version 2016-03-17 17:31:36 +01:00
Shannon
999be9c578 Merge branch 'view-save-restore-cursor' of https://github.com/pynej/Umbraco-CMS into pynej-view-save-restore-cursor 2016-03-17 11:26:09 +01:00
Stephan
5369a6fc56 Upgrade ModelsBuilder to 3.0.1 2016-03-14 13:37:49 +01:00
Sebastiaan Janssen
fb42574c34 Revert "U4-5334 Richtext editor inserts extra p - tags to html output" - apparently it does just as much harm as it does good 
This reverts commit 9ad3b6a337.
 2016-03-12 21:02:05 +01:00
AndyButland
e3411f7212 Provided a check that a language was selected when sending to translation such that a message is returned to the user rather than an unexpected error 2016-03-12 19:26:45 +01:00
Sebastiaan Janssen
9ad3b6a337 U4-5334 Richtext editor inserts extra p - tags to html output 
#U4-5334 Fixed
 2016-03-12 12:58:53 +01:00
Jeremy Pyne
91da14b0c6 Second fix for partial views. 2016-03-11 14:56:55 -05:00
Jeremy Pyne
f361e286ed This minor fix will restore the editors cursor in CoreArea editor boxes when they save the item. There is a check included to prevent this behavior is the server level code changes the file for some reason as then the cursor location could act unpredictably, so instead we just let it reset to the beginning of the file. 2016-03-11 14:44:21 -05:00
Sebastiaan Janssen
b2407eab98 Merge pull request #1107 from bjarnef/dev-v7-tinymce-font-icons 
Change icons for richtext editor config
 2016-03-10 17:47:46 +01:00
Stephan
610538261e U4-7641 - enable content type copy 2016-02-25 15:26:03 +01:00
Sebastiaan Janssen
c64f6f894e U4-8024 Unable to use MvcBuildViews since 7.4.0 upgrade because 'umbraco.cms.presentation.create.controls.content' has been removed 
Removes files for which the codebehind no longer exists
 2016-02-23 17:23:55 +01:00
Warren Buckley
baaa9340e4 Merge pull request #1131 from umbraco/temp-U4-7918 
Fixes U4-7918 Make icon picker for document type and list views consistent
 2016-02-19 12:03:27 +00:00