-
Notifications
You must be signed in to change notification settings - Fork 132
upgrade Bootstrap to 4 #566
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
af5d275
upgrade Bootstrap4
keshav234156 a9d00cb
testing with test changes
keshav234156 2c16fdc
Merge branch 'main' of https://github.com/publiclab/PublicLab.Editor …
keshav234156 48616e5
fix test
keshav234156 77794cb
Merge branch 'main' of https://github.com/publiclab/PublicLab.Editor …
keshav234156 7465e7b
fix test
keshav234156 eb021b3
fix center text
keshav234156 b266f37
remove screenshort command
keshav234156 abe2ed9
fix conflict
keshav234156 5092f84
fix conflict
keshav234156 fbc2c37
fix test
keshav234156 96bbe73
fix test
keshav234156 65fffea
fix conflict
keshav234156 1fdcb42
fix conflict
keshav234156 52749f2
fix conflict
keshav234156 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| dist/*.js | ||
| dist/*.js | ||
| Gruntfile.js |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,81 +1,84 @@ | ||
| module.exports = function(grunt) { | ||
| grunt.loadNpmTasks('grunt-browserify'); | ||
|
|
||
| require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks); | ||
| grunt.loadNpmTasks('grunt-browserify'); | ||
|
|
||
| grunt.initConfig({ | ||
| pkg: grunt.file.readJSON('package.json'), | ||
| require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks); | ||
|
|
||
| watch: { | ||
| options: { | ||
| livereload: true | ||
| }, | ||
| source: { | ||
| files: [ | ||
| 'src/*.js', | ||
| 'src/*/*.js', | ||
| 'Gruntfile.js' | ||
| ], | ||
| tasks: ['build:js'] | ||
| } | ||
| }, | ||
| grunt.initConfig({ | ||
| pkg: grunt.file.readJSON('package.json'), | ||
|
|
||
| browserify: { | ||
| dist: { | ||
| src: [ | ||
| 'src/PublicLab.Editor.js' | ||
| ], | ||
| dest: 'dist/PublicLab.Editor.js' | ||
| }, | ||
| debug: { | ||
| options: { | ||
| browserifyOptions: { | ||
| debug: true | ||
| } | ||
| watch: { | ||
| options : { | ||
| livereload: true | ||
| }, | ||
| source: { | ||
| files: [ | ||
| 'src/*.js', | ||
| 'src/*/*.js', | ||
| 'Gruntfile.js' | ||
| ], | ||
| tasks: [ 'build:js' ] | ||
| } | ||
| }, | ||
|
|
||
| browserify: { | ||
| dist: { | ||
| src: [ | ||
| 'src/PublicLab.Editor.js' | ||
| ], | ||
| dest: 'dist/PublicLab.Editor.js' | ||
| }, | ||
| debug: { | ||
| options : { | ||
| browserifyOptions: { | ||
| debug: true | ||
| } | ||
| }, | ||
| src: [ | ||
| 'src/PublicLab.Editor.js' | ||
| ], | ||
| dest: 'dist/PublicLab.Editor.js' | ||
| } | ||
| }, | ||
| src: [ | ||
| 'src/PublicLab.Editor.js' | ||
| ], | ||
| dest: 'dist/PublicLab.Editor.js' | ||
| } | ||
| }, | ||
|
|
||
| jasmine: { | ||
| publiclabeditor: { | ||
| src: 'dist/*.js', | ||
| options: { | ||
| specs: 'spec/javascripts/*spec.js', | ||
| vendor: [ | ||
| 'node_modules/jquery/dist/jquery.min.js', | ||
| 'node_modules/bootstrap/dist/js/bootstrap.min.js', | ||
| 'node_modules/blueimp-file-upload/js/vendor/jquery.ui.widget.js', | ||
| 'node_modules/blueimp-file-upload/js/jquery.iframe-transport.js', | ||
| 'node_modules/blueimp-file-upload/js/jquery.fileupload.js', | ||
| 'node_modules/typeahead.js/dist/typeahead.jquery.js', | ||
| 'node_modules/typeahead.js/dist/bloodhound.js', | ||
| 'node_modules/bootstrap-tokenfield/dist/bootstrap-tokenfield.js', | ||
| 'node_modules/jasmine-jquery/lib/jasmine-jquery.js', | ||
| 'node_modules/jasmine-ajax/lib/mock-ajax.js', | ||
| 'https://maps.googleapis.com/maps/api/js?libraries=places&language=en&key=AIzaSyDWgc7p4WWFsO3y0MTe50vF4l4NUPcPuwE', | ||
| 'node_modules/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js', | ||
| 'node_modules/leaflet/dist/leaflet.js' | ||
| ] | ||
| jasmine: { | ||
| publiclabeditor: { | ||
| src: 'dist/*.js', | ||
| options: { | ||
| specs: 'spec/javascripts/*spec.js', | ||
| vendor: [ | ||
| 'node_modules/jquery/dist/jquery.min.js', | ||
| 'node_modules/popper.js/dist/umd/popper.min.js', | ||
| 'node_modules/bootstrap/dist/js/bootstrap.js', | ||
| 'node_modules/blueimp-file-upload/js/vendor/jquery.ui.widget.js', | ||
| 'node_modules/blueimp-file-upload/js/jquery.iframe-transport.js', | ||
| 'node_modules/blueimp-file-upload/js/jquery.fileupload.js', | ||
| 'node_modules/typeahead.js/dist/typeahead.jquery.js', | ||
| 'node_modules/typeahead.js/dist/bloodhound.js', | ||
| 'node_modules/bootstrap-tokenfield/dist/bootstrap-tokenfield.js', | ||
| 'node_modules/jasmine-jquery/lib/jasmine-jquery.js', | ||
| 'node_modules/jasmine-ajax/lib/mock-ajax.js', | ||
| 'https://maps.googleapis.com/maps/api/js?libraries=places&language=en&key=AIzaSyDWgc7p4WWFsO3y0MTe50vF4l4NUPcPuwE', | ||
| 'node_modules/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js', | ||
| 'node_modules/leaflet/dist/leaflet.js' | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| }); | ||
| }); | ||
|
|
||
| /* Default (development): Watch files and build on change. */ | ||
| grunt.registerTask('default', ['watch' , 'jasmine']); | ||
|
|
||
| /* Default (development): Watch files and build on change. */ | ||
| grunt.registerTask('default', ['watch', 'jasmine']); | ||
| grunt.registerTask('build', [ | ||
| 'browserify:dist' | ||
| ]); | ||
|
|
||
| grunt.registerTask('build', [ | ||
| 'browserify:dist' | ||
| ]); | ||
| grunt.registerTask('debug', [ | ||
| 'browserify:debug' | ||
| ]); | ||
|
|
||
| grunt.registerTask('debug', [ | ||
| 'browserify:debug' | ||
| ]); | ||
| grunt.loadNpmTasks('grunt-contrib-jasmine'); | ||
|
|
||
| grunt.loadNpmTasks('grunt-contrib-jasmine'); | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Uh oh - were these commits supposed to make it into here? Just checking!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, i see here! all good then! #566 (comment)