Skip to content
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.

Sign up for GitHub

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

Jump to bottom

2.5.0 #244

Merged
merged 18 commits into from
Dec 21, 2021
Merged

2.5.0 #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9b2b2b8
Add assets for jquery-ui-datepicker
Rahmon Nov 24, 2021
cb36885
Add style to datetime picker
Rahmon Nov 24, 2021
5cd1822
Update to handle state and scheduled date on edit form
Rahmon Nov 24, 2021
e129bee
Update Gruntfile.js to ignore jquery-ui-datepicker assets
Rahmon Nov 24, 2021
7aef295
Enqueue jquery-ui-datepicker script and style
Rahmon Nov 24, 2021
9499574
Add state and scheduled date time fields
Rahmon Nov 24, 2021
b2e6d5b
Update to handle schedule date when fetching videos
Rahmon Nov 24, 2021
f2506df
Update to send scheduled date when saving a video
Rahmon Nov 24, 2021
423940b
Build assets
Rahmon Nov 24, 2021
cdeda66
Fix empty start/end date
Rahmon Dec 13, 2021
c5ee183
Merge branch 'master' into feature/activating-deactivating-scheduling…
Rahmon Dec 13, 2021
dd13ccd
Merge pull request #241 from 10up/feature/activating-deactivating-sch…
Rahmon Dec 14, 2021
1a0c511
Update CHANGELOG.md
Rahmon Dec 20, 2021
c777fe3
Update readme.txt
Rahmon Dec 20, 2021
cbe1d87
Update brightcove-video-connect.php
Rahmon Dec 20, 2021
30dd9b1
Update package.json
Rahmon Dec 20, 2021
913f239
Update .pot
Rahmon Dec 20, 2021
e531544
Merge pull request #243 from 10up/release/2.5.0
Rahmon Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [2.5.0] - 2021-12-21

### Added
- State, Scheduled Start Date, and Scheduled End Date fields to the video edit screen. Props [@Rahmon](https://github.com/Rahmon), and [@oscarssanchez](https://github.com/oscarssanchez) via [#241](https://github.com/10up/brightcove-video-connect/pull/241).

## [2.4.0] - 2021-11-29

### Added
Expand Down Expand Up @@ -341,6 +346,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- First release

[Unreleased]: https://github.com/10up/brightcove-video-connect/compare/master...develop
[2.5.0]: https://github.com/10up/brightcove-video-connect/compare/2.4.0...2.5.0
[2.4.0]: https://github.com/10up/brightcove-video-connect/compare/2.3.1...2.4.0
[2.3.1]: https://github.com/10up/brightcove-video-connect/compare/2.3.0...2.3.1
[2.3.0]: https://github.com/10up/brightcove-video-connect/compare/2.2.1...2.3.0
Expand Down
341 changes: 161 additions & 180 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,204 +1,185 @@
module.exports = function ( grunt ) {
const sass = require('node-sass');
module.exports = function (grunt) {
const sass = require('node-sass');
// Start out by loading the grunt modules we'll need
require ( 'load-grunt-tasks' ) ( grunt );

grunt.initConfig (
{

clean : {
files: ["assets/css/*", "assets/js/brightcove*"]
},

autoprefixer : {

options : {
browsers : ['last 5 versions']
},

files : {
expand : true,
flatten : true,
src : 'assets/css/*.css',
dest : 'assets/css'
}

},

cssmin : {

target : {

files : [{
expand : true,
cwd : 'assets/css',
src : ['*.css'],
dest : 'assets/css',
ext : '.min.css'
}]

}

require('load-grunt-tasks')(grunt);

grunt.initConfig({
clean: {
files: [
'assets/css/*.css',
'assets/js/brightcove*',
'!assets/css/jquery-ui-datepicker*.css',
'!assets/css/images/*.*',
],
},

autoprefixer: {
options: {
browsers: ['last 5 versions'],
},

sass : {

production : {

options : {
implementation: sass,
style : 'expanded',
noCache : true
},

files : {
'assets/css/brightcove_video_connect.css' : 'assets/scss/brightcove_video_connect.scss',
'assets/css/brightcove_playlist.css' : 'assets/scss/brightcove_playlist.scss'
}

}

files: {
expand: true,
flatten: true,
src: 'assets/css/*.css',
dest: 'assets/css',
},

concat: {
development: {

options : {

// Wrap our scripts to limit their scope.
banner: '( function( $ ){\n',
footer: '\n} )( jQuery );',
sourceMap: true
},

cssmin: {
target: {
files: [
{
expand: true,
cwd: 'assets/css',
src: ['*.css'],
dest: 'assets/css',
ext: '.min.css',
},

files : {
'assets/js/brightcove-admin.js' : [
// MODELS
'assets/js/src/models/media.js',
'assets/js/src/models/media-collection.js',
'assets/js/src/models/brightcove-media-manager.js',
'assets/js/src/models/brightcove-modal.js',
'assets/js/src/models/upload-collection.js',
'assets/js/src/models/upload.js',

// VIEWS
'assets/js/src/views/brightcove.js',
'assets/js/src/views/toolbar.js',
'assets/js/src/views/upload-video-manager.js',
'assets/js/src/views/brightcove-media-manager.js',
'assets/js/src/views/brightcove-modal.js',
'assets/js/src/views/media-details.js',
'assets/js/src/views/media.js',
'assets/js/src/views/playlist-edit.js',
'assets/js/src/views/upload-details.js',
'assets/js/src/views/upload-window.js',
'assets/js/src/views/upload.js',
'assets/js/src/views/video-edit.js',
'assets/js/src/views/video-preview.js',
'assets/js/src/views/media-collection.js',
'assets/js/src/app.js'
]
}
}
],
},

uglify : {

production : {

options : {
beautify : false,
preserveComments : 'all',
mangle : {
reserved : ['jQuery']
},
separator: ';\n',

// Wrap our scripts to limit their scope.
banner: '( function( $ ){\n',
footer: '\n} )( jQuery );'
},

files : {
'assets/js/brightcove-admin.min.js' : [
// MODELS
'assets/js/src/models/media.js',
'assets/js/src/models/media-collection.js',
'assets/js/src/models/brightcove-media-manager.js',
'assets/js/src/models/brightcove-modal.js',
'assets/js/src/models/upload-collection.js',
'assets/js/src/models/upload.js',

// VIEWS
'assets/js/src/views/brightcove.js',
'assets/js/src/views/toolbar.js',
'assets/js/src/views/upload-video-manager.js',
'assets/js/src/views/brightcove-media-manager.js',
'assets/js/src/views/brightcove-modal.js',
'assets/js/src/views/media-details.js',
'assets/js/src/views/media.js',
'assets/js/src/views/playlist-edit.js',
'assets/js/src/views/upload-details.js',
'assets/js/src/views/upload-window.js',
'assets/js/src/views/upload.js',
'assets/js/src/views/video-edit.js',
'assets/js/src/views/video-preview.js',
'assets/js/src/views/media-collection.js',
'assets/js/src/app.js'
],
'assets/js/bc-status.min.js' : [
'assets/js/src/bc-status.js'
]
}

},

sass: {
production: {
options: {
implementation: sass,
style: 'expanded',
noCache: true,
},

files: {
'assets/css/brightcove_video_connect.css':
'assets/scss/brightcove_video_connect.scss',
'assets/css/brightcove_playlist.css': 'assets/scss/brightcove_playlist.scss',
},
},
},

concat: {
development: {
options: {
// Wrap our scripts to limit their scope.
banner: '( function( $ ){\n',
footer: '\n} )( jQuery );',
sourceMap: true,
},

makepot : {

target : {
options : {
type : 'wp-plugin',
domainPath : '/languages',
mainFile : 'brightcove-video-connect.php'
}
}

files: {
'assets/js/brightcove-admin.js': [
// MODELS
'assets/js/src/models/media.js',
'assets/js/src/models/media-collection.js',
'assets/js/src/models/brightcove-media-manager.js',
'assets/js/src/models/brightcove-modal.js',
'assets/js/src/models/upload-collection.js',
'assets/js/src/models/upload.js',

// VIEWS
'assets/js/src/views/brightcove.js',
'assets/js/src/views/toolbar.js',
'assets/js/src/views/upload-video-manager.js',
'assets/js/src/views/brightcove-media-manager.js',
'assets/js/src/views/brightcove-modal.js',
'assets/js/src/views/media-details.js',
'assets/js/src/views/media.js',
'assets/js/src/views/playlist-edit.js',
'assets/js/src/views/upload-details.js',
'assets/js/src/views/upload-window.js',
'assets/js/src/views/upload.js',
'assets/js/src/views/video-edit.js',
'assets/js/src/views/video-preview.js',
'assets/js/src/views/media-collection.js',
'assets/js/src/app.js',
],
},
},
},

uglify: {
production: {
options: {
beautify: false,
preserveComments: 'all',
mangle: {
reserved: ['jQuery'],
},
separator: ';\n',

watch : {

options : {
livereload : true
// Wrap our scripts to limit their scope.
banner: '( function( $ ){\n',
footer: '\n} )( jQuery );',
},

styles : {

files : [
'assets/scss/**/*'
files: {
'assets/js/brightcove-admin.min.js': [
// MODELS
'assets/js/src/models/media.js',
'assets/js/src/models/media-collection.js',
'assets/js/src/models/brightcove-media-manager.js',
'assets/js/src/models/brightcove-modal.js',
'assets/js/src/models/upload-collection.js',
'assets/js/src/models/upload.js',

// VIEWS
'assets/js/src/views/brightcove.js',
'assets/js/src/views/toolbar.js',
'assets/js/src/views/upload-video-manager.js',
'assets/js/src/views/brightcove-media-manager.js',
'assets/js/src/views/brightcove-modal.js',
'assets/js/src/views/media-details.js',
'assets/js/src/views/media.js',
'assets/js/src/views/playlist-edit.js',
'assets/js/src/views/upload-details.js',
'assets/js/src/views/upload-window.js',
'assets/js/src/views/upload.js',
'assets/js/src/views/video-edit.js',
'assets/js/src/views/video-preview.js',
'assets/js/src/views/media-collection.js',
'assets/js/src/app.js',
],

tasks : ['sass', 'cssmin']

'assets/js/bc-status.min.js': ['assets/js/src/bc-status.js'],
},
},
},

makepot: {
target: {
options: {
type: 'wp-plugin',
domainPath: '/languages',
mainFile: 'brightcove-video-connect.php',
},
},
},

scripts : {

files : [
'assets/js/src/**/*'
],
watch: {
options: {
livereload: true,
},

tasks : ['concat:development', 'uglify:production']
styles: {
files: ['assets/scss/**/*'],

}
tasks: ['sass', 'cssmin'],
},

}
scripts: {
files: ['assets/js/src/**/*'],

}
);
tasks: ['concat:development', 'uglify:production'],
},
},
});

// A very basic default task.
grunt.registerTask ( 'default', ['clean', 'sass', 'autoprefixer', 'cssmin', 'concat:development', 'uglify:production', 'makepot'] );

grunt.registerTask('default', [
'clean',
'sass',
'autoprefixer',
'cssmin',
'concat:development',
'uglify:production',
'makepot',
]);
};
Loading