yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,686 Commits 4 Branches 7 Tags
344dab65d4b32b52c8f01b27f767d3faaab365bb
Commit Graph

2780 Commits

Author SHA1 Message Date
Shannon
1a02841649 U4-8472 Add web.config file to media folder path to prevent all execution based files from being run by IIS 2016-06-28 16:01:23 +02:00
Shannon
eec0e4f946 Merge branch 'U4-8588' of https://github.com/JimBobSquarePants/Umbraco-CMS into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI/packages.config
 2016-06-27 14:20:13 +02:00
Shannon Deminick
46690ed405 Merge pull request #1284 from umbraco/temp-U4-265 
U4-265 Time zone adjustment in Umbraco backend for Date/Time picker
 2016-06-27 14:15:13 +02:00
Shannon
37f67b505c Changes the greymed color to be a bit darker (after discussing with mads), makes the forms styles use greymed instead of a custom one, removes the first line from the help (too long) 2016-06-27 14:14:49 +02:00
Shannon Deminick
5fc2d93709 Merge pull request #1354 from abjerner/patch-8 
Implemented better translations for the create data type dialog
 2016-06-27 09:45:27 +02:00
Sebastiaan Janssen
b840ab250a Merge pull request #1238 from Dynacy/patch-1 
Create tr.xml
 2016-06-24 13:08:17 +02:00
Anders Bjerner
a70aa5cb25 Added translations for en-US 2016-06-23 18:14:58 +02:00
Anders Bjerner
6e1e7ff8ba Added translations for English 2016-06-23 18:13:37 +02:00
Anders Bjerner
74c22c8491 Added translations for Danish 2016-06-23 18:13:03 +02:00
Sebastiaan Janssen
abd2e70b6a Make sure to hide the timezone offset message when no offsetting is needed (server and client are in the same timezone) 2016-06-22 17:19:24 +02:00
Sebastiaan Janssen
d2ad39f2d3 Merge pull request #1287 from bjarnef/dev-v7-U4-8526 
Fix a few translations in da.xml
 2016-06-21 17:47:06 +02:00
Sebastiaan Janssen
df95b2a402 Same trick as for web.config, copy the ClientDependency.config from a template once and then ignore it so we don't always get prompted to commit it 2016-06-21 10:53:52 +02:00
Stephan
afcf2e195e Upgrade to ModelsBuilder 3.0.3 2016-06-20 16:10:06 +02:00
Shannon
c5aa97e23a Merge branch 'temp-packages' into dev-v7 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
 2016-06-14 14:15:47 +02:00
Shannon
a8c71e52ec Ensures the min umbraco version is checked when installing packages that have the strict flag set. 2016-06-13 23:35:09 +02:00
Sebastiaan Janssen
b2cd4820be Updates Examine 2016-06-13 23:24:19 +02:00
James Jackson-South
c9c1aea8ab Update ImageProcessor, clean up log message 2016-06-14 04:54:26 +10:00
AndyButland
0a00be7cfe Set fixed value for click-jacking protection to sameorigin instead of deny 2016-06-13 20:48:37 +02:00
James Jackson-South
b7ef324287 Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into U4-8588 2016-06-14 04:24:46 +10:00
Sebastiaan Janssen
d83d7956bb Dev v7 health check (#1220) 
Adds health check feature including some initial checks
 2016-06-13 17:42:05 +02:00
James Jackson-South
33cbcbb7d4 Save projects. 2016-06-13 22:47:49 +10:00
James Jackson-South
b0a4cc3333 Updates ImageProcessor 💥 
- Update versions
- Add ImageProcessorLogger
 2016-06-13 22:43:05 +10:00
Claus
2e9e8f23e9 adjustments for paddings. 2016-06-12 20:40:39 +02:00
Claus
a099c40d93 U4-8584 Starterkit thumbnails are not really thumbnails 
adding a parameter to the image url to avoid loading a massive image when its only rendered in a thumbnail size.
 2016-06-12 20:39:53 +02:00
Shannon
cba91145ee Updates new packages tree, obsoletes old one, have the package UI running for root node and sub nodes only for created packages. 2016-06-12 15:19:42 +02:00
Oliver Philpott
952ff74899 Fixed formatting for woff2 mimetype 2016-06-09 10:26:03 +01:00
Oliver Philpott
3f5729767d U4-8509 - Added woff2 mime type 2016-06-09 10:08:05 +01:00
Damiaan
7b101caf0b update examine documentation links 2016-06-03 11:36:07 +02:00
Simon Busborg
2ce2a03072 Local installer 2016-06-01 13:03:19 +02:00
Sebastiaan Janssen
720a46686b U4-8500 Get c# docs building (#1291) 
fetches docfx, builds the metadata and builds the docs with the correct filters
builds the UI docs from the same powershell script
 2016-05-30 12:02:13 +02:00
bjarnef
2f1b234d85 Fix template translation 2016-05-26 22:43:15 +02:00
bjarnef
00ae650ee2 Modify a few other keys 2016-05-26 22:37:49 +02:00
bjarnef
e3dae6d77e Fix a few translations in da.xml 2016-05-26 22:24:33 +02:00
Simon Busborg
259ccd653e Added dummy data to packages 2016-05-26 14:13:55 +02:00
bjarnef
695c69af7f Updated indent 2016-05-22 21:11:51 +02:00
bjarnef
0607782028 Added localization for the new password reset stuff. 2016-05-22 21:08:21 +02:00
bjarnef
45ff11b884 Change "siten" to "sitet" 2016-05-22 14:26:37 +02:00
bjarnef
e39f818389 Fix indent 2016-05-22 13:53:43 +02:00
bjarnef
5fab1ca207 Localize move and copy overlay titles opened from listview actions. Prepare localization of bulk messages. 2016-05-22 13:46:48 +02:00
Mads Rasmussen
adebd4acd6 Merge pull request #1169 from AndyButland/u4-7468 
Fixes U4 7468 - mis-assigned translator when sending to translation
 2016-05-17 13:18:15 +02:00
Mads Rasmussen
6a593d8b5e Merge pull request #1245 from greystate/U4-8377 
Fix for U4-8377
 2016-05-17 10:42:12 +02:00
Mads Rasmussen
38bc38486a Merge pull request #1229 from bjarnef/dev-v7-U4-8300 
Wrap text "Include all child nodes" in a label
 2016-05-17 10:13:06 +02:00
Claus
acb1aeabda Merge pull request #1261 from umbraco/temp-U4-8371 
U4-8371 Dont ship with the {machinename} token for Examine
 2016-05-12 10:55:52 +02:00
Simon Busborg
924eac1b95 Merge pull request #1235 from bjarnef/dev-v7-U4-8347 
Fix localization of listview buttons/links actions.
 2016-05-11 10:06:51 +02:00
Shannon
fb55b0a60b U4-8371 Dont ship with the {machinename} token for Examine 2016-05-10 18:32:32 +02:00
Stephan
271f4e7a4a U4-8413 - fix missing ServersLock object 2016-05-10 12:29:13 +02:00
Stephan
5f8747b4d3 U4-1780 - detect colliding urls (#1243) 
* U4-1780 - detect colliding urls

* U4-1780 - fix error message

* U4-1780 - fix XmlHelper issue with sortOrder

* U4-1780 - bugfix
 2016-05-04 12:45:20 +02:00
Simon Busborg
2a87c926f3 Merge pull request #1234 from bjarnef/dev-v7-U4-8343 
Localize "unsaved changes" dialog.
 2016-05-02 10:44:47 +02:00
Chriztian Steinmeier
066ef6809b Change the language keys necessary for the fix 2016-04-26 23:36:42 +02:00
Stephan
fb99e375d0 U4-5699 - update template alias in gui after saving 2016-04-25 14:14:55 +02:00