Claus
|
55752abdcf
|
fixing InsertMacroSplitButton typo in jquery selector causing javascript errors.
fixing modal $.browser checks to not cause console errors due to deprecated browser object in jquery 1.9+.
|
2016-08-08 13:23:46 +02:00 |
|
Shannon Deminick
|
1b9a3e8ebc
|
Merge pull request #1423 from abryukhov/patch-3
Update UI language ru.xml * dev-v7-U4-8597 - Social login form key added
|
2016-08-08 12:22:11 +02:00 |
|
Alexander Bryukhov
|
f316393955
|
Update UI language ru.xml
|
2016-08-08 16:41:19 +07:00 |
|
Claus
|
bfc2e6f666
|
Merge branch 'bjarnef-dev-v7-U4-8597' into dev-v7
|
2016-08-08 11:32:02 +02:00 |
|
Claus
|
c3035f26a7
|
Merge branch 'dev-v7-U4-8597' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-8597
Conflicts:
src/Umbraco.Web.UI/umbraco/config/lang/da.xml
|
2016-08-08 11:31:29 +02:00 |
|
Mads Rasmussen
|
97a765d6af
|
Merge branch 'bjarnef-dev-v7-U4-8580' into dev-v7
|
2016-08-08 11:28:07 +02:00 |
|
Mads Rasmussen
|
67430392e3
|
Change object to img to make it render in Edge
|
2016-08-08 11:22:16 +02:00 |
|
Claus
|
e02575830f
|
Merge pull request #1420 from umbraco/temp-U4-8816
U4-8816 Update to jQuery 2.2.4
|
2016-08-08 11:00:47 +02:00 |
|
Shannon Deminick
|
a838d20c3e
|
Merge pull request #1422 from abryukhov/patch-9
Update UI language ru.xml
|
2016-08-08 10:57:22 +02:00 |
|
Alexander Bryukhov
|
081284bc62
|
Update UI language ru.xml
1. Duplicated 'prompt' area removed
2. Several typos corrected
|
2016-08-08 15:48:14 +07:00 |
|
Claus
|
9e9c1ad030
|
Merge pull request #1418 from drpeck/dev-v7
U4-8814 - HTml.Wrap adds children twice
|
2016-08-08 10:45:35 +02:00 |
|
Claus
|
b4b91f0fef
|
Merge branch 'pynej-sql-repalce' into dev-v7
|
2016-08-08 10:19:35 +02:00 |
|
Claus
|
cbf67a4399
|
changing to Debug.Print.
|
2016-08-08 10:18:44 +02:00 |
|
Claus
|
f58e0dc08e
|
Merge branch 'sql-repalce' of git://github.com/pynej/Umbraco-CMS into pynej-sql-repalce
|
2016-08-08 09:58:39 +02:00 |
|
Shannon Deminick
|
e449c237be
|
Merge pull request #1421 from abryukhov/patch-8
Update UI language ru-RU.xml
|
2016-08-08 09:40:51 +02:00 |
|
Shannon Deminick
|
1dae6724cc
|
Merge pull request #1227 from abryukhov/patch-6
Update UI language ru.xml
|
2016-08-08 09:40:20 +02:00 |
|
Mads Rasmussen
|
26708ae82b
|
Merge branch 'dev-v7-U4-8580' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-8580
|
2016-08-08 09:20:32 +02:00 |
|
Alexander Bryukhov
|
809970bc2e
|
Update UI language ru-RU.xml
New 'bulk' area and few more corrections
|
2016-08-07 14:06:16 +07:00 |
|
Mads Rasmussen
|
27d041c055
|
Merge pull request #1416 from bjarnef/dev-v7-U4-8765-fix
Open documentation link in new browser window/tab
|
2016-08-05 21:36:27 +02:00 |
|
Shannon
|
7bf3d04a25
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2016-08-05 19:29:10 +02:00 |
|
Shannon
|
87934e52dc
|
obsoletes strange IsGuid and changes logic to use what .Net does instead of regex in case others are using this.
|
2016-08-05 19:28:46 +02:00 |
|
Shannon
|
4022c3cec9
|
U4-8816 Update to jQuery 2.2.4
|
2016-08-05 19:15:11 +02:00 |
|
Sebastiaan Janssen
|
aedba40b54
|
Updates language file to specify which integrity check we're looking at. Quotes all table names correctly. Updates description for the check.
|
2016-08-05 18:03:05 +02:00 |
|
Shannon
|
31b17e3048
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2016-08-05 17:41:13 +02:00 |
|
Shannon
|
42666403a6
|
Fixes regression issue with building the xml cache file, moves the logic to query and build the xml document for the cache to the repository level.
|
2016-08-05 17:41:00 +02:00 |
|
Claus
|
69b6044bc6
|
fixing null check on UmbracoContext.Current in RedirectTrackingEventHandler's PageCacheRefresher_CacheUpdated.
|
2016-08-05 14:01:25 +02:00 |
|
Sebastiaan Janssen
|
18a1aa2f6f
|
Merge pull request #1413 from umbraco/temp-U4-8530
U4-8530 Make it possbile to hide preview button by DocumentType or ContentItem
|
2016-08-05 13:18:29 +02:00 |
|
Shannon
|
92f7782ab9
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2016-08-05 13:06:49 +02:00 |
|
Shannon
|
3e932ecf3f
|
fixes icon and author urls for local package install
|
2016-08-05 13:06:35 +02:00 |
|
Sebastiaan Janssen
|
dd62a917fd
|
Merge pull request #1411 from umbraco/temp-U4-8808
U4-8808 Fixing up 301 redirects
|
2016-08-05 13:06:18 +02:00 |
|
Sebastiaan Janssen
|
958e20356c
|
Merge pull request #1412 from umbraco/temp-U4-8786
U4-8786 Member search in listview returns error (7.5-beta2)
|
2016-08-05 13:04:42 +02:00 |
|
Shannon
|
539637720f
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2016-08-05 12:31:00 +02:00 |
|
Shannon
|
6a3f146da1
|
Fixes health check index & throbber while fixing, fixes xml data integrity check to check for invalid XML that doesn't contain a GUID
|
2016-08-05 12:29:05 +02:00 |
|
David Peck
|
7fe7f88c98
|
Merge pull request #1 from drpeck/U4-8814
Children added to HtmlTagWrapper twice
|
2016-08-05 11:14:53 +01:00 |
|
David Peck
|
774f00d4f5
|
Children added to HtmlTagWrapper twice
By calling the overload on line 884 the children are added. To do it again results in the children being added twice.
|
2016-08-05 11:14:01 +01:00 |
|
Sebastiaan Janssen
|
aab2c65aaa
|
Merge pull request #1417 from umbraco/temp-U4-8156
U4-8156 Support minimum versions for Umbraco packages
|
2016-08-05 11:58:38 +02:00 |
|
Sebastiaan Janssen
|
3dcba7a6b0
|
urlHash column has to be 20 chars because SHA1 uses more bytes than MD5
|
2016-08-05 11:51:08 +02:00 |
|
Sebastiaan Janssen
|
3ece30bd8b
|
Don't let the event handlers kick in if Redirect Tracking is turned off in the config
|
2016-08-05 11:41:08 +02:00 |
|
Shannon
|
36a191464d
|
ensures table name is quoted properly
|
2016-08-05 11:26:20 +02:00 |
|
Simon Busborg
|
9131b73cbb
|
Merge pull request #1415 from bjarnef/dev-v7-U4-8809
Show only empty recycle bin text, when filter doesn't has a value
|
2016-08-05 11:14:44 +02:00 |
|
Simon Busborg
|
68b3ea349e
|
Merge pull request #1414 from bjarnef/dev-v7-U4-8805
Ensure editing area use full height when it only has a little...
|
2016-08-05 10:53:13 +02:00 |
|
Claus
|
6c271d92f9
|
migration should only delete table if it is using a integer id, otherwise leave it alone.
|
2016-08-05 08:25:58 +02:00 |
|
bjarnef
|
e1daa79bab
|
Open documentation link in new browser window/tab
|
2016-08-04 22:35:55 +02:00 |
|
bjarnef
|
a136235c72
|
Show only empty recycle bin text, when filter doesn't has a value
|
2016-08-04 21:10:31 +02:00 |
|
bjarnef
|
e8e440516f
|
Ensure editing area use full height when it only has a little or no content
|
2016-08-04 20:30:54 +02:00 |
|
Sebastiaan Janssen
|
b2e7c7a8d4
|
More specific exception when a conversion fails
|
2016-08-04 19:18:52 +02:00 |
|
Shannon
|
2c15db5950
|
U4-8530 Make it possbile to hide preview button by DocumentType or ContentItem
|
2016-08-04 18:34:20 +02:00 |
|
Shannon
|
7ed240d510
|
Merge branch 'Phosworks-U4-8530' into temp-U4-8530
|
2016-08-04 18:09:00 +02:00 |
|
Shannon
|
a91b8e0acf
|
Merge branch 'U4-8530' of https://github.com/Phosworks/Umbraco-CMS into Phosworks-U4-8530
|
2016-08-04 18:08:27 +02:00 |
|
Shannon
|
0be81aa4e5
|
U4-8786 Member search in listview returns error (7.5-beta2)
|
2016-08-04 18:01:57 +02:00 |
|