Skip to content

Comments

Select2 into core#1832

Merged
LukasReschke merged 1 commit intomasterfrom
select2-into-core
Oct 22, 2016
Merged

Select2 into core#1832
LukasReschke merged 1 commit intomasterfrom
select2-into-core

Conversation

@skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Oct 20, 2016 •
edited
Loading

@jancborchardt

You took too much time, Shia is disappointed!
bkanf7d

@skjnldsv skjnldsv added design Design, UI, UX, etc. 3. to review Waiting for reviews feature: tags feature: settings labels Oct 20, 2016
@skjnldsv skjnldsv self-assigned this Oct 20, 2016
@mention-bot
Copy link

mention-bot commented Oct 20, 2016

@skjnldsv, thanks for your PR! By analyzing the history of the files in this pull request, we identified @LukasReschke, @PVince81 and @nickvergessen to be potential reviewers.

nickvergessen
nickvergessen reviewed Oct 20, 2016
View reviewed changes
lib/private/legacy/template.php
OC_Util::addStyle("icons",null,true);
OC_Util::addStyle("header",null,true);
OC_Util::addStyle("inputs",null,true);
OC_Util::addStyle("inputs");
Copy link
Member

@nickvergessen nickvergessen Oct 20, 2016

Choose a reason for hiding this comment

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

unrelated?

Copy link
Member Author

@skjnldsv skjnldsv Oct 20, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

No no, related. See #1789 (comment)

@MorrisJobke
Copy link
Member

MorrisJobke commented Oct 20, 2016

@skjnldsv Could I ask you to squash all your commits into one? 😉

@skjnldsv
Copy link
Member Author

skjnldsv commented Oct 20, 2016

You could! 😂

@MorrisJobke
Copy link
Member

MorrisJobke commented Oct 20, 2016

You could! 😂

Will you do so? 😝

@skjnldsv
Copy link
Member Author

skjnldsv commented Oct 20, 2016

Your desire are orders! 😆

@MorrisJobke
Copy link
Member

MorrisJobke commented Oct 20, 2016 •
edited
Loading 

select2-toggleselect.js?v=42c21b7…:53 Uncaught ReferenceError: Select2 is not defined(anonymous function)
@ select2-toggleselect.js?v=42c21b7…:53

@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Oct 20, 2016
@MorrisJobke
Copy link
Member

MorrisJobke commented Oct 20, 2016

I got this error in the JS console when opening the files app.

@MorrisJobke MorrisJobke changed the title Select2 into core 🚀 Select2 into core Oct 20, 2016
@MorrisJobke
Copy link
Member

MorrisJobke commented Oct 20, 2016

Sorry I need to remove the emoji - crashed drone

@skjnldsv
Copy link
Member Author

skjnldsv commented Oct 20, 2016 •
edited
Loading

😭
This is strange, I don't have the error.

@MorrisJobke
Copy link
Member

MorrisJobke commented Oct 20, 2016

This is strange, I don't have the error.

You only see it on the error log 😉

@skjnldsv
Copy link
Member Author

skjnldsv commented Oct 20, 2016

Found it, I didn't had the same file on my test server. Fixed!

@skjnldsv skjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 20, 2016
@MorrisJobke
Copy link
Member

MorrisJobke commented Oct 20, 2016

Found it, I didn't had the same file on my test server. Fixed!

It's not about crashing the actual build, but drone and especially the mysql behind the scenes failed to store the emoji, because mysql can only store 3 byte characters and emojis are 4 byte characters 🙈

@skjnldsv
Copy link
Member Author

skjnldsv commented Oct 20, 2016

Ahahaa, this is a funny issue! :p

Anyhow, review pls 😉

@rullzer
Copy link
Member

rullzer commented Oct 21, 2016

@skjnldsv you need to sign off your commit ;)

@jancborchardt
Copy link
Member

jancborchardt commented Oct 21, 2016

@skjnldsv you can sign off your commits by adding -s when doing the commit. So git commit -sm "comment"

You can fix this on an already committed thing by using git commit --amend -s and then force pushing to this branch.

@skjnldsv
Copy link
Member Author

skjnldsv commented Oct 21, 2016

Wait, signing with gpg isn't enough? 😢

@rullzer
Copy link
Member

rullzer commented Oct 21, 2016

@skjnldsv it has a different purpose. See https://github.com/nextcloud/server/blob/master/contribute/developer-certificate-of-origin

@skjnldsv
Template css order
3e5e07a 
Select2 systemtags removal
Settings again
Fix Script

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@jancborchardt
Copy link
Member

jancborchardt commented Oct 21, 2016

@skjnldsv yeah, sorry it’s a small addition in the workflow. :) At least you don’t need to sign a CLA and transfer all the rights to a company. 😉

@skjnldsv
Copy link
Member Author

skjnldsv commented Oct 21, 2016

No need to apologise! :D

@rullzer
Copy link
Member

rullzer commented Oct 21, 2016

Works!
LGTM

@LukasReschke
Copy link
Member

LukasReschke commented Oct 22, 2016

LGTM

@LukasReschke LukasReschke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 22, 2016
@LukasReschke LukasReschke merged commit 1be6213 into master Oct 22, 2016
@LukasReschke LukasReschke deleted the select2-into-core branch October 22, 2016 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessen nickvergessen nickvergessen left review comments

Assignees

@skjnldsv skjnldsv

Labels

4. to release Ready to be released and/or waiting for tests to finish design Design, UI, UX, etc. feature: settings feature: tags

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@skjnldsv @mention-bot @MorrisJobke @rullzer @jancborchardt @LukasReschke @nickvergessen