yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,214 Commits 4 Branches 7 Tags
66b2ad9fdbcf9bc2738b4449a09e899ff7b97a58
Commit Graph

22214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
66b2ad9fdb Merge pull request #2770 from ssougnez/temp-U4-11513 
Added "Select" and "AndSelect" to "PetaPoco"
 2018-07-15 07:57:28 +02:00
ssougnez
65d68aefad - Removed new obsolete method 
- Fix tests
 2018-07-14 20:18:17 +02:00
Sebastiaan Janssen
c2039ef01f Merge pull request #2462 from iofsauron/U4-10975 
UDUF (U4-10975) Failed Logon Attempts resets to 0 after maximum number of attempts
 2018-07-14 19:04:20 +02:00
Sebastiaan Janssen
c24683b014 Merge pull request #2463 from Sam7/U4-10849 
U4-10849 [uDuf] fixed Umbraco user field "User Last updated" and "last locke…
 2018-07-14 18:54:34 +02:00
Sebastiaan Janssen
ca993187b0 Fixes unit tests after adding an extra node in the cache 2018-07-14 17:37:14 +02:00
Sebastiaan Janssen
861b2c61a8 Adds a few more test cases 2018-07-14 17:16:59 +02:00
Sebastiaan Janssen
9daae665e4 Adds unit tests for IsAncestor(OrSelf) and IsDescendant(OrSelf) 2018-07-14 17:09:02 +02:00
Sebastiaan Janssen
972a9da2f1 Merge pull request #2769 from leekelleher/U4-11514 
U4-11514 - Content Picker adds sortable options to restrict within container
 2018-07-14 16:14:03 +02:00
ssougnez
a03173da4d Update the code to use the GetFieldName method instead of recreating it 2018-07-14 00:11:04 +02:00
sebastien-sougnez
c841f32ba6 Added "Select" and "AndSelect" to "PetaPocoSqlExtensions" to be able to select columns based on predicated instead of string values. 2018-07-13 15:10:21 +02:00
leekelleher
cf2938151f U4-11514 - Content Picker adds sortable options to restrict within container 2018-07-13 12:34:06 +01:00
Sebastiaan Janssen
1908725a9a Merge pull request #2742 from nathanwoulfe/temp-U4-6946 
U4 6946 - Existing template file is overwritten when creating a new template in the backoffice
 2018-07-13 11:12:16 +02:00
Sebastiaan Janssen
b4a941e367 Merge pull request #2766 from Mundairson/dev-v7-U4-11509 
Correct Umbraco.Web.UmbracoHelper and tests to coding standards
 2018-07-12 13:17:47 +02:00
Sebastiaan Janssen
5a8f37ff02 Merge pull request #2767 from mikecp/mikecp-update-fr 
Synchronise fr.xml file with en.xml file + translate new stuff
 2018-07-12 13:17:11 +02:00
Sebastiaan Janssen
9e35748040 Merge pull request #2357 from Dexmoor/U4-10779 
U4-10779 Allow Members tree to work independently of Member Types tree
 2018-07-12 13:13:04 +02:00
Sebastiaan Janssen
374011ec9e Reverts some whitespace changes 2018-07-12 13:02:58 +02:00
Michael Latouche
2a2cea0b7d Update fr.xml 2018-07-12 13:00:33 +02:00
Sebastiaan Janssen
c56dc63150 Merge pull request #2702 from nathanwoulfe/temp-U4-4732 
U4-4732 Anchor missing in TinyMCE of Umbraco 7.x
 2018-07-12 12:39:23 +02:00
Nathan Woulfe
57c9acc874 Merge branch 'temp-U4-6946' of https://github.com/nathanwoulfe/umbraco-cms into temp-U4-6946 2018-07-12 14:40:56 +10:00
Nathan Woulfe
f9761ad2f8 auto save on create to fetch existing view 2018-07-12 14:32:13 +10:00
Nathan Woulfe
f2fafbc631 handle manual/external links, add label to input, update placeholder 2018-07-12 11:37:04 +10:00
Mundairson
583b25a85d Correct Umbraco.Web.UmbracoHelper and tests to be coding standards compliant. 2018-07-11 17:24:36 +01:00
Sebastiaan Janssen
f966c38513 Merge pull request #2762 from nathanwoulfe/temp-U4-11107 
U4-11107 Link to the page is not active after saving content without publish
 2018-07-11 16:29:17 +02:00
Sebastiaan Janssen
f8b6b8c9ad Merge pull request #2722 from nathanwoulfe/temp-U4-11259 
U4-11259: Duplicates in tag editor throws error and breaks property editor
 2018-07-11 16:11:31 +02:00
Shannon
13d6dfd234 renames DictionaryTreeController to have the correct file name 2018-07-11 16:42:25 +10:00
Nathan Woulfe
914a8fdc2b revert link change, config test now passes 2018-07-11 16:27:53 +10:00
Nathan Woulfe
f416fc6919 clear preview cookie when clicking the info-box link 2018-07-11 15:25:39 +10:00
Michael Latouche
ca13782e2a Update fr.xml 2018-07-10 13:57:40 +02:00
Michael Latouche
9d5b089227 Update fr.xml 2018-07-09 13:05:15 +02:00
Michael Latouche
916340f1f4 Merge pull request #4 from umbraco/dev-v7 
merging back dev-v7
 2018-07-09 12:58:37 +02:00
Stephan
ec9d4dc565 Merge pull request #2714 from umbraco/temp-w77 
Fixes models builder false positive error on media and member type mo…
 2018-07-09 10:42:32 +02:00
Nathan Woulfe
d3c8b46e00 replace node.published with node.hasPublishedVersion 2018-07-06 09:52:43 +10:00
Nathan Woulfe
416cea796e clean up usings 2018-07-06 09:38:00 +10:00
Nathan Woulfe
e34926acd6 check for existing file content when creating/saving new template 2018-07-06 09:38:00 +10:00
Stephan
ed81214e87 Merge pull request #2752 from LottePitcher/patch-1 
Correcting broken link to current v8 branch in CONTRIBUTING.md
 2018-06-29 16:40:38 +02:00
Lotte Pitcher
6fac55595d Correcting broken link to current v8 branch 2018-06-29 14:45:45 +01:00
Nathan Woulfe
e6842a1020 clean up usings 2018-06-29 20:34:04 +10:00
Nathan Woulfe
9b8f4c1a9a check for existing file content when creating/saving new template 2018-06-29 20:27:28 +10:00
Sebastiaan Janssen
1e9e13ea6a Merge pull request #2735 from ZizZu94/dev-v7 
Italian translation of prompt, bulk and grid area
 2018-06-29 09:46:57 +02:00
Sebastiaan Janssen
3f48f8c8e1 Merge pull request #2736 from dawoe/patch-1 
Translated unpublish dialog to dutch
 2018-06-29 09:37:36 +02:00
Dave Woestenborghs
d9b10b294e Translated unpublish dialog 
Added translation for key added in PR #2731
 2018-06-29 08:47:20 +02:00
Sebastiaan Janssen
42dcaf9ccd Merge pull request #2693 from BatJan/dev-v7 
Replaced the old checkbox with the umb-toggle directive
 2018-06-28 20:43:22 +02:00
Sebastiaan Janssen
a860e6b324 Merge pull request #2547 from soreng/patch-1 
U4-11156: Updated documentation + default values for getPagedDescendants
 2018-06-28 20:40:29 +02:00
Sebastiaan Janssen
0f818c4e0a Merge pull request #2562 from leekelleher/U4-9668 
U4-9668 RelationService - Relates entities by ID and a relationType + Alias
 2018-06-28 20:36:55 +02:00
Sebastiaan Janssen
5f6fdc759a Merge pull request #2565 from leekelleher/U4-9088 
U4-9088 - Macro Container Property Type returned incorrect object-type
 2018-06-28 20:33:50 +02:00
Sebastiaan Janssen
00959a16cc Merge pull request #2585 from bjarnef/dev-v7-U4-11214 
U4-11214 - Display member type name in heading
 2018-06-28 20:32:26 +02:00
Sebastiaan Janssen
51fc0da379 U4-11187 - Adds friendlier "Enable JavaScript" message (#2568) 2018-06-28 20:30:52 +02:00
Sebastiaan Janssen
cda4f6a2f0 Merge pull request #2569 from Mivaweb/patch-3 
Fix wrong closing i tag and wrong title for edit button
 2018-06-28 20:29:50 +02:00
Sebastiaan Janssen
0a29ad3d21 Merge pull request #2570 from AndyButland/u4-10502 
U4-10502 - resend of user invitations
 2018-06-28 20:28:24 +02:00
Sebastiaan Janssen
623fa59a3f Merge pull request #2571 from dampee/patch-2 
Typo in the documentation summary
 2018-06-28 20:26:49 +02:00