Commit Graph

26668 Commits

Author SHA1 Message Date
Dave Woestenborghs
d7af9d9fca #3417 added method to macro resource to create a macro 2019-01-04 17:36:42 +01:00
Dave Woestenborghs
03ce922124 #3417 register new api url in server variables 2019-01-04 17:10:53 +01:00
Dave Woestenborghs
c61b5f947d #3417 renamed server variable 2019-01-04 13:49:03 +01:00
Dave Woestenborghs
e1906113b9 #3417 added macro api controller and create method 2019-01-04 12:31:58 +01:00
Dave Woestenborghs
bb6848dd03 #3417 renamed existing macrocontroller to macro rendering controller 2019-01-04 11:44:23 +01:00
Dave Woestenborghs
8304ada528 #3417 added create view 2019-01-04 11:39:33 +01:00
Dave Woestenborghs
d50061b4af Merge branch 'temp8' into temp-3417 2019-01-04 10:50:56 +01:00
Claus
f69cb89e30 Merge pull request #3810 from kjac/v8-fix-replace-snippet-jquery-dependencies
V8: Replace jquery dependencies for partial snippets
2019-01-03 13:44:57 +01:00
Sebastiaan Janssen
aceb5c7971 Merge branch 'dev-v7' into temp8
# Conflicts:
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Web.UI.Client/src/less/helveticons.less
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/content/move.html
#	src/Umbraco.Web.UI.Client/src/views/media/move.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
2019-01-03 10:32:34 +01:00
Kenn Jacobsen
4b60d8bca6 Fix the content template selector in the content tree 2019-01-03 07:57:23 +00:00
Kenn Jacobsen
525b229b42 Fix content creation from list views 2019-01-03 07:56:17 +00:00
Kenn Jacobsen
2dfbb1d555 Don't attempt to apply a filter if none is submitted 2019-01-03 07:53:20 +00:00
Stephan
17d818b604 Make Current.Container public for Deploy, wont last 2019-01-02 15:29:22 +01:00
Stephan
ebf15b9052 Fix CacheRefresher and DistributedCache 2019-01-02 15:24:33 +01:00
Claus
5b7a205835 Merge branch 'kjac-v8-feature-angular-public-access' into temp8 2019-01-02 13:42:36 +01:00
Claus
fb9d5a3c5d Merge branch 'v8-feature-angular-public-access' of https://github.com/kjac/Umbraco-CMS into kjac-v8-feature-angular-public-access 2019-01-02 11:58:24 +01:00
Aaron Powell
0e56f2035d Using npx for running gulp (#3938) 2018-12-31 14:10:31 +00:00
Kenn Jacobsen
0150b97278 Show password change validation errors at the correct fields (#3918)
* Show password change validation errors at the correct password fields + remove the redundant "Could not reset password, errors: " message text

* Explicitly find the user instead of mapping it.
2018-12-31 14:02:59 +00:00
Kenn Jacobsen
af2f531d31 Add missing localization of dialogs (#3844) 2018-12-31 13:37:58 +00:00
Kenn Jacobsen
884eaf50c3 Fix the flickering name when moving/copying mediatypes 2018-12-31 13:37:24 +00:00
Kenn Jacobsen
d054771fc6 Fix the flickering name when moving/copying doctypes 2018-12-31 13:36:25 +00:00
Sebastiaan Janssen
5e680e80e6 Deletes commented out code 2018-12-31 12:49:54 +00:00
Dave Woestenborghs
ee8b4c5884 #3916 fix multiple enumerations of ienumerable...so usernames and avatars are displayed correctly 2018-12-31 12:49:54 +00:00
Dave Woestenborghs
0ce54847b0 #3916 mapping to a IEnumerable resulted in all items in the result list being the same. Now map items indiviually. Could be caused by this : https://stackoverflow.com/questions/17268362/automapper-for-a-list-scenario-only-seems-to-repeat-mapping-the-first-object-in 2018-12-31 12:49:54 +00:00
Callum Whyte
b852c78861 Fixing spelling mistakes in helveticons CSS class names
The icon picker uses these class names as labels, kept the old class names for backwards compatibility
2018-12-31 12:47:04 +00:00
Kenn Jacobsen
cace1af958 Fix the flickering name when moving datatypes 2018-12-31 12:45:37 +00:00
Anders Bjerner
91616a527d Should be "Add group" to keep the casing consistent 2018-12-31 12:44:25 +00:00
Kenn Jacobsen
debbf87a04 Support image crop data set when overwriting files using the API 2018-12-31 12:43:06 +00:00
Brian Juul Andersen
b2a1b11a5b Fixed minor grammatical error 2018-12-29 20:20:02 +00:00
Stephan
8d9bf91512 Merge branch 'temp8-migrations' into temp8 2018-12-28 21:33:00 +01:00
Brian Juul Andersen
51c9912828 Update CONTRIBUTION_GUIDELINES.md
Fixed minor grammatical error.
2018-12-28 11:43:20 +01:00
Stephan
29540b1835 TypeLoader TLC, better perfs and logging 2018-12-21 15:11:23 +01:00
Stephan
a571af8be2 Make more types IDiscoverable 2018-12-21 13:42:24 +01:00
Stephan
90ab90d6b9 Fix ExamineComponent crashing on shutdown 2018-12-21 13:42:04 +01:00
Stephan
798eb1099a Merge branch 'temp8' into temp8-migrations 2018-12-21 10:46:37 +01:00
Stephan
f807d40b95 Merge branch 'temp8-contentquery-search-culture-3828' into temp8 2018-12-21 09:00:13 +01:00
Stephan
7f6994514f Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-21 09:00:03 +01:00
Stephan
9db0f540d0 Fix failing tests 2018-12-21 08:58:20 +01:00
Shannon
698b83c455 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-12-21 14:17:36 +11:00
Shannon
d1befc876f manual merges 2018-12-21 13:48:59 +11:00
Shannon
711304dffe manual merges 2018-12-21 13:44:18 +11:00
Shannon
7e20e81cc8 Fixes EntityRepository and EntityService to perform order by operations correctly 2018-12-21 13:15:46 +11:00
Stephan
4a71d14097 Simplify migrations 2018-12-20 18:38:55 +01:00
Stephan
b0eb0d1205 Fix tests 2018-12-20 15:36:12 +01:00
Stephan
4e91a5bb3e Merge branch 'temp8-3658-contextual-info-app' into temp8 2018-12-20 14:32:03 +01:00
Stephan
e959605b39 Cleanup and deal with FIXMEs 2018-12-20 14:31:46 +01:00
Stephan
1ffd457985 Merge branch 'temp8' into temp8-3658-contextual-info-app 2018-12-20 13:42:19 +01:00
Stephan
4039127c3d Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-20 13:31:38 +01:00
Stephan
23eabee1a2 Misc fixes 2018-12-20 13:31:34 +01:00
Stephan
56c82d120b Bugfix keepalive route issue 2018-12-20 13:30:19 +01:00