yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,080 Commits 4 Branches 7 Tags
8024bde429dea109dc46643769bd122dc4a9deb3
Commit Graph

9080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perploug
8024bde429 Imaging directives (crop, gravity and preview) 2014-01-29 13:44:34 +01:00
perploug
9ce79e98a3 Final tweaks to TreeSource picker 
Better help text, polish icons and margins, made sure it toggles UI
correctly for each type of tree
 2014-01-29 11:21:54 +01:00
perploug
3e5553d9b0 Fixes weird issue with user language dropdown 2014-01-29 09:50:37 +01:00
perploug
5047c7bbe7 Fixes: U4-4155 Backend CSS Rich Text Editor Path Issue 2014-01-29 00:28:56 +01:00
perploug
0c45fb1b97 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-01-28 23:50:58 +01:00
perploug
7bd745a870 WIP: Tree icon colors 2014-01-28 23:50:25 +01:00
Tim Geyssens
93a4e8f426 Removes hard coded api url from rte embed 2014-01-28 16:18:30 +01:00
Tim Geyssens
fcc115004e Updates server vars with embedApiBaseUrl 2014-01-28 16:11:57 +01:00
perploug
24062c0061 Rolls back listview items in dialog trees 2014-01-28 15:49:04 +01:00
perploug
06cbdc37b4 Fixes: U4-4143 In rich text editor, non ASCII characters in source code window are encoded 
Also at the same time fixes missing config import from serverside config
 2014-01-28 15:45:14 +01:00
Shannon
23d9944a61 Merge branch '7.0.2' of https://github.com/kalletoxic/Umbraco-CMS into kalletoxic-7.0.2 2014-01-28 08:47:09 +11:00
perploug
31429ad9c8 Fixes treenodes with very long names breaking the tree 2014-01-27 22:09:16 +01:00
perploug
05a8d80284 Fixes broken refresh action 
Refresh action referenced the tree, not its root node
 2014-01-27 22:08:40 +01:00
perploug
c2d978a0db Enables listview children in dialog trees 
By default trees doesnt show children of listview nodes, this enables
them in dialog trees, otherwise content pickers cannot select childrens
of a listview node
 2014-01-27 22:03:52 +01:00
perploug
e17b32c6e5 Removes option to query media with Xpath on mntp 
Only content can be queried with Xpath in a reasonable performant manner
as its the only type of data that is cached as xml
 2014-01-27 13:49:09 +01:00
perploug
de79512dd4 Adds overloads to relationService.AreRelated 
Allows to lookup relations based on type and alias of type when doing
"AreReleated()" checks
 2014-01-27 13:45:54 +01:00
perploug
2a81162756 Fixes inconsistently named private method 
Replaces delegates with lambdas
 2014-01-27 08:27:31 +01:00
perploug
0a7526601c Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-01-24 18:41:46 +01:00
perploug
3e22598f4a fixes mntp filtering 2014-01-24 18:38:47 +01:00
perploug
d842f0f5b7 Adds support for xpath root node selection on mntp 2014-01-24 18:38:39 +01:00
perploug
8258619055 adds getByQuery to entityService 2014-01-24 18:38:08 +01:00
perploug
7d2f6c13c3 Addss template clearing when in debugmode 2014-01-24 17:20:34 +01:00
Shannon
b314bff127 Creates powershell file to do the build, this detects if you have sandcastle installed first, also overwrites the default TOC.css file with a custom slightly nicer version for the output. 2014-01-24 18:23:37 +11:00
Shannon
d66e2e52e9 adds additional bat files to the sln files for editing, adds the sandcastle help file config file that can be used to build the docs when sandcastle is installed. 2014-01-24 16:31:49 +11:00
Shannon
0714aaa457 Merge remote-tracking branch 'origin/7.0.2' into 7.1.0 2014-01-24 12:34:40 +11:00
Shandem
81dac97917 Merge pull request #284 from markvantilburg/patch-1 
Update booting.aspx
 2014-01-23 17:33:22 -08:00
Shannon
de6e0dc8d7 Merge branch '7.0.2' into 7.1.0 2014-01-24 12:32:07 +11:00
Sebastiaan Janssen
ead837f654 U4-4095 Missing Keys in English US Language File 2014-01-20 19:15:50 +01:00
Sebastiaan Janssen
10a4eb3ddc Fix Duplicate attribute YSOD (key was already added in the base class) 2014-01-20 12:02:52 +01:00
Morten Christensen
51f46cf871 Not raising export events for content/media ToXml extension for the time being 2014-01-20 10:37:46 +01:00
Shannon
88182edf8f Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-01-20 18:34:11 +11:00
Shannon
e456dd3886 Merge branch '7.0.2' into 7.1.0 2014-01-20 18:33:54 +11:00
Shannon
697548d1c7 Fixes: U4-3897 Copy contents relations not created 2014-01-20 18:01:19 +11:00
Shannon
f717628322 Ensures username is escaped in user service 2014-01-20 16:13:41 +11:00
Shannon
c2c4763faa Ensures username is escaped in user service 2014-01-20 16:11:38 +11:00
Shannon
e91b297cc2 updates user task creation for release 2014-01-20 16:04:49 +11:00
Shannon
c062d3b71b Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-01-20 16:01:53 +11:00
Shannon
ed83fb8216 updates user task creation for release 2014-01-20 16:00:19 +11:00
Shannon
c92441e544 Ensures user name is escaped in member service query. 2014-01-20 14:37:26 +11:00
Shannon
f0573fc68c Fixes: U4-4084 Macro's with non alphanumeric chars in their aliases cannot render in the rich text editor 2014-01-20 13:59:25 +11:00
Shannon
eb44480fdf fixes package installer path redirect when installing from the repo 2014-01-20 11:58:52 +11:00
Shannon
1ad05fbfc9 Clears the auth cookie after install if there is one which forces the login screen to display so that the csrf tokens are created - this is required if you are upgrading from a previous version and are logged in but don't have a version with csrf tokens. 2014-01-20 10:53:14 +11:00
Shannon
673e24a2ea Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-20 10:37:36 +11:00
Shannon
4842be01cd Ensures app domain restarted after db upgrade to clear PetaPoco's mapping cache. 2014-01-20 10:36:37 +11:00
Morten Christensen
dddb38d4ee Adding comment to private method for clarity 2014-01-19 15:23:05 +01:00
Morten Christensen
727ce0f795 Additional tests for Macro import and export 2014-01-19 15:23:04 +01:00
Morten Christensen
ba27acead9 Adding unique key to xml for contentbase exports 2014-01-19 15:23:04 +01:00
Morten Christensen
a026a81a8a Adding test for import of Macros from uBlogsy package xml 2014-01-19 15:23:03 +01:00
Morten Christensen
5e7ee0c236 Adding ImportMacros to PackagingService interface 2014-01-19 15:23:03 +01:00
Morten Christensen
bb30d5ebd2 Refactoring Macro import method in PackagingService 2014-01-19 15:23:02 +01:00