Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ git checkout master && git fetch git://github.com/andrewnicols/moodle.git MDL-67449-master && git merge --no-ff FETCH_HEAD
- Already on 'master'
- Your branch is up to date with 'origin/master'.
- From git://github.com/andrewnicols/moodle
- * branch MDL-67449-master -> FETCH_HEAD
- Merge made by the 'recursive' strategy.
- Gruntfile.js | 306 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
- GruntfileComponents.js | 168 ++++++++++++++++++++++++++++++++++++++++++++++++
- babel-plugin-add-module-to-define.js | 67 ++-----------------
- 3 files changed, 402 insertions(+), 139 deletions(-)
- create mode 100644 GruntfileComponents.js
- $ git grunt amd
- Running "eslint:amd" (eslint) task
- Running "babel:dist" (babel) task
- Browserslist: caniuse-lite is outdated. Please run next command `npm update`
- Done.
- $ git status
- On branch master
- Your branch is ahead of 'origin/master' by 2 commits.
- (use "git push" to publish your local commits)
- Changes not staged for commit:
- (use "git add/rm <file>..." to update what will be committed)
- (use "git restore <file>..." to discard changes in working directory)
- deleted: lib/amd/build/adapter.min.js
- deleted: lib/amd/build/adapter.min.js.map
- deleted: lib/amd/build/addblockmodal.min.js
- deleted: lib/amd/build/addblockmodal.min.js.map
- deleted: lib/amd/build/ajax.min.js
- deleted: lib/amd/build/ajax.min.js.map
- deleted: lib/amd/build/auto_rows.min.js
- deleted: lib/amd/build/auto_rows.min.js.map
- deleted: lib/amd/build/autoscroll.min.js
- deleted: lib/amd/build/autoscroll.min.js.map
- deleted: lib/amd/build/backoff_timer.min.js
- deleted: lib/amd/build/backoff_timer.min.js.map
- deleted: lib/amd/build/chart_axis.min.js
- deleted: lib/amd/build/chart_axis.min.js.map
- deleted: lib/amd/build/chart_bar.min.js
- deleted: lib/amd/build/chart_bar.min.js.map
- deleted: lib/amd/build/chart_base.min.js
- deleted: lib/amd/build/chart_base.min.js.map
- deleted: lib/amd/build/chart_builder.min.js
- deleted: lib/amd/build/chart_builder.min.js.map
- deleted: lib/amd/build/chart_line.min.js
- deleted: lib/amd/build/chart_line.min.js.map
- deleted: lib/amd/build/chart_output.min.js
- deleted: lib/amd/build/chart_output.min.js.map
- deleted: lib/amd/build/chart_output_base.min.js
- deleted: lib/amd/build/chart_output_base.min.js.map
- deleted: lib/amd/build/chart_output_chartjs.min.js
- deleted: lib/amd/build/chart_output_chartjs.min.js.map
- deleted: lib/amd/build/chart_output_htmltable.min.js
- deleted: lib/amd/build/chart_output_htmltable.min.js.map
- deleted: lib/amd/build/chart_pie.min.js
- deleted: lib/amd/build/chart_pie.min.js.map
- deleted: lib/amd/build/chart_series.min.js
- deleted: lib/amd/build/chart_series.min.js.map
- deleted: lib/amd/build/chartjs-lazy.min.js
- deleted: lib/amd/build/chartjs-lazy.min.js.map
- deleted: lib/amd/build/chartjs.min.js
- deleted: lib/amd/build/chartjs.min.js.map
- deleted: lib/amd/build/checkbox-toggleall.min.js
- deleted: lib/amd/build/checkbox-toggleall.min.js.map
- deleted: lib/amd/build/config.min.js
- deleted: lib/amd/build/config.min.js.map
- deleted: lib/amd/build/custom_interaction_events.min.js
- deleted: lib/amd/build/custom_interaction_events.min.js.map
- deleted: lib/amd/build/dragdrop.min.js
- deleted: lib/amd/build/dragdrop.min.js.map
- deleted: lib/amd/build/drawer.min.js
- deleted: lib/amd/build/drawer.min.js.map
- deleted: lib/amd/build/drawer_events.min.js
- deleted: lib/amd/build/drawer_events.min.js.map
- deleted: lib/amd/build/emoji/auto_complete.min.js
- deleted: lib/amd/build/emoji/auto_complete.min.js.map
- deleted: lib/amd/build/emoji/data.min.js
- deleted: lib/amd/build/emoji/data.min.js.map
- deleted: lib/amd/build/emoji/picker.min.js
- deleted: lib/amd/build/emoji/picker.min.js.map
- deleted: lib/amd/build/event.min.js
- deleted: lib/amd/build/event.min.js.map
- deleted: lib/amd/build/first.min.js
- deleted: lib/amd/build/first.min.js.map
- deleted: lib/amd/build/form-autocomplete.min.js
- deleted: lib/amd/build/form-autocomplete.min.js.map
- deleted: lib/amd/build/form-cohort-selector.min.js
- deleted: lib/amd/build/form-cohort-selector.min.js.map
- deleted: lib/amd/build/form-course-selector.min.js
- deleted: lib/amd/build/form-course-selector.min.js.map
- deleted: lib/amd/build/fragment.min.js
- deleted: lib/amd/build/fragment.min.js.map
- deleted: lib/amd/build/icon_system.min.js
- deleted: lib/amd/build/icon_system.min.js.map
- deleted: lib/amd/build/icon_system_fontawesome.min.js
- deleted: lib/amd/build/icon_system_fontawesome.min.js.map
- deleted: lib/amd/build/icon_system_standard.min.js
- deleted: lib/amd/build/icon_system_standard.min.js.map
- deleted: lib/amd/build/inplace_editable.min.js
- deleted: lib/amd/build/inplace_editable.min.js.map
- deleted: lib/amd/build/key_codes.min.js
- deleted: lib/amd/build/key_codes.min.js.map
- deleted: lib/amd/build/loadingicon.min.js
- deleted: lib/amd/build/loadingicon.min.js.map
- deleted: lib/amd/build/local/aria/focuslock.min.js
- deleted: lib/amd/build/local/aria/focuslock.min.js.map
- deleted: lib/amd/build/localstorage.min.js
- deleted: lib/amd/build/localstorage.min.js.map
- deleted: lib/amd/build/log.min.js
- deleted: lib/amd/build/log.min.js.map
- deleted: lib/amd/build/loglevel.min.js
- deleted: lib/amd/build/loglevel.min.js.map
- deleted: lib/amd/build/modal.min.js
- deleted: lib/amd/build/modal.min.js.map
- deleted: lib/amd/build/modal_backdrop.min.js
- deleted: lib/amd/build/modal_backdrop.min.js.map
- deleted: lib/amd/build/modal_cancel.min.js
- deleted: lib/amd/build/modal_cancel.min.js.map
- deleted: lib/amd/build/modal_events.min.js
- deleted: lib/amd/build/modal_events.min.js.map
- deleted: lib/amd/build/modal_factory.min.js
- deleted: lib/amd/build/modal_factory.min.js.map
- deleted: lib/amd/build/modal_registry.min.js
- deleted: lib/amd/build/modal_registry.min.js.map
- deleted: lib/amd/build/modal_save_cancel.min.js
- deleted: lib/amd/build/modal_save_cancel.min.js.map
- deleted: lib/amd/build/mustache.min.js
- deleted: lib/amd/build/mustache.min.js.map
- deleted: lib/amd/build/network.min.js
- deleted: lib/amd/build/network.min.js.map
- deleted: lib/amd/build/notification.min.js
- deleted: lib/amd/build/notification.min.js.map
- deleted: lib/amd/build/page_global.min.js
- deleted: lib/amd/build/page_global.min.js.map
- deleted: lib/amd/build/paged_content.min.js
- deleted: lib/amd/build/paged_content.min.js.map
- deleted: lib/amd/build/paged_content_events.min.js
- deleted: lib/amd/build/paged_content_events.min.js.map
- deleted: lib/amd/build/paged_content_factory.min.js
- deleted: lib/amd/build/paged_content_factory.min.js.map
- deleted: lib/amd/build/paged_content_pages.min.js
- deleted: lib/amd/build/paged_content_pages.min.js.map
- deleted: lib/amd/build/paged_content_paging_bar.min.js
- deleted: lib/amd/build/paged_content_paging_bar.min.js.map
- deleted: lib/amd/build/paged_content_paging_bar_limit_selector.min.js
- deleted: lib/amd/build/paged_content_paging_bar_limit_selector.min.js.map
- deleted: lib/amd/build/paged_content_paging_dropdown.min.js
- deleted: lib/amd/build/paged_content_paging_dropdown.min.js.map
- deleted: lib/amd/build/pending.min.js
- deleted: lib/amd/build/pending.min.js.map
- deleted: lib/amd/build/permissionmanager.min.js
- deleted: lib/amd/build/permissionmanager.min.js.map
- deleted: lib/amd/build/popover_region_controller.min.js
- deleted: lib/amd/build/popover_region_controller.min.js.map
- deleted: lib/amd/build/popper.min.js
- deleted: lib/amd/build/popper.min.js.map
- deleted: lib/amd/build/pubsub.min.js
- deleted: lib/amd/build/pubsub.min.js.map
- deleted: lib/amd/build/search-input.min.js
- deleted: lib/amd/build/search-input.min.js.map
- deleted: lib/amd/build/sessionstorage.min.js
- deleted: lib/amd/build/sessionstorage.min.js.map
- deleted: lib/amd/build/showhidesettings.min.js
- deleted: lib/amd/build/showhidesettings.min.js.map
- deleted: lib/amd/build/sortable_list.min.js
- deleted: lib/amd/build/sortable_list.min.js.map
- deleted: lib/amd/build/storagewrapper.min.js
- deleted: lib/amd/build/storagewrapper.min.js.map
- deleted: lib/amd/build/str.min.js
- deleted: lib/amd/build/str.min.js.map
- deleted: lib/amd/build/tag.min.js
- deleted: lib/amd/build/tag.min.js.map
- deleted: lib/amd/build/templates.min.js
- deleted: lib/amd/build/templates.min.js.map
- deleted: lib/amd/build/toast.min.js
- deleted: lib/amd/build/toast.min.js.map
- deleted: lib/amd/build/tooltip.min.js
- deleted: lib/amd/build/tooltip.min.js.map
- deleted: lib/amd/build/tree.min.js
- deleted: lib/amd/build/tree.min.js.map
- deleted: lib/amd/build/truncate.min.js
- deleted: lib/amd/build/truncate.min.js.map
- deleted: lib/amd/build/url.min.js
- deleted: lib/amd/build/url.min.js.map
- deleted: lib/amd/build/user_date.min.js
- deleted: lib/amd/build/user_date.min.js.map
- deleted: lib/amd/build/utils.min.js
- deleted: lib/amd/build/utils.min.js.map
- deleted: lib/amd/build/yui.min.js
- deleted: lib/amd/build/yui.min.js.map
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement