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

12762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
ef2e86b271 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-16 15:04:39 +02:00
Shannon
1c0188351c Moves the grid configuration to a config class so it can be re-used. Updates the BackOfficeController to use the new config classes. Creates a new Grid property value converter (which can be overridden by user's ones) which merges the grid config values at runtime so we are not storing stale grid config values with the actual property value. Now we need to ensure that the grid doesn't post or persist these config values since they don't belong there. 2015-06-16 15:04:31 +02:00
Stephan
6d3377cc6e Revert "temp - temp media memory cache" 
This reverts commit 8d1cdf020b.
 2015-06-16 12:29:09 +02:00
Shannon
fd6caf5cee updates how scripts render in main view - make it more clear where the callback is 2015-06-16 10:59:47 +02:00
Shannon
20e265491f Updates to latest AutoMapper and HtmlAgility 2015-06-16 10:19:34 +02:00
Shannon
10c8645b5f fixes button alignment now that the left section panel shrinks 2015-06-15 18:10:54 +02:00
Shannon
3c353fc7f9 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-15 17:47:01 +02:00
Shannon
bc04f578e3 fix build 2015-06-15 17:46:53 +02:00
Shannon
03a8ee437d Merge branch 'dev-v7-U4-6677' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6677 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/panel.less
 2015-06-15 17:43:06 +02:00
Stephan
ee0297bb69 U4-6631 - throw on missing physical template file 2015-06-15 17:36:53 +02:00
Shannon Deminick
9765e9cf3a Merge pull request #715 from dampee/fixes/U4-5559 
Fix Typo's build-in and seperate (U4-5559)
 2015-06-15 17:31:23 +02:00
Shannon
6d9aba0952 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-15 17:13:42 +02:00
Shannon
1b137bb785 Fixes: U4-5777 Allow Localization of Plugins without having to edit core language files 2015-06-15 17:13:34 +02:00
Damiaan
d2dc4efed8 U4-5559 Fix Typo "Seperate" to Separate 2015-06-15 16:12:46 +02:00
Damiaan
4f02a13a46 U4-5559 Fix Typo "Build-In" (Code) 2015-06-15 16:07:45 +02:00
Stephan
52c33055af U4-6702 - handle wildcard domains also for virtual node handler 2015-06-15 14:58:34 +02:00
Stephan
bef6b8cd4c U4-5162 - do not cache macro if previewing 2015-06-15 14:45:16 +02:00
Stephan
8d1cdf020b temp - temp media memory cache 2015-06-15 14:38:09 +02:00
Shannon
29b64965ed Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-15 13:35:01 +02:00
Shannon
1e5a7a13dd fixes tree sync when the tree type alias isn't the correct case 2015-06-15 13:34:54 +02:00
Shannon Deminick
e6cc90f6dd Merge pull request #714 from Tobz91/U4-6699 
Removed capitalize from headings
 2015-06-15 13:28:09 +02:00
Shannon
c29af1df48 Fixes: U4-6636 Left navbar (section-bar) is unnecessary wide on mobile devices 2015-06-15 13:18:46 +02:00
Tobz91
8451a020dd Removed capitalize from headings 
To avoid uppercase on first letter in every word for headings (in modals
for example).

Issue: http://issues.umbraco.org/issue/U4-6699
 2015-06-15 13:18:18 +02:00
Shannon Deminick
b413d717e2 Merge pull request #713 from vnbaaij/patch-1 
As discussed in cg15 Grid workshop
 2015-06-15 12:15:05 +02:00
Shannon Deminick
dafaca414c Merge pull request #708 from fraabye/dev-v7 
Added debugger display attribute to PropertyEditor base class. Fixes: U4-6534
 2015-06-15 12:13:58 +02:00
Shannon Deminick
b1fda57e50 Merge pull request #707 from trankin/bugfixes/U4-6687 
Fix U4-6687: Can't add multiple instances of a macro in RTE in 7.2.6 …
 2015-06-15 12:05:14 +02:00
Shannon Deminick
4cd8522921 Merge pull request #706 from bjarnef/dev-v7-U4-6058 
U4-6058 - Move search field out of table header in listview
 2015-06-15 11:44:58 +02:00
Vincent Baaij
4574aa2173 As discussed in cg15 Grid workshop 
If you use more than one grid datatype in one doctype, the editors are shown the text 'Choose a layout for the page' more than once. By showing 'Choose a layout for this section', the text is in line with the documentation
 2015-06-15 10:13:04 +02:00
Vincent Baaij
226f8f60ca As discussed in cg15 Grid workshop 
If you use more than one grid datatype in one doctype, the editors are shown the text 'Choose a layout for the page' more than once. By showing 'Choose a layout for this section', the text is in line with the documentation
 2015-06-15 10:10:05 +02:00
Shannon
a3d4ccc062 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
 2015-06-15 09:41:50 +02:00
Shannon Deminick
7ca323d8d3 Merge pull request #704 from bjarnef/dev-v7-loginview 
Add ng-cloak for login view
 2015-06-15 09:29:25 +02:00
Frederik Raabye
d75179b742 Added debugger display attribute to PropertyEditor base class. Fixes: U4-6534 2015-06-11 12:00:34 +02:00
Tom Rankin
6be183f11b FIX U4-6687: Adding tests for RTE Macro parsing when macroAlias is the first attribute and a new test for multiple Macros of various format. 2015-06-10 12:53:32 -05:00
Tom Rankin
a979f7ab12 Missed a test case when the properties were not in front of MacroAlias 2015-06-10 11:20:51 -05:00
hartvig
e639869bb1 Update index.html 2015-06-10 09:20:25 +02:00
hartvig
09552d282f Update canvasdesigner.controller.js 2015-06-10 09:19:44 +02:00
Tom Rankin
afe09c0850 Fix U4-6687: Can't add multiple instances of a macro in RTE in 7.2.6 without ruining RTE formatting 
We found that the MacroTagParser.cs was being greedy and matching all UMBRACO_MACRO tags instead of getting them individually.

macro.service.js was updated for posterity purposes to match the regex in the .cs side, but testing showed that it was functioning as expected without this change.
 2015-06-09 14:19:59 -05:00
Sebastiaan Janssen
0695839717 Updates version 2015-06-09 19:39:45 +02:00
Sebastiaan Janssen
12dba80553 Removes zzaaa from version number 2015-06-09 14:38:01 +02:00
Sebastiaan Janssen
f1d26d0990 Bring web.config in line with the nuget one 2015-06-09 14:35:30 +02:00
Stephan
83d5eda63c Bugfix xdt upgrade to 7.3 2015-06-09 12:22:08 +02:00
Shannon
2f80d5466d Merge branch '7.3.0' of https://github.com/umbraco/Umbraco-CMS into 7.3.0 2015-06-09 12:17:53 +02:00
Shannon
e90766ad06 Ensures that during install that we don't enable the identity user manager or cookie auth since no db tables exist, fixes the IsUpgrading check to check for actual valid tables 2015-06-09 12:17:45 +02:00
bjarnef
3c21ccab78 Move search field out of table header 
Move search field out of table header in listview to give more space for
content in listview.
 2015-06-09 00:45:15 +02:00
Stephan
379c629e9c U4-6683 - TEMP workaround enabling upgrade to 7.3 2015-06-08 22:50:48 +02:00
bjarnef
3f0ea176e3 Add ng-cloak for login view 
Add ng-cloak for login view to prevent Angular from briefly displaying
raw (uncompiled) content ```{{ }}```.
 2015-06-08 01:42:51 +02:00
Shannon
49417cbce4 Fixes assembly references and assembly redirects 2015-06-06 22:35:24 +02:00
Shannon
6153c70ef6 Fixes: U4-6673 Xml data integrity dashboard 2015-06-05 17:27:18 +02:00
Stephan
dffe09af58 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Web/UmbracoModule.cs
 2015-06-04 18:32:54 +02:00
Stephan
07e9a3a4ea Refactor scheduled tasks & publishing cancellation 2015-06-04 14:00:02 +02:00