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

Rc release 5.8.13 #2764

Merged
merged 7 commits into from
Sep 27, 2024
Merged

Rc release 5.8.13 #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76080d5
upgrade ckeditor, jquery, and bootstrap (#2755)
RyanEddyIC Sep 16, 2024
c36866b
disable turbolinks on download roster link (#2760)
utkarsh7989 Sep 16, 2024
c4ec50d
Fix reset password bug (#2766)
utkarsh7989 Sep 19, 2024
e0f8442
ensure notify_updated is called when record is changed (#2767)
nks2109 Sep 19, 2024
0d504d2
Optimize the employee_person_ids Method (#2739)
hKalesnikavaideacrew Sep 23, 2024
5cd0183
Merge branch 'master' into rc-release-5.8.13
sri49 Sep 23, 2024
87aca51
call notify_updated event when record is changed (#2781)
nks2109 Sep 27, 2024
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
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ PATH
notifier (0.0.1)
aasm (~> 4.8.0)
acapi
ckeditor (= 4.2.4)
ckeditor (= 5.0.0)
combine_pdf
config
curl
Expand Down Expand Up @@ -342,7 +342,7 @@ GEM
coffee-rails (>= 3.2)
railties (>= 3.0)
sassc-rails (>= 2.1.2)
ckeditor (4.2.4)
ckeditor (5.0.0)
cocaine
orm_adapter (~> 0.5.0)
climate_control (0.2.0)
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/application.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery2
//= require jquery-ui
//= require jquery_ujs
//= require bootstrap.min
//= require bootstrap.bundle.min
//= require bootstrap-multiselect
//= require jquery.selectric.min
//= require turbolinks
Expand Down
308 changes: 206 additions & 102 deletions app/assets/javascripts/button.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/assets/javascripts/ui-components/components.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery
//= require jquery2
//= require jquery_ujs
//= require jquery-ui
//= require bootstrap.min
//= require bootstrap.bundle.min
//= require bootstrap-treeview
//= require jquery.selectric.min
//= require bowser.min
Expand Down
13 changes: 13 additions & 0 deletions app/assets/stylesheets/bootstrap_overrides.scss.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,3 +457,16 @@ strong {
}
}
}

// Upgrading Bootstrap 3 to 4 breaks modals with top level fade class
.modal.fade {
transition: opacity 0.15s linear;
}

.modal.fade.show {
opacity: 1;
}

.modal.fade:not(.show) {
opacity: 0;
}
Loading