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.

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

Update README and Shaarli's footer #109

Merged
merged 2 commits into from
Feb 14, 2015
Merged

Update README and Shaarli's footer #109

merged 2 commits into from
Feb 14, 2015

Conversation

nodiscc
Copy link
Member

@nodiscc nodiscc commented Feb 4, 2015

@pikzen
Copy link

pikzen commented Feb 5, 2015

http://blog.idleman.fr/ is no longer credited in the footer nor in COPYING for the original theme. Perhaps it should be added ?

@nodiscc nodiscc self-assigned this Feb 5, 2015
@nodiscc
Copy link
Member Author

nodiscc commented Feb 7, 2015

I had to update info in COPYING as it missed credits to idleman for the original CSS, and Yahoo Inc. for the CSS reset. reset and main CSS were split in 2 distinct files. @e2jk agree to merge?

@nodiscc nodiscc removed their assignment Feb 7, 2015
@e2jk
Copy link

e2jk commented Feb 7, 2015

I would remove the "wish" part in the sentence

he would have no time/wish to work on Shaarli

I think that fundamentally @sebsauvage still wants to work on Shaarli, but just that he doesn't have the time.

2 bits regarding the link to "Shaarli community" in the footer:

  • Put the space out of the link
  • Link to the root of the github repository instead of the COPYING file. This link is not meant to be a list of contributors, but to the homepage of the product, as was the case with the old link to the wiki page.

Since this pull request is touching copyright information, please add a mention of RainTPL. This is how I have it documented in the Debian package (I notice that the upstream file now contains more information about all the logos, I'll need to update my Debian file accordingly):

Files: inc/rain.tpl.class.php
Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
           2011-2012, The Rain Team <hello@raintm.com>
License: LGPL-3+

@nodiscc nodiscc self-assigned this Feb 11, 2015
@nodiscc
Copy link
Member Author

nodiscc commented Feb 12, 2015

@e2jk I fixed the points you mentioned. Let me know if this is ok to merge, I'd like to squash the commits to only have 2 in the history (Update README and Shaarli's footer and Fix missing authors and licenses in COPYING) befor merging.

@nodiscc nodiscc added the cleanup code cleanup and refactoring label Feb 12, 2015
@e2jk
Copy link

e2jk commented Feb 13, 2015

Yes, looks good. Go ahead with commit squashing.

 * remove version number display from main page
 * update project URL in footer, fixes #89
 * update copyright notice in the footer
 * mention origins of the fork in README, fixes #105
 * update License section in the README
 * remove screenshots as mediacru.sh is down
 * add idleman for original CSS
 * add yahoo inc. for CSS reset
 * split the main css code and the yahoo reset CSS in 2 files
 * add copyright information for RainTPL, add LGPL license
nodiscc added a commit that referenced this pull request Feb 14, 2015
Update README and Shaarli's footer
@nodiscc nodiscc merged commit 97f7ac4 into shaarli:master Feb 14, 2015
@nodiscc
Copy link
Member Author

nodiscc commented Feb 14, 2015

Merged, thanks.

@nodiscc nodiscc deleted the version-check branch February 14, 2015 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cleanup code cleanup and refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mention origins of the fork in the README Update footer
3 participants