Skip to content

Commit

Permalink
Merge pull request #685 from os-autoinst/rework_needle_editor
Browse files Browse the repository at this point in the history
Rework the needle editor
  • Loading branch information
coolo committed Jun 6, 2016
2 parents e23e6f8 + 810dd1d commit d758ad0
Show file tree
Hide file tree
Showing 57 changed files with 752 additions and 39,157 deletions.
33 changes: 14 additions & 19 deletions assets/assetpack.def
Expand Up @@ -4,35 +4,33 @@
# download the fonts (plus some css we dont need)
<< https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css
< sass/bentostrap.scss
< stylesheets/dataTables.bootstrap.css
< https://cdn.datatables.net/1.10.12/css/dataTables.bootstrap.css
< http://fontawesome.io/assets/font-awesome/css/font-awesome.css
< stylesheets/chosen.css
< stylesheets/overview.scss
< stylesheets/comments.css
< stylesheets/openqa.css
< http://harvesthq.github.io/chosen/chosen.css

# old bento 'default' layout
! app.css
< stylesheets/jquery.dataTables.css
< stylesheets/tables.css
< http://fontawesome.io/assets/font-awesome/css/font-awesome.css
< stylesheets/chosen.css
< stylesheets/overview.scss
< stylesheets/comments.css
< stylesheets/openqa.css

! codemirror.css
< stylesheets/codemirror.css
< https://raw.githubusercontent.com/codemirror/CodeMirror/8097c7e75ce7ef0512debe9967d7568626106e53/lib/codemirror.css
< stylesheets/codemirror_customization.css

! codemirror.js
< javascripts/lib/codemirror.js
< javascripts/mode/perl/perl.js
< https://raw.githubusercontent.com/codemirror/CodeMirror/8097c7e75ce7ef0512debe9967d7568626106e53/lib/codemirror.js
< https://raw.githubusercontent.com/codemirror/CodeMirror/8097c7e75ce7ef0512debe9967d7568626106e53/mode/perl/perl.js

! needlediff.js
< javascripts/needlediff.js

! step_edit.js
< javascripts/needleedit.js
< javascripts/needleeditor.js
< javascripts/shapes.js
< javascripts/keyevent.js
Expand All @@ -41,33 +39,30 @@
< javascripts/running.js

! app.js
< http://code.jquery.com/jquery-1.11.2.js
< javascripts/jquery_ujs.js
< javascripts/chosen.jquery.js
< http://code.jquery.com/jquery-1.12.4.js
< javascripts/openqa.js
< javascripts/jquery.dataTables.js
< https://cdn.datatables.net/1.10.12/js/jquery.dataTables.js
< http://timeago.yarp.com/jquery.timeago.js
< javascripts/admintable.js
< javascripts/admin_user.js
< javascripts/admin_needle.js
< javascripts/audit_log.js
< javascripts/jquery.timeago.js
< javascripts/tests.js
< javascripts/assets.js
< javascripts/job_templates.js
< javascripts/overview.js
< javascripts/comments.js

! bootstrap.js
< http://code.jquery.com/jquery-1.11.2.js
< javascripts/jquery_ujs.js
< javascripts/chosen.jquery.js
< http://code.jquery.com/jquery-1.12.4.js
< javascripts/openqa.js
< javascripts/jquery.dataTables.js
< https://cdn.datatables.net/1.10.12/js/jquery.dataTables.js
< https://cdn.datatables.net/1.10.12/js/dataTables.bootstrap.js
< http://timeago.yarp.com/jquery.timeago.js
< javascripts/admintable.js
< javascripts/admin_user.js
< javascripts/admin_needle.js
< javascripts/audit_log.js
< javascripts/jquery.timeago.js
< javascripts/tests.js
< javascripts/assets.js
< javascripts/job_templates.js
Expand All @@ -78,5 +73,5 @@
< https://raw.githubusercontent.com/twbs/bootstrap-sass/a73cc0f0e5c794206e9a70bc0b67e67cf37c1bca/assets/javascripts/bootstrap/tab.js
< https://raw.githubusercontent.com/twbs/bootstrap-sass/a73cc0f0e5c794206e9a70bc0b67e67cf37c1bca/assets/javascripts/bootstrap.js
< https://raw.githubusercontent.com/twbs/bootstrap-sass/a73cc0f0e5c794206e9a70bc0b67e67cf37c1bca/assets/javascripts/bootstrap/transition.js
< javascripts/dataTables.bootstrap.js
< http://harvesthq.github.io/chosen/chosen.jquery.js

0 comments on commit d758ad0

Please sign in to comment.