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

10520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeavon Leopold
46d5215d9e Merge remote-tracking branch 'upstream/7.1.5' into 7.1.5-templatequery 2014-06-09 13:21:07 +01:00
Jeavon Leopold
aa43656cb9 Revisions to QueryModel. Added Sorting and Take functionality. 2014-06-09 13:18:35 +01:00
Sebastiaan Janssen
e5dea8e4be Merge pull request #407 from BatJan/7.1.5-translation-fix-4538 
Fix of U4-4538
 2014-06-09 14:09:19 +02:00
Sebastiaan Janssen
087dd1fe9e Merge pull request #404 from BatJan/7.1.5-installer-fix-4416 
Fix of U4-4416
 2014-06-09 13:58:08 +02:00
Sebastiaan Janssen
37afe6dd29 Merge pull request #406 from BatJan/7.1.5-spelling-fix-5007 
Fix of  issue U4-5007
 2014-06-09 13:51:57 +02:00
Sebastiaan Janssen
338a125eaa Merge pull request #405 from JimBobSquarePants/7.1.5 
Fixing broken preview dialog U4-4977
 2014-06-09 13:49:45 +02:00
Jan Skovgaard
18fc6ccc99 Fix of U4-4382 2014-06-09 13:23:01 +02:00
Stephan
8a1db41fc4 Implement content.FirstChild 2014-06-09 13:04:40 +02:00
James South
d2119c17c1 Fixing broken preview dialog U4-4977 2014-06-09 13:01:00 +02:00
Jan Skovgaard
9d4afbd007 Fix of U4-4538 2014-06-09 12:44:07 +02:00
Jan Skovgaard
c4f764d5fc Fix of issue U4-5007 2014-06-09 12:28:29 +02:00
Sebastiaan Janssen
db3d86aeca Merge pull request #402 from leekelleher/U4-3596 
U4-3596 Recycle bin, use the listview on the recycle bin instead of showing the deleted items as children
 2014-06-09 10:56:24 +02:00
Sebastiaan Janssen
c17e60f709 Merge pull request #401 from leekelleher/U4-5066 
U4-5066 Display message on empty list-view.
 2014-06-09 10:45:13 +02:00
Sebastiaan Janssen
68860b6c54 Update Umbraco version everywhere 2014-06-09 10:32:09 +02:00