yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,195 Commits 4 Branches 7 Tags
57fa452c49ac98be6e89c935b3d596cddfb82e5b
Commit Graph

81 Commits

Author SHA1 Message Date
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00:00
Warren Buckley
43d4447498 Something went wrong with a merge temp8 into this after the removal of bower 2018-10-12 08:19:38 +01:00
Shannon
f816f19d60 Fixes some issues for rte 2018-10-11 14:25:33 +02:00
Shannon
926fef43d0 Fixes merge issues 2018-10-11 14:07:04 +02:00
Shannon
f6c99f2bbc Merge remote-tracking branch 'origin/temp8' into temp-tinymce 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
 2018-10-11 13:33:18 +02:00
Warren Buckley
b2ec2ac592 Update bower to angular 1.7.4 2018-10-03 14:51:04 +01:00
Mads Rasmussen
a47ae2e5c3 add diff library + generate diff 2018-09-24 20:10:05 +02:00
Shannon
b1ba25debe Fixes contentpicker to update model.value correctly and sync it's renderModel and deal with the quirks of the ui-sortable stuff 2018-08-23 15:31:59 +10:00
Robert
c2433a336c Merge branch 'temp8' into temp-editing-all-variants 2018-08-08 13:46:19 +02:00
Warren
eb220b6db0 Add in jQuery VUpalidate & Unobtrusive into bower 
Update ref's to new path
 2018-08-01 22:35:03 +01:00
Shannon
223d5795c3 wip - newer tinymce, with the inlite/inline theme, updated config file, plenty of fixes, now need more fixes 2018-07-20 00:55:28 +10:00
Shannon
7cc300f59c Gets all of the content for both variant and invariant content loading in the editor and for split views too 2018-07-16 18:40:47 +10:00
Shannon
359b1ac774 Adds ngMessages and updates the change password directive to use ng-messages for the validation message toggling, this requires a small custom new directive, now i can go replace all instances of val-toggle-msg and remove it. 2018-06-15 16:44:37 +10:00
Shannon
feb16f901f Updates some JS dependencies, moves more dependencies to bower instead of having them committed, ensures angular locales are workgin with 1.7, upgrades to angular 1.7.2 2018-06-15 11:42:43 +10:00
Mads Rasmussen
6de4d85783 upgrade ng-file-upload 2018-05-30 11:41:20 +02:00
Mads Rasmussen
3d5d2648ff upgrade angular-local-storage 2018-05-29 14:39:17 +02:00
Mads Rasmussen
1cd231fdb9 upgrade angular version + load new dependencies 2018-05-28 20:47:54 +02:00
Mads Rasmussen
79f303ddcf wip animation experiments 2018-04-25 10:29:18 +02:00
Shannon
881fbb7f76 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
# Conflicts:
#	build/Modules/Umbraco.Build/Umbraco.Build.psm1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Core/IO/FileSystemProviderManager.cs
#	src/Umbraco.Core/ObjectExtensions.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
#	src/Umbraco.Core/Services/IdkMap.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Tests.Benchmarks/app.config
#	src/Umbraco.Tests/UI/LegacyDialogTests.cs
#	src/Umbraco.Web/Cache/MediaCacheRefresher.cs
#	src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
#	src/Umbraco.Web/PublishedContentQuery.cs
#	src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
 2018-03-29 20:01:14 +11:00
Stephan
0cbfebe21c Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:08 +01:00
Sebastiaan Janssen
eac9785c45 Apply PR #2507 2018-03-15 10:02:20 +01:00
Mads Rasmussen
c3116d5df7 remove moment resolution for bower.json 2018-01-12 08:52:13 +01:00
Shannon
19086ab3a1 Merge remote-tracking branch 'origin/dev-v7.8' into temp-U4-10803 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
 2018-01-12 14:32:54 +11:00
Mads Rasmussen
0876004d9a U4-10803: remove dependency on angular-moment 2018-01-10 16:00:32 +01:00
Shannon
b32e7d4ccc running the build changed the bower.json file, i wonder if this will 'fix' vsts? 2018-01-05 10:45:06 +11:00
Claus
49c316e13d Merge pull request #2066 from arknu/U4-10191-tinymce46 
U4-10191: Update to TinyMCE 4.6.x
 2017-11-01 09:42:33 +01:00
Claus
5235053523 updating to latest tinymce 2017-11-01 09:27:04 +01:00
Mads Rasmussen
2708f11fcd fix path to angular moment 2017-10-16 12:01:19 +02:00
Stephan
9a28250a8d Port 7.7 - WIP 2017-09-15 18:22:19 +02:00
Mads Rasmussen
5330830362 Merge branch 'dev-v7.7' into temp-U4-10309 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
 2017-09-14 15:28:21 +02:00
Mads Rasmussen
a5c78f6325 fix bower.json after merge - copy correct clipboard.js file 2017-09-07 20:27:52 +02:00
Shannon
65ece33ca9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
#	src/Umbraco.Web.UI.Client/src/installer/_module.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2017-09-07 22:43:03 +10:00
Mads Rasmussen
1a444fd703 add date pickers 2017-09-04 12:58:04 +02:00
Mads Rasmussen
70231fcee2 fix codemirror folder structure 2017-08-29 10:26:11 +02:00
Mads Rasmussen
c468e4736e bower name should be lowercase 2017-08-25 14:19:25 +02:00
Stephan
ab8fc33691 Port 7.7 - WIP 2017-08-14 18:21:48 +02:00
Shannon
b8e2e49a44 Updates to latest Katana libs 2017-07-26 17:50:58 +10:00
Asbjørn Riis-Knudsen
841074fc27 U4-10191: Update to TinyMCE 4.6.x 2017-07-24 09:31:47 +02:00
Mads Rasmussen
de00b2ef00 fixes: U4-10061 Add functionality for show/hide/copy password when creating new user 2017-06-28 10:29:16 +02:00
Stephan
8561d85f7a porting 7.6-rc1 into 8 2017-05-24 12:25:39 +02:00
Mads Rasmussen
631a9f92ea fix merge bug + add ignore list 2017-05-05 14:19:37 +02:00
Mads Rasmussen
28d7a4a6dc Merge branch 'dev-v7.6' into temp-gulp-spike 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
 2017-05-05 13:01:24 +02:00
Mads Rasmussen
21f003e705 clean up ace builds 2017-05-05 12:26:04 +02:00
Claus
bbd9e4f0fd updating tinymce to 4.5.3. 2017-02-16 12:16:11 +01:00
Claus
bf9a408c50 U4-9145 Updating TinyMCE to latest (4.4.3) 2017-02-16 12:13:48 +01:00
Per Ploug
4a191f0711 Rebuild bower.json to support bower-installer 
removes most of the custom bower lib installing we had in gruntfile
 2017-01-07 01:25:43 +01:00
Mads Rasmussen
f6d8a980a6 Merge branch 'dev-v7' into temp-template-editor 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-11-14 11:04:15 +01:00
Stephan
b26b415096 Merge origin/dev-v7-deploy into dev-v8-zbwip (builds) 2016-11-03 10:31:44 +01:00
Stephan
b7ef002da5 Cleanup SignalR 2016-10-19 15:35:25 +02:00
Sebastiaan Janssen
172895f17f U4-8884 Users editor doesn't work any more in 7.5.0 
#U4-8884 Fixed
 2016-08-22 15:18:04 +02:00