Skip to content

sweetalert update #6195

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
Merged
merged 7 commits into from
Jul 20, 2020
Merged

sweetalert update #6195

merged 7 commits into from
Jul 20, 2020

Conversation

@haoweiqiu
Copy link
Contributor

@haoweiqiu haoweiqiu commented Mar 30, 2020 •
edited
Loading

Brief summary of changes

This updates sweetalert to sweetalert2 in most javascript files. However, the only file that does not change is NDB_Page.class.inc, since there is some error in Travis. This Pull Request contains commits of my another Pull Request (#6192).

Haowei Qiu, GSOC Applicant
CC @christinerogers

Link(s) to related issue(s)

@haoweiqiu haoweiqiu changed the title Haowei sweetalert sweetalert update Mar 30, 2020
@maltheism maltheism added the Passed manual tests PR has been successfully tested by at least one peer label Mar 30, 2020
maltheism
maltheism approved these changes Mar 30, 2020
View reviewed changes
Copy link
Member

@maltheism maltheism left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! The PR passed manual testing for me. Someone else should review as well. 🙂

@johnsaigle johnsaigle requested a review from driusan March 30, 2020 16:13
@christinerogers
Copy link
Contributor

christinerogers commented Mar 30, 2020

Hi @haoweiqiu please note in this PR description that you are applying for GSOC - thanks

@christinerogers christinerogers added the Event: GSOC PR or issue accepted for Google Summer of Code label Apr 7, 2020
@christinerogers christinerogers self-assigned this Apr 8, 2020
@driusan driusan added the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label Jun 17, 2020
driusan
driusan approved these changes Jul 13, 2020
View reviewed changes
Copy link
Collaborator

@driusan driusan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The JS changes look good (not sure about the change to the markdown, but it seems right..)

But this has conflicts and can't be merged, can you rebase it?

@haoweiqiu
Copy link
Contributor Author

haoweiqiu commented Jul 15, 2020

@driusan I have rebased to master branch in my local repository. May I created another pull request from my master branch to resolve this issue?

@driusan
Copy link
Collaborator

driusan commented Jul 15, 2020

@haoweiqiu if you've rebased on master on your local repository you should just need to run git rebase --force-with-lease in order to update it on github.

@haoweiqiu
Copy link
Contributor Author

haoweiqiu commented Jul 15, 2020

@driusan Sorry for the confusion. I just realized that while I was merging conflicts during git rebase, I directly merged this branch to my master branch..

@haoweiqiu haoweiqiu force-pushed the haowei-sweetalert branch from 6f6c527 to 73f05fe Compare July 17, 2020 13:26
@haoweiqiu
Copy link
Contributor Author

haoweiqiu commented Jul 17, 2020

@driusan The merge conflict issue is finally resolved.

driusan
driusan approved these changes Jul 20, 2020
View reviewed changes
Copy link
Collaborator

@driusan driusan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! LGTM

@driusan driusan merged commit d78c9fb into aces:master Jul 20, 2020
@ridz1208 ridz1208 added this to the 24.0.0 milestone Jul 27, 2020
@haoweiqiu haoweiqiu deleted the haowei-sweetalert branch August 26, 2020 16:33
@laemtl laemtl mentioned this pull request Sep 21, 2020
Merged
laemtl added a commit to haoweiqiu/Loris that referenced this pull request Sep 22, 2020
@laemtl
Fix aces#6195 regression
691c758
@sruthymathew123 sruthymathew123 mentioned this pull request Oct 9, 2020
Closed
@laemtl laemtl mentioned this pull request Jan 9, 2021
Merged
laemtl added a commit to laemtl/Loris that referenced this pull request Jan 9, 2021
@laemtl
[Publication] File delete not working (aces#6195 regression)
3088be8
@laemtl laemtl mentioned this pull request Jan 9, 2021
Merged
driusan pushed a commit that referenced this pull request Jan 18, 2021
@laemtl
[Publication] File delete not working (#6195 regression) (#7284)
d3203f7 
Fix an error introduced by #6195 when a file previously uploaded is deleted.
laemtl added a commit to laemtl/Loris that referenced this pull request Feb 5, 2021
@laemtl
Fix swal callback not working (aces#6195 regression)
9275c39
@laemtl laemtl mentioned this pull request Feb 5, 2021
Merged
driusan pushed a commit that referenced this pull request Feb 5, 2021
@laemtl
Fix swal callback not working (#6195 regressions) (#7324)
fa172d6 
This fixes a number of callback regressions introduced by #6195.
@laemtl laemtl mentioned this pull request Feb 5, 2021
Merged
driusan pushed a commit that referenced this pull request Feb 15, 2021
@laemtl
[Publications] Error and swal fix (#7326)
98a481b 
Small changes following the comment made in #7315

- Fix missing error message
- Fix missing swal callback change (#6195 regression) previously in #7091

Replace #7091
AlexandraLivadas pushed a commit to AlexandraLivadas/Loris that referenced this pull request Jun 29, 2021
@haoweiqiu @AlexandraLivadas
sweetalert update (aces#6195)
6acaf75 
This updates sweetalert to sweetalert2 in most javascript files. However, the only file that does not change is NDB_Page.class.inc, since there is some error in Travis.

 Resolves (partially) aces#6114
 See also aces#6192
AlexandraLivadas pushed a commit to AlexandraLivadas/Loris that referenced this pull request Jun 29, 2021
@laemtl @AlexandraLivadas
[Publication] File delete not working (aces#6195 regression) (aces#7284)
dc6982f 
Fix an error introduced by aces#6195 when a file previously uploaded is deleted.
AlexandraLivadas pushed a commit to AlexandraLivadas/Loris that referenced this pull request Jun 29, 2021
@laemtl @AlexandraLivadas
Fix swal callback not working (aces#6195 regressions) (aces#7324)
44d71d0 
This fixes a number of callback regressions introduced by aces#6195.
AlexandraLivadas pushed a commit to AlexandraLivadas/Loris that referenced this pull request Jun 29, 2021
@laemtl @AlexandraLivadas
[Publications] Error and swal fix (aces#7326)
918afef 
Small changes following the comment made in aces#7315

- Fix missing error message
- Fix missing swal callback change (aces#6195 regression) previously in aces#7091

Replace aces#7091
ridz1208 pushed a commit to ridz1208/Loris that referenced this pull request Jul 8, 2021
@laemtl @ridz1208
Fix aces#6195 regression
f3b98dd
maltheism pushed a commit to haoweiqiu/Loris that referenced this pull request Dec 6, 2022
@laemtl @maltheism
Fix aces#6195 regression
cce4cb9
maltheism pushed a commit to maltheism/Loris that referenced this pull request Dec 7, 2022
@laemtl @maltheism
Fix aces#6195 regression
60968eb
maltheism pushed a commit to maltheism/Loris that referenced this pull request Dec 7, 2022
@laemtl @maltheism
Fix aces#6195 regression
a1df28e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@driusan driusan driusan approved these changes

@maltheism maltheism maltheism approved these changes

Assignees

@christinerogers christinerogers

Labels

Event: GSOC PR or issue accepted for Google Summer of Code Passed manual tests PR has been successfully tested by at least one peer State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...)

Projects

None yet

Milestone

24.0.0

Development

Successfully merging this pull request may close these issues.

Remove SWAL from htdocs/vendor

5 participants

@haoweiqiu @christinerogers @driusan @maltheism @ridz1208