Sebastiaan Janssen
b94c396d4e
Code sample No.5
2016-01-05 23:20:47 +01:00
Sebastiaan Janssen
8afc4f5ad1
Code sample No.3
2016-01-05 23:15:25 +01:00
Sebastiaan Janssen
f68b2de9e3
Code sample No.2
2016-01-05 23:13:37 +01:00
Sebastiaan Janssen
f4e29d90e0
Code sample No.1
2016-01-05 23:12:09 +01:00
Sebastiaan Janssen
4ef7b7735e
Fixes U4-6510 again as merging PR apparently went wrong
2016-01-05 17:04:11 +01:00
Sebastiaan Janssen
db538d95ba
Bumps version
2016-01-05 16:11:59 +01:00
Sebastiaan Janssen
cef7cd1ca7
Merge pull request #981 from umbraco/temp-U4-7583
...
U4-7583
2016-01-05 16:02:51 +01:00
Shannon
726416fe0c
Fixes: U4-7624 Datepicker Sql server error
...
Since we are not saving the formatted value, don't try parsing the date with formatting config.
Added in explicit parsing format compatible with the one used when saving the value, just to ensure parsing is done the same way.
2016-01-05 15:47:42 +01:00
Shannon Deminick
1957d8bb3b
Merge pull request #928 from kiasyn/patch-1
...
U4-7400 - Datepicker is not updating scope model value in time for 3r…
2016-01-05 15:19:31 +01:00
Shannon
fab30d353a
U4-7223 GetCropUrl outputs html entities in url when used in css
2016-01-05 14:54:02 +01:00
Shannon
18900d0e25
Fixes: U4-6659 Examine: Specific doctype not being indexed
2016-01-05 12:38:13 +01:00
Shannon
d08f4230c8
U4-7538 GetRemainingTimeoutSeconds is double setting the cookie in 7.4
2016-01-05 12:35:06 +01:00
Shannon
15d06557e9
U4-7605 Colons/Parens Unnecessarily Removed From Data Type Names
2016-01-05 11:42:02 +01:00
Shannon
8d2e708d1c
Adds exception handling for the BackOfficeUserStore - this will occur if the external OAuth provider doesn't return the Email or Name correctly, then an exception is swallowed at the service level and the user is not actually created, but the BackOfficeUserStore could not detect this, so it's detecting this now.
2016-01-05 11:36:52 +01:00
Shannon
280573be28
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2016-01-05 11:35:35 +01:00
Shannon
415aaf3e2b
U4-7477 xss char stripping on data type names is being too agressive
2016-01-05 11:35:24 +01:00
Sebastiaan Janssen
5081027482
Improve batch files: SETLOCAL makes sure we don't change the user's actual path, so no need to revert changes any more either
2016-01-05 11:33:10 +01:00
Shannon
ac1785bc08
U4-7583
2015-12-28 16:20:48 +01:00
Shannon Deminick
664aa3842d
Merge pull request #979 from robertjf/dev-v7
...
fix for issue U4-7609/U4-7610 - IE related problems
2015-12-28 10:09:29 +01:00
Robert Foster
fbee58e445
Added json mimetype Mapping to web.config.template to support things like manifest.json in certain browsers (e.g. IE).
2015-12-26 19:05:44 +11:00
Robert Foster
a5e87dcedf
Fix for IE not being able to install packages in Umbraco backoffice.
2015-12-26 18:57:24 +11:00
Robert Foster
ffe41fe060
Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7'
2015-12-18 22:45:46 +11:00
Shannon Deminick
e89cc24d51
Merge pull request #958 from lars-erik/overridable-domain-repository
...
Can't log into youtrack. Simple changes to repositoryfactory and umbr…
2015-12-16 10:19:25 +01:00
Claus
61f3b2ae4a
Added CultureInvariant to regex.
2015-12-16 09:53:15 +01:00
Claus
a752c7ee4b
Merge branch 'rasmusjp-U4-7462' into dev-v7
2015-12-16 09:52:36 +01:00
Lars-Erik Aabech
a14f0021bd
Can't log into youtrack. Simple changes to repositoryfactory and umbraco.web.ui assemblyinfo.
2015-12-16 09:50:17 +01:00
Claus
5eb5549448
Merge branch 'U4-7462' of git://github.com/rasmusjp/Umbraco-CMS into rasmusjp-U4-7462
2015-12-16 09:36:49 +01:00
Claus
f5e9151ffd
Localized some texts on the slider configuration.
2015-12-15 15:42:14 +01:00
bjarnef
5a9dd11a7c
Change margin-top for triangle and re-order config properties
2015-12-15 15:42:14 +01:00
bjarnef
9e6123abd3
Modify properties and styling
2015-12-15 15:42:13 +01:00
bjarnef
6c3ef2aaa9
Add more config properties
2015-12-15 15:42:13 +01:00
bjarnef
95ae504c9b
Change "reversed" property to boolean
2015-12-15 15:42:12 +01:00
bjarnef
88fadcf74e
Add slider bootstrap-slider v5.2.6
...
Add newer version of script and add addtional properties.
2015-12-15 15:42:12 +01:00
Sebastiaan Janssen
bb4994f9fc
Merge pull request #935 from torerikk/dev-v7
...
Update Norwegian translations
2015-12-15 15:10:46 +01:00
Claus
c334f94d72
Fixed a few comments.
2015-12-15 14:47:19 +01:00
Claus
ddf525db40
Merge branch 'AffinityID-u4-7522' into dev-v7
2015-12-15 14:43:22 +01:00
Claus
9c7ef46222
Merge pull request #941 from bugsancho/dev-v7
...
U4-7508 - IsChildOfListView should be populated for Media items
2015-12-15 14:18:27 +01:00
Sebastiaan Janssen
eacc7f7fb3
Whoops, was supposed to be en-US by default
2015-12-15 13:50:19 +01:00
Sebastiaan Janssen
80f597a7eb
U4-7424 - Also update all other errors displayed in the frontend
2015-12-15 12:51:45 +01:00
Sebastiaan Janssen
d069da8a4f
Make LocalizedTextService fall back to en-GB if the key is not found in the current file
2015-12-15 12:51:03 +01:00
Sebastiaan Janssen
44ebd8d9ea
Proper formatting of this file, only whitespace changes
2015-12-15 12:18:23 +01:00
Sebastiaan Janssen
2fd6dc3603
Merge branch 'engern-U4-7424' into dev-v7
2015-12-15 12:14:07 +01:00
Sebastiaan Janssen
0629b49112
Merge branch 'U4-7424' of https://github.com/engern/Umbraco-CMS into engern-U4-7424
2015-12-15 12:13:35 +01:00
Sebastiaan Janssen
4958c5a59a
Merge branch 'jamescoxhead-U4-7503-Disable-X-AspNetMvc-Version-Header' into dev-v7
2015-12-15 11:21:23 +01:00
Sebastiaan Janssen
523501db8c
Merge branch 'U4-7503-Disable-X-AspNetMvc-Version-Header' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-7503-Disable-X-AspNetMvc-Version-Header
2015-12-15 11:21:11 +01:00
Sebastiaan Janssen
23cd2b09ca
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2015-12-15 11:13:22 +01:00
Sebastiaan Janssen
a1ff1d4543
Merge branch 'TimoPerplex-dev-v7' into dev-v7
2015-12-15 11:12:57 +01:00
Sebastiaan Janssen
1bf2a3b1bf
Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7
...
Conflicts:
src/Umbraco.Web/Editors/ImagesController.cs
2015-12-15 11:12:13 +01:00
Shannon
8598ab565c
Fixes: U4-7536 Sign-out in back office will call all ASP.Net identity middleware sign out methods
...
publicises a few things too.
2015-12-15 10:34:11 +01:00
Rasmus John Pedersen
a56936b6f9
Fixes bug with macro multiline parameters
2015-12-14 13:44:57 +01:00
