yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,534 Commits 4 Branches 7 Tags
89ed75f5dcd4494363751d010e5cdc0e257fcfd3
Commit Graph

10534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
antoine
89ed75f5dc Right .gitignore file 2014-06-30 19:36:45 +02:00
antoine
ec294cefd8 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-06-30 19:29:38 +02:00
antoine
16d8481ad9 Tuning new concept, config throught json config or/and html5 data tags 2014-06-30 19:28:33 +02:00
per ploug
601fef873a Found a couple of minor issues while testing 2014-06-27 11:50:03 +02:00
per ploug
49a374dbca Fixing various grid bugs with the new structure 2014-06-26 23:36:04 +02:00
per ploug
7edd7cbd8a Friendlier YSOD modal 2014-06-26 23:35:25 +02:00
per ploug
51e9ef21aa Adding comment + docs to checboxlistmodel 2014-06-26 11:33:35 +02:00
per ploug
d0ebbf2359 project file 2014-06-26 11:31:39 +02:00
per ploug
c8c2d2d601 GridView Configaration UI 2014-06-26 11:27:45 +02:00
per ploug
8a93c8371c Moves templatequery models into the right folder 2014-06-26 11:24:57 +02:00
per ploug
4fea55e751 More efficient grunt execution 2014-06-26 11:24:05 +02:00
Sebastiaan Janssen
c34f83e231 U4-5092 Czech language support 2014-06-16 10:11:19 +02:00
Sebastiaan Janssen
fd2fe1939a Adds new installer image 2014-06-11 10:22:13 +02:00
Morten Christensen
81e56bed9e Implementing Document Type Compositions in the Document Type Editor. 
Adds changes to the CMSNode and doc type related class which improves the internal usage of the new model based on IUmbracoEntity.
 2014-06-11 07:08:38 +02:00
Sebastiaan Janssen
52457fea21 Bump version number 2014-06-10 18:47:02 +02:00
Sebastiaan Janssen
07ec9aa813 Undo formatting of query for now 2014-06-10 18:11:14 +02:00
Sebastiaan Janssen
ba89aec34f Merge pull request #415 from rustyswayne/7.1.5-templatequery 
Query Builder - Fix Date sort fields and format returned query
 2014-06-10 17:48:59 +02:00
Jeavon Leopold
29533820ab Query Builder - Fix Date sort fields and format returned query to be on new lines and tabbed 2014-06-10 16:43:28 +01:00
Sebastiaan Janssen
4366500fad Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
 2014-06-10 17:15:07 +02:00
Sebastiaan Janssen
ee6e1a9d8b Disable extra templates tree 2014-06-10 17:13:58 +02:00
antoine
3b95184f04 empty video or media issue 2014-06-10 17:06:13 +02:00
antoine
9da7e108da double )) in embed open windows 2014-06-10 16:52:29 +02:00
antoine
cb491d45ab open preview issue fixed 2014-06-10 16:50:03 +02:00
Sebastiaan Janssen
344b880ba7 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-06-10 15:22:31 +02:00
Sebastiaan Janssen
c958f12bc1 Merge pull request #413 from rustyswayne/7.1.5-templatequery 
Template Query Editor Prototype
 2014-06-10 15:11:57 +02:00
Shannon
9a973d0ccc fixes csproj 2014-06-10 15:06:41 +02:00
Jeavon Leopold
b170053e87 Support for multiple "and" conditions in the query builder 2014-06-10 14:05:57 +01:00
antoine
db4509de2b link picker removed 2014-06-10 14:35:57 +02:00
antoine
5c91b822e3 legacy grid's configs removed 2014-06-10 13:45:52 +02:00
Shannon
e6ddf63e56 re-adds old providers 2014-06-10 13:19:52 +02:00
Shannon
84ac029372 re-add segment provider 2014-06-10 13:18:54 +02:00
antoine
5d59741612 iframe resize with the tuning panel 2014-06-10 12:52:33 +02:00
Jeavon Leopold
2ffd0413e8 Adding query builder button to View editor 2014-06-10 11:27:26 +01:00
Jeavon Leopold
dc4e6ee01c Adding Visible to template query builder 2014-06-10 08:40:33 +01:00
Jeavon Leopold
1d8e217c6f Template Query builder prototype working! 2014-06-09 23:23:31 +01:00
Sebastiaan Janssen
e59768dda0 Capitalize Caturday 2014-06-09 20:57:15 +02:00
Sebastiaan Janssen
0b114c88f0 Merge pull request #397 from lesleyauk/7.1.5 
Correct English days of the week on login screen
 2014-06-09 20:55:31 +02:00
Rusty Swayne
0b3136cf20 Patched Contains query & implemented SortExpression 2014-06-09 09:14:26 -07:00
Rusty Swayne
b0e96b256a Merge branch '7.1.5' into 7.1.5-templatequery 2014-06-09 08:44:19 -07:00
Jeavon Leopold
72a966b0fa Template Query Editor - Angular and hooking up to the API controller 2014-06-09 16:42:57 +01:00
Rusty Swayne
bf222f26cd Merge remote-tracking branch 'umbraco/7.1.5' into 7.1.5 2014-06-09 08:41:33 -07:00
Rusty Swayne
be9f4b70e2 Added JasonCamelCaseFormatter to the .Web project 2014-06-09 08:40:47 -07:00
Stephan
d9374c34d1 Add IPropertyValueConverterMeta interface 
Conflicts:
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2014-06-09 15:31:35 +02:00
Sebastiaan Janssen
2b7526ab2e Merge pull request #409 from JimBobSquarePants/7.1.5 
Improving grammar in installer facts.
 2014-06-09 15:30:46 +02:00
Shannon
2fde10494c Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-09 15:32:52 +02:00
Shannon
0da4879400 downgrades mini profiler to what it used to be 2014-06-09 15:32:44 +02:00
Sebastiaan Janssen
07172067ab Merge pull request #408 from BatJan/7.1.5-wording-fix-4382 
Fix of U4-4382
 2014-06-09 15:28:36 +02:00
James South
681a3e3046 Improving grammar in installer facts. 2014-06-09 15:20:28 +02:00
Rusty Swayne
0060f0019e Merge branch '7.1.5' into 7.1.5-templatequery 2014-06-09 05:41:16 -07:00
Rusty Swayne
632cd221d9 Attribute for WebApi controllers that camel cases object property names when serialized to Json 2014-06-09 05:39:14 -07:00