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

17904 Commits

Author SHA1 Message Date
Shannon
0f3a76809b Merge branch 'dev-v7.8' into temp-U4-10305 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
 2017-11-08 14:52:21 +11:00
Shannon
4f88da2c26 Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2017-11-08 14:51:27 +11:00
Sebastiaan Janssen
46d0807fa4 Merge pull request #2287 from PerplexDaniel/U4-6985 
Switching between sections - select last node
 2017-11-07 20:26:25 +01:00
Claus
c816558936 cleanup. 2017-11-07 15:14:45 +01:00
Mads Rasmussen
4ce0553630 add allowDisable flag on welcome tour 2017-11-07 14:53:44 +01:00
Mads Rasmussen
c773714e2d fix folder name validation 2017-11-07 14:11:57 +01:00
Mads Rasmussen
2a90478ba7 fixing typos and the properties tab 2017-11-07 14:00:39 +01:00
Rune Hem Strand
93756a62f4 Update popover width 2017-11-07 11:37:23 +01:00
Rune Hem Strand
2343004be1 Manual merge to init.js tour steps 2017-11-07 11:30:21 +01:00
Rune Hem Strand
d6fe350a4a Merge branch temp-U4-10305 into temp-tour-review-rune 2017-11-07 11:28:26 +01:00
Rune Hem Strand
71902f3b9b Update Media library tour 2017-11-07 10:53:02 +01:00
Rune Hem Strand
13b544521d Update Media library tour 2017-11-07 10:52:39 +01:00
Rune Hem Strand
2cf8c1207d Update View Home Page step 2017-11-07 10:34:24 +01:00
Sebastiaan Janssen
a53866953e Merge pull request #2296 from PerplexDaniel/U4-6259 
Feature Request: Double Click Content Node to Expand
 2017-11-07 10:29:10 +01:00
Sebastiaan Janssen
ee4ad36e70 Merge pull request #2294 from ja0b/U4-854 
U4-854 Add MaxLength to Textstring fields --> Fixed
 2017-11-06 17:08:46 +01:00
Sebastiaan Janssen
4f2650277a Don't need showcharacterslefttext if we're always showing number of chars left 2017-11-06 17:07:14 +01:00
Sebastiaan Janssen
0231a6037e Always show number of characters left 
Makes it less magical as to why you can't type any more characters.
 2017-11-06 17:03:23 +01:00
Sebastiaan Janssen
db51a5bb44 Update TextboxPropertyEditor.cs 2017-11-06 17:02:34 +01:00
Sebastiaan Janssen
d1b7063e44 Rename textstringnumber.html to textstringlimited.html 2017-11-06 17:02:08 +01:00
Sebastiaan Janssen
a571eee945 Merge pull request #2292 from craigs100/U4-10628 
U4-10628
 2017-11-06 14:57:46 +01:00
Mads Rasmussen
ab8653d3de manual merging 2017-11-06 14:26:55 +01:00
Mads Rasmussen
748a3c167e Merge branch 'temp-U4-10305' into temp-U4-10544 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
 2017-11-06 13:58:07 +01:00
Mads Rasmussen
5b93b35882 Show "Other" as group title instead of "undefined" 2017-11-06 13:17:31 +01:00
Mads Rasmussen
b29ee4df60 don't render tour markup if no tours are registered 2017-11-06 13:16:53 +01:00
Mads Rasmussen
d8fe3c6faf adds basic validation to registering and starting tours 2017-11-06 13:09:16 +01:00
Sebastiaan Janssen
74ba3261ff Merge branch 'dev-v7.6' into dev-v7 2017-11-06 12:33:48 +01:00
Sebastiaan Janssen
ac42f335c2 Fix U4-4889 checkbox in template 2017-11-06 12:33:12 +01:00
Sebastiaan Janssen
f0eefbd5af U4-10636 Removed '#' from 'value' when generating alias 2017-11-06 12:31:06 +01:00
Sebastiaan Janssen
ed48f29e3a Merge pull request #2300 from dernafees/dev-v7 
Fix U4-4889 checkbox in template.
 2017-11-06 12:28:32 +01:00
Sebastiaan Janssen
03c5d5197b Updates a few more fields to make sure clicking on labels focuses the field 2017-11-06 12:28:14 +01:00
Sebastiaan Janssen
7f0921bd96 Delete web.config.temp-build.0 2017-11-06 12:09:15 +01:00
Sebastiaan Janssen
c38b49b1cf Delete vwd.webinfo 2017-11-06 12:08:45 +01:00
Sebastiaan Janssen
9b1e5d7649 Update entity.resource.js 2017-11-06 12:03:53 +01:00
Pawel Bres
576a790e2f Removed '#' from 'value' when generating alias 
When '#' is presented in the 'value' everything in the GET URL after '#' gets removed because it's being treated as "hash" part of the URL and it's not being sent to the server at all.
 2017-11-04 15:07:47 +01:00
Robert
9b7a9fc988 Merge remote-tracking branch 'origin/temp-U4-5896-2' into dev-v7.8 2017-11-03 15:38:08 +01:00
Claus
4ce7b089ca cleanup... 2017-11-03 14:16:24 +01:00
Claus
9e91098ebd adding cmsMedia to the empty recyclebin query. 2017-11-03 14:15:54 +01:00
Claus
49356b31a1 Merge branch 'dev-v7.8' into temp-U4-10286 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
 2017-11-03 14:08:46 +01:00
Alejandro Ocampo
29f93160b7 removing unnecessary if statement 2017-11-03 11:51:39 +01:00
Robert
507c2353e9 Merge pull request #2274 from umbraco/temp-U4-10150 
U4-10150 Process load balancing instructions on a background thread i…
 2017-11-03 11:43:02 +01:00
Warren Buckley
827e79c705 Merge pull request #2280 from umbraco/temp-U4-10625 
U4-10625 HealthCheckController non-empty constructor fails to initial…
 2017-11-03 09:29:14 +00:00
Robert
d02139bbcd Merge pull request #2273 from umbraco/temp-U4-9120 
U4-9120 Add instruction count column on the db instructions table
 2017-11-03 10:20:57 +01:00
Shannon
8a19b97900 removes unneeded mapping 2017-11-03 18:23:56 +11:00
Shannon
981fad1ec8 fixes test 2017-11-03 18:20:41 +11:00
Shannon
019147c1a1 Moves the session generation to the BackOfficeCookieAuthenticationProvider which is where it should be, so it only gets generated before the cookie is written. Writes the checking cookie inside of a lock to prevent multiple db and cookie writes that are unecessary. 2017-11-03 18:07:17 +11:00
Shannon
782d6100f0 Gets user session management tracking via the database including detecting stale sessions, generating and removing them along with cleaning them up. This takes into account legacy code too. The session is revalidated on a one minute threshold per user so that it's not hammering the databse on every request. 2017-11-03 17:27:23 +11:00
Stephan
f6ea317dd1 Merge pull request #2299 from PerplexDaniel/U4-10582 
Make a shiny template for the emails that are sent from Umbraco
 2017-11-02 18:19:32 +01:00
Stephan
68e8ca8d8e Merge pull request #2289 from LewisS303/U4-10627 
U4-10627 - Updated stats / facts when installing.
 2017-11-02 18:03:25 +01:00
Stephan
bcae131545 Merge pull request #2067 from Xiaohao112/patch-1 
Created a link to composition doctype
 2017-11-02 17:55:30 +01:00
Haider Naji
c6d686eabd Fix U4-4889 checkbox in template. 2017-11-02 16:50:19 +00:00