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

1989 Commits

Author SHA1 Message Date
Shannon Deminick
7b8932a5d6 Renaming to correct file naming conventions 2014-10-08 09:33:14 +11:00
Shannon Deminick
504f53439a Renaming to correct file naming conventions 2014-10-08 09:32:42 +11:00
Shannon Deminick
e58c7f46c7 Renaming to correct file naming conventions 2014-10-08 09:32:16 +11:00
Shannon Deminick
1953e23560 Rename src/Umbraco.Web.UI/Views/Partials/grid/bootstrap2.cshtml to src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml 2014-10-08 09:31:40 +11:00
Shannon
c266f9f58e updates sort dialog prog bar 2014-10-08 09:30:12 +11:00
per ploug
0057421f98 Update grid partials to grid/ instead of canvas/ 2014-10-07 14:40:45 +02:00
per ploug
be8e4b9fe5 grid partials 2014-10-07 14:01:48 +02:00
per ploug
b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
Shannon
cc9ca02843 Merge branch 'BatJan-7.1.5-localizatiob-5025' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
 2014-10-03 13:29:04 +10:00
Shannon
12e49f186e Merge branch '7.1.5-localizatiob-5025' of https://github.com/BatJan/Umbraco-CMS into BatJan-7.1.5-localizatiob-5025 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
 2014-10-03 13:28:02 +10:00
Shannon
967df0949b Merge branch 'abryukhov-7.1.0' into 7.2.0 2014-10-03 13:15:30 +10:00
Shannon
7368cc6b28 Style fixes 2014-10-03 10:37:30 +10:00
Shannon
1c16764605 Merge branch '7.2.0_progressbar' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_progressbar 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
 2014-10-02 21:46:39 +10:00
Shannon
c8264cff1e Updates the content type editor to have the list view customization inline instead of in a dialog. 2014-10-02 18:52:38 +10:00
antoine
b8034fa325 canvasdesigner.*.js added to ignore file 
Conflicts:
	.gitignore
 2014-09-30 09:24:38 +02:00
antoine
a9cf1aa874 contour reference deleted 2014-09-23 20:18:46 +02:00
per ploug
b3769e4117 Removes 3rd party app + trees from app+tree.config 2014-09-23 19:53:12 +02:00
per ploug
8194fb7b32 Canvas views 2014-09-23 16:36:04 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
per ploug
e1793ad95c merge 2014-09-23 08:48:36 +02:00
Shannon
fa2ed768db Adds forms dashboards and sections to normal development config 2014-09-23 12:40:10 +10:00
per ploug
872aff0c96 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:06:15 +02:00
per ploug
375fda2007 Merge remote-tracking branch 'origin/7.2.0-WIPFormsInstallDashboard' into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:03:09 +02:00
per ploug
5f5c8c7693 Forms section + dashboard 2014-09-22 20:07:35 +02:00
per ploug
9464d2a648 Adds support for hiding navigation when tree is empty 2014-09-22 20:07:03 +02:00
Sebastiaan Janssen
e2ec9230b9 Bring preview badge waaay to the foreground 2014-09-22 16:05:28 +02:00
Shannon
d87a426294 Implements the ability to have customized and configurable list views for specific content types 2014-09-22 18:18:09 +10:00
Shannon
51061e10a9 Gets the 'return to list' button working for all content types 2014-09-19 11:52:13 +10:00
Shannon
c43be77288 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-15 19:01:49 +10:00
Shannon
b38acdd654 List view config complete: U4-4972 Make list view configurable, 2014-09-15 19:01:28 +10:00
Shannon
96d570e760 Gets most of the configurable list view working, need to add some validation to the pre-value editor, some styling for the sorting of a field, add another system field for 'published date' (if possible), fix up the localized text for return to list view, fix up the persisting of the last page viewed in a list view 2014-09-15 13:53:33 +10:00
Shannon
afbeb50d55 List view pre-values working with fields and headers, list view now rendering data again, removed the config ui bits from the content type editor 2014-09-12 14:07:42 +10:00
Shannon
9bb5869cde reverting all things to do with additional list view column in db which is no longer necessary and removing additions to ui changes in the content tyep editor which are also no longer necessary 2014-09-12 11:50:56 +10:00
per ploug
5d2ac582b7 Gridview design polish 2014-09-11 14:50:05 +02:00
Stephan
a3ad8e2cab Die, Marco, die. 2014-09-11 08:24:01 +02:00
Shannon
7422238087 Merge branch 'AndyButland-u4-4972' into 7.2.0 
Conflicts:
	src/Umbraco.Web/Editors/MediaTypeController.cs
 2014-09-10 15:35:57 +10:00
Shannon
6afead5207 Merge branch 'u4-4972' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-4972 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
 2014-09-10 15:35:05 +10:00
bjarnef
7f3ab15eaa Fix for progressbar styling 
Modified the styling for the progressbar as the last fix didn't seem to
work in latest updates of Chrome.
 2014-09-09 23:12:23 +02:00
Shannon
eb6326487f Fixes grunt watches, Fixes: U4-3138 Examine mgmt dashboard styling is broken, rebuilds the mgmt dashboard in angular 2014-09-09 18:53:47 +10:00
Dan Lister
dfe89b50ae Update Dashboard.Release.config 
Amended dashboard.release.config 'Change password' tab caption casing to match other tab captions
 2014-09-02 15:55:34 +01:00
Shannon Deminick
07a52f659d Merge pull request #463 from kgiszewski/feature/rte-config 
Fix for U4-5409 headline justification in the RTE
 2014-08-28 08:14:19 +10:00
Kevin Giszewski
5420be483c Add style attribute to the headline white-listed attributes 2014-08-27 10:32:29 -04:00
Shannon
2f2d55e24f ensure normal browser cache is busted for auth upgrade view 2014-08-26 09:39:07 +10:00
Sebastiaan Janssen
101e116baf Bump version number 2014-08-25 15:14:21 +02:00
Shannon
88da00cdd3 Merge branch '7.2.0' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
 2014-08-25 16:57:10 +10:00
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
 2014-08-24 21:35:08 -06:00
bjarnef
8609427d3c Fix for U4-3953 (modified) 
I overlooked the installing message, so here the message is still
visible below the progressbar. Furthermore the same is fixed for the
uninstalling progressbar, which I didn't noticed previously.
 2014-08-24 20:51:36 +02:00
Morten Christensen
7d52ed873e Merge pull request #449 from nul800sebastiaan/uaas-events 
Adding events for use by Courier/UaaS
 2014-08-20 14:12:38 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Sebastiaan Janssen
468cdf64ff Merge pull request #447 from Jeavon/UpdateImageProcessor 
Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0
 2014-08-19 14:37:34 +02:00