Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xwiki-platform
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
XWiki
xwiki-platform
Commits
1167d910
Commit
1167d910
authored
8 years ago
by
Caleb James DeLisle
Browse files
Options
Downloads
Patches
Plain Diff
CKEDITOR-105: change hardcoded 1.9-SNAPSHOT to 1.8.5 in order to release
parent
b212d349
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ui/src/main/resources/CKEditor/EditSheet.xml
+2
-2
2 additions, 2 deletions
ui/src/main/resources/CKEditor/EditSheet.xml
ui/src/main/resources/CKEditor/VelocityMacros.xml
+1
-1
1 addition, 1 deletion
ui/src/main/resources/CKEditor/VelocityMacros.xml
with
3 additions
and
3 deletions
ui/src/main/resources/CKEditor/EditSheet.xml
+
2
−
2
View file @
1167d910
...
...
@@ -160,7 +160,7 @@
#set ($bootstrap3typeaheadPath = $services.webjars.url('org.webjars.npm:bootstrap-3-typeahead', 'bootstrap3-typeahead.min'))
#if ("$!ckeditorPath" == '')
## Before 6.3RC1
#set ($ckeditorPath = $services.webjars.url('application-ckeditor-webjar/1.
9-SNAPSHOT
/ckeditor.js'))
#set ($ckeditorPath = $services.webjars.url('application-ckeditor-webjar/1.
8.5
/ckeditor.js'))
#set ($bootstrap3typeaheadPath = $services.webjars.url('bootstrap-3-typeahead/4.0.1/bootstrap3-typeahead.min.js'))
#elseif ($ckeditorPath.indexOf('?')
>
= 0)
## Before 7.1M1 the WebJar resource path was included in the query string which means we have to specify the '.js'
...
...
@@ -680,7 +680,7 @@
#set ($ckeditorSkinPath = $services.webjars.url('org.xwiki.contrib:application-ckeditor-webjar', 'skins/moono'))
#if ("$!ckeditorSkinPath" == '')
## Before 6.3RC1
#set ($ckeditorSkinPath = $services.webjars.url('application-ckeditor-webjar/1.
9-SNAPSHOT
/skins/moono'))
#set ($ckeditorSkinPath = $services.webjars.url('application-ckeditor-webjar/1.
8.5
/skins/moono'))
#end
#if ($ckeditorSkinPath.indexOf('?')
>
= 0)
## The WebJar resource path was specified in the query string before 7.1M1 which prevented the browser from resolving
...
...
This diff is collapsed.
Click to expand it.
ui/src/main/resources/CKEditor/VelocityMacros.xml
+
1
−
1
View file @
1167d910
...
...
@@ -90,7 +90,7 @@
#end
#macro (importCKEditorCSS $path $evaluate)
#importCSS('org.xwiki.contrib' 'application-ckeditor-webjar' '1.
9-SNAPSHOT
' $path $evaluate)
#importCSS('org.xwiki.contrib' 'application-ckeditor-webjar' '1.
8.5
' $path $evaluate)
#end
#macro (importCKEditorResources)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment