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

4272 Commits

Author SHA1 Message Date
Mads Rasmussen
483762a984 fixes: U4-9466 Duplicate reorder links for Umbraco grid 2017-02-06 12:50:34 +01:00
Shannon
c16ce4ce1f Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-02-03 10:21:10 +11:00
Shannon
86021c5052 Adds remaining core methods to make 2FA providers work if you know how to wire it up 2017-02-03 00:47:28 +11:00
Shannon
5060e709d1 Fixed merge conflicts, adds required methods to auth controllers. 2017-02-02 22:11:34 +11:00
Claus
46c7737c17 Merge pull request #1714 from umbraco/temp-u4-9441 
Fixes tree syncing issues
 2017-02-01 14:04:18 +01:00
Morten Christensen
1e7c44ead0 Merge remote-tracking branch 'origin/temp-U4-9451' into dev-v7.6 2017-01-31 11:38:41 +01:00
Shannon
54bda6f12a U4-9451 Package installation custom user control is not displayed after a package is installed 2017-01-31 15:40:02 +11:00
Per Ploug
b05c4711ce Fixes tree syncing issues 2017-01-30 13:33:05 +01:00
Claus
67da15330e U4-9410 Hook up delete dialog for Code Files 
delete dialogs for partialviews, partialviewmacros and scripts.
+ fixed codefileResource.
+ fixed comments in MemberTypesDeleteController.
 2017-01-30 11:56:30 +01:00
Mads Rasmussen
ab00ba8a12 Merge branch 'dev-v7.6' into temp-U4-9352 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
 2017-01-27 10:39:31 +01:00
Sebastiaan Janssen
0a2e5badd0 Merge branch 'temp-template-editor' into dev-v7.6 2017-01-26 18:27:10 +01:00
Warren Buckley
4c06ead056 Merge pull request #1698 from umbraco/temp-U4-9419 
fixes: U4-9419 The new content picker adds picked items in a random o…
 2017-01-26 16:21:03 +00:00
Claus
56bc47302c Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-01-24 09:59:03 +01:00
Warren Buckley
25822a7564 Fix up orderby translation in view and use our new JSON properties for display the tranlsated value for asc & desc 2017-01-23 16:01:05 +00:00
Warren Buckley
072f0d1520 Adds in some extra propeties on JSON to store localization label for ascending & descending & use correct key for MyWebstie/WebSite Root that was already in lang file 2017-01-23 15:53:18 +00:00
Mads Rasmussen
24c053d671 Fixes: U4-9427 Unable to install local packages in various browsers 2017-01-23 16:11:09 +01:00
Warren Buckley
abebb40461 Update some copy/paste typos in code comments 2017-01-19 15:18:12 +00:00
Warren Buckley
3b54db9b49 Update main templat editor to use a localised notification 2017-01-19 15:14:46 +00:00
Warren Buckley
1defc1e0e4 Changed key for saving scripts - as it mentioned 'script view' Whats that?! So changed to more generic file 2017-01-19 15:14:14 +00:00
Warren Buckley
a7e626f4a7 Localisation notification message for saving scripts 2017-01-19 15:05:05 +00:00
Warren Buckley
04f6a01196 Forgot to remove the old notification - as was display two 2017-01-19 15:04:36 +00:00
Warren Buckley
ef64fbb839 Same change for the partialview editor - to display a localized success notifcation 2017-01-19 15:01:14 +00:00
Warren Buckley
2424a1c04b Adds in localised sucess notification when saving partial view macros 2017-01-19 14:57:23 +00:00
Warren Buckley
c8c7de065d Forgot to update the var name in codeFileResource 2017-01-19 14:56:25 +00:00
Warren Buckley
61d71d0552 Update codeFileResource docs 2017-01-19 14:40:10 +00:00
Mads Rasmussen
b8734e5eea fixes: U4-9419 The new content picker adds picked items in a random order 2017-01-19 15:11:37 +01:00
Per Ploug
eefd13547c More localization of querybuilder 2017-01-19 12:53:39 +01:00
Claus
29d86b8675 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-01-19 12:08:23 +01:00
Sebastiaan Janssen
a57abce96e Manually applying https://github.com/umbraco/Umbraco-CMS/pull/1688 2017-01-19 11:30:14 +01:00
Sebastiaan Janssen
b260f6c6de Merge pull request #1679 from umbraco/U-9333 
Add support for GUIDs in media and content pickers
 2017-01-19 11:25:34 +01:00
Mads Rasmussen
a09755ef7f remove unused code in partial view editor 2017-01-19 11:19:34 +01:00
Warren Buckley
736cf94155 Merge pull request #1687 from umbraco/temp-U4-9354 
Fixes: U4-9354 SPIKE Update content picker UI
 2017-01-19 09:35:49 +00:00
Mads Rasmussen
49d24dada7 add partial views macros editor 2017-01-18 15:39:08 +01:00
Mads Rasmussen
ef9dd6d803 add scripts editor 2017-01-18 15:38:40 +01:00
Mads Rasmussen
1fd98dba30 make launch mini editor service return a promise so we can update a node when it is saved 2017-01-18 14:50:51 +01:00
Warren Buckley
40ea54007f Update the usage of GetUrl - to just use the raw string value as opposed to a JSON object. Updated related JS object mock as well 2017-01-18 12:34:58 +00:00
Warren Buckley
1f98b76da0 On app.authenticated JS event - we clear out LocalStorage values in case a different user is logging in 2017-01-18 09:34:02 +00:00
Mads Rasmussen
698f0e975a remove option to open media items in mini editor 2017-01-17 23:01:40 +01:00
Mads Rasmussen
c6ed4eaff6 only sort lists with more than one item 2017-01-17 21:27:24 +01:00
Mads Rasmussen
2964f9a1c7 clean up redundant code 2017-01-17 20:48:00 +01:00
Mads Rasmussen
4612183b13 fix unit test typo 2017-01-17 19:27:39 +01:00
Mads Rasmussen
4fe12d8930 clean up dependencies in content picker controller 2017-01-17 19:26:00 +01:00
Mads Rasmussen
a54f4aeffd added documentation for umb-node-preview component 2017-01-17 19:10:22 +01:00
Mads Rasmussen
01f50a243b translate master template and no macros 2017-01-17 14:13:20 +01:00
Shannon
44732e5f52 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-01-17 18:21:45 +11:00
Mads Rasmussen
bf4ad25cad remove ng-title 2017-01-16 21:16:31 +01:00
Mads Rasmussen
c58957dc7b fix unit tests 2017-01-16 20:52:07 +01:00
Mads Rasmussen
7b616cf719 add a bit padding on the sides 2017-01-16 20:50:56 +01:00
Mads Rasmussen
cca0f4c293 clean up 2017-01-16 20:13:43 +01:00
Mads Rasmussen
bbe68cc224 better styling of mini editor 2017-01-16 20:13:17 +01:00