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

Shall we call this "taking the trash out" ? #39

Merged
merged 2 commits into from Dec 24, 2015

Conversation

Projects
None yet
2 participants
@Antes
Contributor

Antes commented Dec 15, 2015

This is not really a finished PR, but for starting it takes out the trash which is removed with SMF2.1. Some places are broken, some are lacking styling but as i said its enough for starting.

Shall we call this "taking the trash out" ?
Signed-off-by: Antes <antes@simplemachines.org>
@Antes

This comment has been minimized.

Show comment
Hide comment
@Antes

Antes Dec 15, 2015

Contributor

I'm not sure what is causing this "conflict" but It would be nice to know :P.

Edit: Okay fixed the issue, please test the changes 🐾

Contributor

Antes commented Dec 15, 2015

I'm not sure what is causing this "conflict" but It would be nice to know :P.

Edit: Okay fixed the issue, please test the changes 🐾

Merge branch 'smf21' of git://github.com/SimpleDesk/SimpleDesk into c…
…hanges

# Conflicts:
#	css/helpdesk.css
#	css/helpdesk_admin.css

Signed-off-by: Antes <antes@simplemachines.org>

jdarwood007 added a commit that referenced this pull request Dec 24, 2015

Merge pull request #39 from Antes/changes
Shall we call this "taking the trash out" ?

@jdarwood007 jdarwood007 merged commit b9de5aa into SimpleDesk:smf21 Dec 24, 2015

@jdarwood007

This comment has been minimized.

Show comment
Hide comment
@jdarwood007

jdarwood007 Dec 24, 2015

Member

This broke a few things, but it is going to be easier to fix them now that this has been merged in.

Member

jdarwood007 commented Dec 24, 2015

This broke a few things, but it is going to be easier to fix them now that this has been merged in.

@Antes

This comment has been minimized.

Show comment
Hide comment
@Antes

Antes Dec 24, 2015

Contributor

Yea, I'm aware of those broken things but due to my personal schedule I can start working on both SD/SMF after 8 of Jan :(

FYI: This work is not complete there are lots of things needs to be changed, especially icons used here mostly inside SMF2.1's default image sprite.

Contributor

Antes commented Dec 24, 2015

Yea, I'm aware of those broken things but due to my personal schedule I can start working on both SD/SMF after 8 of Jan :(

FYI: This work is not complete there are lots of things needs to be changed, especially icons used here mostly inside SMF2.1's default image sprite.

jdarwood007 added a commit to jdarwood007/SimpleDesk that referenced this pull request Dec 24, 2015

! Fixed some issues caused by SimpleDesk#39
Signed-off-by: jdarwood007 <unmonitored+github@sleepycode.com>
@jdarwood007

This comment has been minimized.

Show comment
Hide comment
@jdarwood007

jdarwood007 Dec 24, 2015

Member

No problem, just pushed up a fix that does some patching to the things I can notice right away. Most of it is due to the ids being removed which are needed by the javascript to do fancy stuff.

Member

jdarwood007 commented Dec 24, 2015

No problem, just pushed up a fix that does some patching to the things I can notice right away. Most of it is due to the ids being removed which are needed by the javascript to do fancy stuff.

@Antes Antes deleted the Antes:changes branch Oct 23, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment