1
0
mirror of https://github.com/github/choosealicense.com synced 2024-06-29 07:03:02 +02:00
Commit Graph

586 Commits

Author SHA1 Message Date
sampablokuper
6e2de93780 Remove untenable assertion from goals
Whether in civil rights, human rights, land rights, "intellectual
property" rights (as in this case) or any other rights, the act of
deciding who ought to be granted which rights in which circumstances is
not only inherently political, it is the very essence of politics.
Therefore, it is preposterous for choosealicense.com, if it is to be
meaningful, to aim to be "Politics Free".

This edit takes into account feedback from @tekkub on my initial pull
request.
2014-09-10 13:48:59 +01:00
sampablokuper
206a356934 Remove false assertion from goals
Whether in civil rights, human rights, land rights, "intellectual property" rights (as in this case) or any other rights, the act of deciding who ought to be granted which rights in which circumstances is not only inherently political, it is the very essence of politics. Therefore, it is preposterous for choosealicense.com, if it is to be meaningful, to aim to be "Politics Free".
2014-09-09 23:00:14 +01:00
Ben Balter
4cbb57378f Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into gh-pages 2014-09-05 11:47:52 -04:00
Ben Balter
0f652f971e link directly to apache and gpl from homepage, fixes #212 2014-09-05 11:47:43 -04:00
Ben Balter
324de45da1 Merge pull request #215 from github/jekyll2
Upgrade to Jekyll2
2014-09-05 11:32:34 -04:00
Ben Balter
4ec63be944 exclude vendored tests from proofer 2014-09-05 11:32:41 -04:00
Ben Balter
580082f408 fix tooltips 2014-09-05 11:26:54 -04:00
Ben Balter
09b245ec27 whitespace 2014-09-05 11:14:07 -04:00
Ben Balter
a06987c6bd 💎 bump 2014-09-05 11:09:04 -04:00
Ben Balter
c1cd6f08ac jsonify licenses.json 2014-07-31 12:39:58 -04:00
Ben Balter
22cc77f12b first pass at jekyll2ification 2014-07-31 12:36:56 -04:00
Ben Balter
a7f23839df resolve bsd rediret loop 2014-06-27 17:32:43 -04:00
Ben Balter
0b4b7d844f Merge pull request #209 from github/spdx
Using SPDX standard names and IDs for licenses
2014-06-22 15:52:02 -04:00
Ben Balter
967fc6f4c1 Merge branch 'gh-pages' into spdx 2014-06-22 15:51:36 -04:00
Ben Balter
0602a709e6 passing tests 2014-06-22 15:46:01 -04:00
Ben Balter
c3848181b4 lowercase gpl link 2014-06-22 15:42:08 -04:00
Ben Balter
e99cb27026 s/fom/from/ 2014-06-22 15:41:38 -04:00
Ben Balter
554a5acddf Merge pull request #204 from ax3l/topic-agplSaaS
AGPL: Highlight the Affero Feature
2014-06-19 11:36:25 -04:00
Axel Huebl
9ddb6fff14 Use the More General "Network Use is Distribution"
thanks to @parkr !
2014-06-19 11:21:58 +02:00
Axel Huebl
991ec3c4e4 AGPL: Highlight the Affero Feature
This is a follow up to #197

A new point in the "required" section of the AGPL
highlights the difference to the plain GPL.
It states that running a network service of the software
triggers the disclose-source requirement, e.g. in SaaS use cases.

This is my personal interpretation of the paragraph 13 AGPL, IANAL.

Comments are welcome!
2014-06-19 11:21:58 +02:00
Ben Balter
5b26f56796 Merge pull request #207 from github/jsonify
Use jsonify to build license json
2014-06-17 17:27:15 -04:00
Ben Balter
4364328513 Merge pull request #208 from github/bsd-project-var
Use [project] not {organization} in BSD-3 clause
2014-06-17 17:26:57 -04:00
Ben Balter
6ff2728043 cleaner gplv3 diff 2014-06-17 13:09:55 -04:00
Ben Balter
90862fe988 downcase unlicense permalink 2014-06-17 13:09:21 -04:00
Ben Balter
1c3cd29f6e clean up unlicense metadata 2014-06-17 13:09:00 -04:00
Ben Balter
bf54584c82 add source back to unlinces 2014-06-17 13:08:07 -04:00
Ben Balter
b2c5f26ed6 remove double layout in gplv3 2014-06-17 13:07:21 -04:00
Ben Balter
5346f5821e remove whitepsace in gpl 2014-06-17 13:06:52 -04:00
Ben Balter
383c5ea2f6 resolve merge conflict in BSD 2014-06-17 13:06:26 -04:00
Ben Balter
79513f0975 downcase all filenames, resolve merge conflicts 2014-06-17 13:00:30 -04:00
Ben Balter
31d4116c53 swap project for organization 2014-06-17 12:45:15 -04:00
Ben Balter
067e4cd5e6 add jekyll-redirect-from to config.yml 2014-06-17 11:55:24 -04:00
Ben Balter
322e41407d Merge branch 'alejandrosantana-gh-pages' into gh-pages 2014-06-17 11:52:39 -04:00
Ben Balter
8a542b1268 Merge branch 'gh-pages' of https://github.com/alejandrosantana/choosealicense.com into alejandrosantana-gh-pages 2014-06-17 11:52:25 -04:00
Ben Balter
33e00d098e use jsonify to build license json 2014-06-17 11:41:40 -04:00
Ben Balter
74f0cbddc8 Merge pull request #206 from ciarand/fix-licenses-dot-json-endpoint
Remove licenses.json from the exclude list
2014-06-17 11:36:44 -04:00
Alejandro Santana
e0666e52ce [IMP] Added redirect_from policy to agpl-v3.txt 2014-06-17 11:34:31 +02:00
Ciaran Downey
fc3f332966 Remove licenses.json from the exclude list 2014-06-16 16:15:14 -07:00
Ben Balter
7e6a492a57 Merge pull request #197 from kappa7194/patch-1
Missing "patent grant" feature in AGPL
2014-06-15 21:00:40 -04:00
Ben Balter
97be9eef9a Merge branch 'juanfra684-isc' into gh-pages 2014-06-14 15:00:04 -04:00
Ben Balter
a9ee5cf9cb make ISC primary BSD-style license 2014-06-14 14:59:49 -04:00
Ben Balter
a79db54b5d Merge branch 'isc' of https://github.com/juanfra684/choosealicense.com into juanfra684-isc 2014-06-14 14:47:50 -04:00
Alejandro Santana
b744b704ba [DEL] Deleted agpl-v1.txt and agpl-v2.txt to avoid bloating, as agpl-v3 is intented to replace those previous versions. 2014-06-06 18:42:00 +02:00
Alejandro Santana
f4260aad10 [FIX] Fixed tab-slug in agpl-v3.txt 2014-06-05 09:53:47 +02:00
Alejandro Santana
9628170ed4 [FIX][ADD] Renamed agpl.txt to agpl-v3.txt to match the license contained (GNU AGPL-v3). Also added licenses agpl-v1.txt and agpl-v2.txt (not GNU) 2014-06-05 09:49:53 +02:00
Juan Francisco Cantero Hurtado
52adce23ab Typo 2014-06-02 22:31:22 +02:00
Ben Balter
d2c3db8a7d Merge pull request #199 from pathawks/sitemap
Use jekyll-sitemap plugin
2014-05-09 08:43:03 -04:00
Pat Hawks
2c5a524778 bundle update 2014-05-08 22:28:29 -07:00
Pat Hawks
0dbb5bfa8d Use *jekyll-sitemap* plugin for sitemap 2014-05-06 18:34:22 -07:00
Albireo
7a80bef759 Missing "patent grant" feature in AGPL
The AGPL license is missing the "patent grant" feature in the "permitted" category.

Unless I'm mistaken [section 11](http://www.gnu.org/licenses/agpl-3.0.html#section11) of the license is about granting patents licenses (it's the same text found in [GPLv3's section 11](http://www.gnu.org/licenses/gpl-3.0.html#section11)).
2014-04-22 12:14:48 +02:00