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

2233 Commits

Author SHA1 Message Date
Shannon
c962a9331a Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-18 10:04:45 +02:00
Shannon
b175177770 Fixes date picker: U4-6715 i can't seem to remove a "publish-at" date? - date picker is more robust now and does proper validity checking/feedback 2015-06-18 10:04:22 +02:00
Shannon
08ff284121 adds test to ensure the service level can remove a scheduled publish date, obsoletes method: GetHasPermission 2015-06-18 09:44:16 +02:00
Shannon Deminick
221183d791 Merge pull request #718 from WebCentrum/dev-v7-gridsort2 
Fixed bug in U4-6593 - After sort, reset the TinyMCE editors with previous settings
 2015-06-17 15:22:52 +02:00
Shannon
be84db097a Fixes: U4-6599 TinyMCE autoresize plugin has a bug and needs to be updated, U4-5689 update to latest TinyMCE 4.x version 2015-06-17 15:06:34 +02:00
Allyen
eaaccdad75 Fixed bug in U4-6593 - After sort, reset the TinyMCE editors with previous settings 2015-06-17 14:57:15 +02:00
Shannon
d77f95f29b removes tutorial docs and irrelavent readme and todo files, updates docs build to exclude tutorials header 2015-06-17 11:56:20 +02:00
Shannon
aef1fb13b1 Fixes: U4-6148 Grid values should not store meta data/grid configuration, the grid config should be accessed globally for use in rendering the grid 2015-06-17 09:59:25 +02:00
Shannon
10d368696d Updates grid editor to filter the values that will be persisted so it's a minimal subset. 2015-06-16 15:49:09 +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
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
Damiaan
d2dc4efed8 U4-5559 Fix Typo "Seperate" to Separate 2015-06-15 16:12:46 +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
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
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
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
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
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
6153c70ef6 Fixes: U4-6673 Xml data integrity dashboard 2015-06-05 17:27:18 +02:00
Shannon
3fbf90e56d Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-06-03 15:08:47 +02:00
Shannon
3890353ff5 fixes merge issue 2015-06-03 12:37:31 +02:00
Shannon
60ce993c09 Fixes change password dashboard to have autocomplete = off and to not show plain text passwords. 2015-06-03 12:20:20 +02:00
Shannon Deminick
30cd303a13 Merge pull request #697 from wp-manaosoftware/dev-7-angularthrowexception 
U4-6621 - fix issue AngularJS throws exception that locationEvent was…
 2015-06-02 21:04:08 +02:00
Shannon
60ce987507 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-02 20:53:55 +02:00
Shannon
a231899052 Fixes: U4-6635 with label overlaying the folder icon when the folder icons are small. 2015-06-02 20:53:46 +02:00
Shannon Deminick
7ddcccb0c5 Merge pull request #685 from gavinfaux/U4-6618 
Back office insecure content warning loading Google Web Fonts when running over HTTPS
 2015-06-02 20:16:12 +02:00
Warm
a1a30240f6 U4-6621 - fix issue AngularJS throws exception that locationEvent was not defined when leaved a page without saving 2015-05-29 10:40:48 +07:00
Stephan
f285af8a4e Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 2015-05-26 13:19:43 +02:00
Shannon Deminick
7c4a189aa3 Merge pull request #696 from tomfulton/fix/u4-6655 
Fix U4-6655:  RTE Macro not rendering in backoffice when "macroAlias" is not first attribute
 2015-05-26 08:01:40 +10:00
Tom Fulton
4ec66bc868 Fix U4-6655: RTE Macro not rendering in backoffice when "macroAlias" is not first attribute 
Loosens UMBRACO_MACRO regex parsing to fix, add tests
 2015-05-22 20:40:30 -06:00
Shannon
9e223eb891 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
 2015-05-20 16:24:17 +10:00
Shannon
6cfb5bc678 Have made the buttons always left aligned with the editing section, seems better since it's consistent on all screens and less right hand motion to click a button 2015-05-20 16:13:36 +10:00
Shannon
a3b5996372 Fixes save/publish button placement on small screens 2015-05-20 16:01:44 +10:00
Shannon
2f2dd9c9b6 Merge branch 'dev-v7' of https://github.com/sebastian-claesson/Umbraco-CMS into sebastian-claesson-dev-v7 2015-05-20 15:07:48 +10:00
Shannon Deminick
02599e1254 Merge pull request #694 from Alain-es/datepicker-custom-format 
Datepicker custom format
 2015-05-20 14:48:36 +10:00
Alain-es
43f99e11a5 Datepicker custom format 2015-05-18 15:54:50 +01:00
Stephan
031f70f529 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Logging/LogHelper.cs
	src/Umbraco.Web.UI.Client/src/less/login.less
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
 2015-05-18 16:23:12 +02:00
Sebastian Claesson Hoffback
d1d9878ab6 Fix content-edit-view on mobile devices 
The content editing view did not work at all on small screens. The label
took to much space, leaving the controller with almost none. Now the
label and the controller get its own row on smaller screens. Much
cleaner look and you can acctually edit a page on a small screen. Note:
Grids still don't work well.
 2015-05-18 13:59:42 +02:00
Shannon
3b791c75f6 Fixes: U4-5020 Login view on mobile screen is too big 2015-05-18 20:09:03 +10:00
Sebastian Claesson Hoffback
adde7c2f50 Fixed login-view on mobile devices 
On smaller screens the login-view was too far to the right.

Related issue: http://issues.umbraco.org/issue/U4-5020
 2015-05-18 11:34:13 +02:00