Shannon
|
773ef1d168
|
Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
|
2018-01-02 15:28:30 +11:00 |
|
Mads Rasmussen
|
f56bd731b7
|
Merge pull request #2227 from abryukhov/U4-10481
U4-10481 - v7.7.x - RU localization of the last added keys
|
2017-12-27 13:24:42 +01:00 |
|
Mads Rasmussen
|
bee0642417
|
Merge pull request #2263 from krighi/U4-10323
U4-10323 - FIX - Grid stuck at 12 columns (percentage calculation incorrect)
|
2017-12-27 13:04:31 +01:00 |
|
Mads Rasmussen
|
43abb08e59
|
Merge pull request #2305 from marcemarc/temp-u4-10637
Fixes U4-10637 - textarea Macro Parameters hidden in niche circumstances
|
2017-12-27 11:05:12 +01:00 |
|
Mads Rasmussen
|
17db5709f1
|
Merge pull request #2339 from bjarnef/dev-v7-U4-10720
U4-10720 - Add documentation to umb-table component
|
2017-12-27 10:38:43 +01:00 |
|
Mads Rasmussen
|
2fc6d9b7df
|
Merge pull request #2327 from bjarnef/dev-v7-U4-10703
Wrap text in umb-node-preview component
|
2017-12-27 10:19:23 +01:00 |
|
Shannon
|
e4561851a4
|
modifies some code changes to null check and not to use extension methods that require singleton access.
|
2017-12-21 17:30:37 +11:00 |
|
Shannon Deminick
|
c6daf2e111
|
Merge pull request #2353 from mitutee/temp-U4-10770
U4-10770
|
2017-12-21 17:20:19 +11:00 |
|
Sebastiaan Janssen
|
883366f741
|
Merge pull request #2295 from JacekJMMJ/temp-u4-10626
Temp u4 10626
|
2017-12-20 16:07:14 +01:00 |
|
Claus
|
cac331adbc
|
U4-10640 Multiple Media Picker duplicate image Angular issue in Umbraco 7.7.4
|
2017-12-20 13:38:07 +01:00 |
|
Shannon Deminick
|
18318ecabf
|
Merge pull request #2354 from umbraco/temp-u4-10764
U4-10764 - workaround broken events
|
2017-12-20 17:27:42 +11:00 |
|
Shannon
|
6b9ef6df7a
|
fix tests
|
2017-12-20 17:02:52 +11:00 |
|
Shannon Deminick
|
fcaf78ef29
|
Merge pull request #2355 from umbraco/temp-u4-10774
U4-10774 - leak in CacheRefresherEventHandler
|
2017-12-20 16:06:41 +11:00 |
|
Sebastiaan Janssen
|
833b4c552c
|
Merge pull request #2350 from umbraco/temp-U4-10686
U4-10686 TypedMediaAtRoot().Descendants() calls SQL
|
2017-12-19 18:25:23 +01:00 |
|
Mads Rasmussen
|
c678b7f6d9
|
Merge branch 'bjarnef-dev-v7-U4-10639' into dev-v7
|
2017-12-19 10:40:59 +01:00 |
|
Mads Rasmussen
|
e320840a29
|
fix position of add button in media picker
|
2017-12-19 10:39:52 +01:00 |
|
Stephan
|
b664fc5e94
|
U4-10774 - leak in CacheRefresherEventHandler
|
2017-12-19 10:04:33 +01:00 |
|
Stephan
|
b87346bee5
|
U4-10764 - minor fix
|
2017-12-19 10:01:51 +01:00 |
|
Mads Rasmussen
|
6029306fe9
|
Merge branch 'dev-v7-U4-10639' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-10639
|
2017-12-19 09:53:52 +01:00 |
|
Stephan
|
f979792290
|
U4-10764 - workaround broken events
|
2017-12-18 16:53:58 +01:00 |
|
m.kilianovskyi
|
5f82fc6e20
|
Merge branch 'dev-v7' into HEAD
|
2017-12-18 17:51:27 +02:00 |
|
m.kilianovskyi
|
b1a0ca98ea
|
U4-10770 Get all permissions for entity instead of explicit only
|
2017-12-18 17:50:53 +02:00 |
|
Ilham Boulghallat
|
f4f99c2922
|
Merge pull request #2336 from MrCosmo/temp-U4-10722
U4-10722 fix in Dutch localization
|
2017-12-18 10:32:33 +00:00 |
|
Shannon
|
6f55b84c65
|
removes this. convention
|
2017-12-18 15:34:15 +11:00 |
|
Shannon Deminick
|
43f369f96f
|
Merge pull request #2306 from Sam7/dev-v7
U4-10453 - Ability to Sync after each external login (using OWIN)
|
2017-12-18 14:42:25 +11:00 |
|
Shannon
|
c1b3da869d
|
U4-10686 TypedMediaAtRoot().Descendants() calls SQL
|
2017-12-15 16:01:20 +11:00 |
|
Shannon
|
aed476de0a
|
Merge branch 'dev-v7' into dev-v7.8
|
2017-12-14 19:26:45 +11:00 |
|
Shannon
|
ddd9c8ef7d
|
Do a lock check on the index on startup and unlock it if it is, this is a safety check since we are now using the simplefs dir
|
2017-12-14 19:25:01 +11:00 |
|
Shannon
|
9e2c7d16a6
|
Merge branch 'dev-v7' into dev-v7.8
|
2017-12-14 18:35:34 +11:00 |
|
Shannon
|
44db4e7a48
|
updates nuspec and references to use latest Examine
|
2017-12-14 18:34:48 +11:00 |
|
Shannon
|
89347b359b
|
fixes merge issues with DocumentBlueprint naming
|
2017-12-14 16:51:13 +11:00 |
|
Shannon
|
8053cea92d
|
Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/UdiEntityType.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/umbraco.cms/umbraco.cms.csproj
|
2017-12-14 16:24:25 +11:00 |
|
Shannon
|
f44b158c15
|
When we disable examine indexing on startup with MainDom, also suspend all indexing
|
2017-12-14 16:19:54 +11:00 |
|
Robert
|
1ff66d0c3a
|
Merge pull request #2345 from umbraco/temp-U4-10735
U4-10735 Examine update to better manage appdomain shutdowns
|
2017-12-13 10:52:56 +01:00 |
|
Claus
|
ae07f34215
|
seems this was missing from the merge commit?
|
2017-12-13 09:53:38 +01:00 |
|
Robert
|
aba2c2a79e
|
Merge pull request #2346 from umbraco/temp-U4-10738
U4-10738 Deleting a media type folder causes an exception
|
2017-12-12 16:02:21 +01:00 |
|
Robert
|
9f62dfc087
|
Merge pull request #2348 from umbraco/temp-U4-10588
U4-10588 Indexed member data is missing fields
|
2017-12-12 13:40:48 +01:00 |
|
Shannon Deminick
|
a21912dc41
|
Merge pull request #2337 from skttl/U4-10549-rte-memory-usage
Fix for U4-10549 RTE memory usage
|
2017-12-12 11:53:42 +01:00 |
|
Robert
|
733b4a770f
|
Merge pull request #2347 from umbraco/temp-U4-10587
U4-10587 Email field in InternalMemberIndex seems to be attempted to …
|
2017-12-12 11:29:10 +01:00 |
|
Shannon
|
2e097b7e46
|
U4-10588 Indexed member data is missing fields
|
2017-12-12 11:25:53 +01:00 |
|
Shannon
|
e1b6997ef7
|
U4-10587 Email field in InternalMemberIndex seems to be attempted to being added to the index twice
|
2017-12-11 15:50:27 +01:00 |
|
Sebastiaan Jansssen
|
b6b7b9f433
|
Bump version to 7.7.7
|
2017-12-11 13:57:31 +01:00 |
|
Shannon
|
8181f88cb0
|
Do not keep looking up data to index if the app is shutting down
|
2017-12-08 09:09:14 +01:00 |
|
Claus
|
3a4865ef7d
|
U4-10738 Deleting a media type folder causes an exception
|
2017-12-07 13:45:49 +01:00 |
|
Shannon
|
37f6dbfa6b
|
more logging
|
2017-12-06 15:46:35 +01:00 |
|
Shannon
|
131fea3ba4
|
updates some proj refs
|
2017-12-06 15:38:00 +01:00 |
|
Shannon
|
b0661218a0
|
U4-10735 Examine update to better manage appdomain shutdowns
|
2017-12-06 15:21:38 +01:00 |
|
Claus
|
91e658c41c
|
U4-10610 Cannot restore content templates
|
2017-12-05 10:37:23 +01:00 |
|
Claus
|
0ce7efc978
|
U4-10610 Cannot restore content templates
|
2017-12-05 10:19:12 +01:00 |
|
Bjarne Fyrstenborg
|
3b8a2d7d65
|
Add basic documentation to umbPasswordToggle
|
2017-11-30 23:48:41 +01:00 |
|