Shannon
|
b361cfebb7
|
updates npm build dependencies
|
2018-03-21 13:55:01 +11:00 |
|
Shannon
|
ebea5e8170
|
fixes boolean pre-value editor Html Id
|
2018-03-21 13:53:54 +11:00 |
|
Shannon
|
995f3f38a3
|
Fixes upgrade issue with copying the preview.old directory and updates the link to the the correct public one
|
2018-03-21 12:52:17 +11:00 |
|
Shannon
|
2ad79956d9
|
Re-apply Drop Down Flexible "Merge pull request #2502 from umbraco/temp-U4-11032""
|
2018-03-21 12:37:26 +11:00 |
|
Shannon
|
96c6a17d03
|
Merge branch 'dev-v7' into dev-v7.10
|
2018-03-21 12:36:55 +11:00 |
|
Shannon
|
e2e0dd0c73
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2018-03-21 12:34:15 +11:00 |
|
Shannon
|
1a590664e7
|
Revert "Merge pull request #2502 from umbraco/temp-U4-11032"
This reverts commit 2aa0dfb2c5, reversing
changes made to 2c6e7e46c2.
|
2018-03-21 12:32:27 +11:00 |
|
Shannon Deminick
|
64fd6ee7c5
|
Merge pull request #2477 from Shazwazza/U4-10992
U4-10992 (UDUF) TourController Object reference not set to an instance of an…
|
2018-03-21 12:24:50 +11:00 |
|
Shannon Deminick
|
2ed5b6c1ee
|
Merge pull request #2436 from umbraco/temp-U4-10957_2
U4-10957 If RequiredSection is not defined in a tour - backoffice wil…
|
2018-03-21 12:24:10 +11:00 |
|
Shannon Deminick
|
41c4e024de
|
Merge pull request #2505 from umbraco/temp-u4-10756
U4-10756 - id/guid cache
|
2018-03-21 11:42:04 +11:00 |
|
Shannon
|
b46add81f0
|
Merge branch 'dev-v7.10' into temp-u4-10756
|
2018-03-21 11:39:28 +11:00 |
|
Shannon
|
ff31cd9f72
|
Changes Set to Populate, changes Fetch to Query and makes GetById public
|
2018-03-21 11:31:30 +11:00 |
|
Shannon
|
084af43dab
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10
|
2018-03-21 10:20:20 +11:00 |
|
Niels Hartvig
|
bcac02861d
|
Merge pull request #2524 from davidwandar/patch-2
Fixed typo in Readme.
|
2018-03-20 11:18:57 +01:00 |
|
Sebastiaan Janssen
|
79ecaecc9e
|
Merge pull request #2503 from umbraco/temp-U4-11070
Adds support for *not* closing an overlay on enter
|
2018-03-20 11:14:57 +01:00 |
|
Sebastiaan Janssen
|
f604117c6d
|
Merge pull request #2504 from umbraco/temp-U4-11071
U4-11071 Prevalue editor for multiple values TLC
|
2018-03-20 11:14:42 +01:00 |
|
David Wandar
|
dcf7f35078
|
Fixed typo.
Xloud -> Cloud
Xloud sounds awsome though :)
|
2018-03-20 10:00:53 +01:00 |
|
Robert
|
2aa0dfb2c5
|
Merge pull request #2502 from umbraco/temp-U4-11032
U4-11032 Consolidate the number of dropdown property editors into one
|
2018-03-19 14:37:47 +01:00 |
|
Robert
|
e4b77416a6
|
Fixed typo
|
2018-03-19 14:28:24 +01:00 |
|
Robert
|
3aed889e2a
|
Merge branch 'dev-v7' into temp-U4-11032
|
2018-03-19 14:14:51 +01:00 |
|
Robert
|
2c6e7e46c2
|
Merge pull request #2517 from dawoe/patch-1
Fixed documentation of umb-overlay directive
|
2018-03-19 08:58:23 +01:00 |
|
Mikulas Tomanka
|
0a71a09d21
|
Merge pull request #2518 from dawoe/patch-2
Remove console.log from slider property editor
|
2018-03-19 08:32:40 +01:00 |
|
Dave Woestenborghs
|
0c868fb72d
|
Remove console.log from slider property editor
removed console.log statement from slider property editor controller
|
2018-03-16 18:43:54 +01:00 |
|
Dave Woestenborghs
|
a96cbce9b1
|
Fixed documentation of umb-overlay directive
- Removed lorem ipsum text
- Fixed casing of subtitle
|
2018-03-16 18:12:46 +01:00 |
|
Sebastiaan Janssen
|
e3e425695f
|
U4-8724 tinyMceConfig.config customConfig bool not correct deserialized
|
2018-03-16 16:34:58 +01:00 |
|
Sebastiaan Janssen
|
b539c6ec27
|
Merge pull request #1445 from KevinJump/dev-v7-ConnectionStringConfigSource
U4-8890 - Honour ConfigSource when setting ConnectionString
|
2018-03-16 15:45:21 +01:00 |
|
Shannon
|
69f7623fb7
|
Doh! we had test code checked in .. oops!
|
2018-03-16 14:40:26 +11:00 |
|
Shannon
|
82820284f3
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10
# Conflicts:
# src/Umbraco.Web/Features/DisabledFeatures.cs
# src/Umbraco.Web/Features/EnabledFeatures.cs
|
2018-03-16 14:30:55 +11:00 |
|
Sebastiaan Janssen
|
5f3090c81e
|
grunt was discontinued in 7.7 and shouldn't exist here any more to avoid confusion
|
2018-03-15 10:40:40 +01:00 |
|
Sebastiaan Janssen
|
f66e239584
|
PhantomJs doesn't understand fancy ES6 notation
|
2018-03-15 10:32:25 +01:00 |
|
Sebastiaan Janssen
|
a465ed415d
|
Rename to javascriptLibraryService
|
2018-03-15 10:08:00 +01:00 |
|
Sebastiaan Janssen
|
5161fd0cef
|
Remove trailing space from filename and clean up code a little
|
2018-03-15 10:07:04 +01:00 |
|
Sebastiaan Janssen
|
eac9785c45
|
Apply PR #2507
|
2018-03-15 10:02:20 +01:00 |
|
Sebastiaan Janssen
|
054a8b48fa
|
Revert PR #2507 - needs to go in 7.10
|
2018-03-15 09:59:04 +01:00 |
|
Stephan
|
af0a03a3e0
|
U4-10756 - cleanup
|
2018-03-15 09:51:12 +01:00 |
|
Stephan
|
fb5e6c22ce
|
Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10756
|
2018-03-15 09:46:52 +01:00 |
|
Stephan
|
6bc68005f4
|
U4-10756 - id/guid cache, new version
|
2018-03-15 09:46:39 +01:00 |
|
Sebastiaan Janssen
|
dfbc3c477a
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into pr/2507
|
2018-03-15 09:38:44 +01:00 |
|
Niels Hartvig
|
57426ae895
|
Feedback from review. Makes the moment service more generic and changes promises chaining
|
2018-03-14 11:10:01 +01:00 |
|
Shannon
|
05c38db54c
|
updates naming of the extending preview property and fixes the angular rendering on ng-init
|
2018-03-14 15:24:30 +11:00 |
|
Shannon
|
00fdace570
|
fixes preview view web.config and makes sure we pass the preview model to the view
|
2018-03-14 14:38:21 +11:00 |
|
Shannon
|
4e531976e9
|
missing file
|
2018-03-14 14:24:11 +11:00 |
|
Shannon
|
0feb1b6cc0
|
fixes build since we don't have preview files
|
2018-03-14 14:02:35 +11:00 |
|
Shannon
|
830f460b7e
|
bumps version
|
2018-03-14 13:58:48 +11:00 |
|
Shannon
|
3e2fa64820
|
Changes the Preview Index.cshtml to use a real model instead of viewdata, adds the correct razor web.config for these preview views, changes the enabled feature to be able to inject a razor view instead of strings
|
2018-03-14 13:56:49 +11:00 |
|
Shannon Deminick
|
7db4f841e3
|
Merge pull request #2485 from umbraco/temp-UAASSCRUM-1405
UAASSCRUM-1405 Clean up preview for Headless
|
2018-03-14 13:39:28 +11:00 |
|
Shannon
|
509d27f93b
|
Merge branch 'dev-v7.10' into temp-UAASSCRUM-1405
# Conflicts:
# src/Umbraco.Web/Features/EnabledFeatures.cs
|
2018-03-14 13:38:25 +11:00 |
|
Shannon
|
f42b122e73
|
adding missing files
|
2018-03-14 13:35:51 +11:00 |
|
Shannon
|
b4aad19573
|
Revert "Merge pull request #2508 from umbraco/temp-U4-11076"
This reverts commit 4161d244c1, reversing
changes made to eea87e411f.
|
2018-03-14 13:23:33 +11:00 |
|
Shannon
|
1b6c070752
|
Merge remote-tracking branch 'origin/dev-v7' into temp-UAASSCRUM-1405
|
2018-03-14 12:56:07 +11:00 |
|