choosealicense.com

docs/choosealicense.com

Fork 0

mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

Commit Graph

Select branches

Hide Pull Requests

gh-pages

mlinksva-patch-1

spdx-license-templates

#1004

#1005

#1006

#1008

#1009

#101

#1013

#1014

#1018

#102

#1025

#1028

#103

#1034

#1035

#1035

#104

#1040

#1042

#105

#106

#1061

#1062

#1065

#1066

#107

#107

#108

#1081

#1089

#1096

#1097

#11

#11

#110

#1106

#1106

#1107

#111

#1115

#1118

#1122

#1122

#1123

#1124

#1124

#1129

#1130

#1131

#1133

#1134

#1135

#1136

#114

#114

#1141

#1142

#1142

#1143

#1144

#1144

#1145

#1145

#1146

#1146

#1147

#1147

#1148

#1148

#1149

#1149

#115

#1150

#1151

#1152

#1153

#1154

#1156

#1156

#1157

#1158

#116

#1162

#1163

#1163

#1169

#1169

#117

#1170

#1175

#1177

#1178

#118

#118

#1180

#1181

#1182

#1182

#1186

#1187

#1190

#1191

#1192

#12

#12

#120

#120

#1202

#1208

#121

#121

#1212

#1216

#1217

#1217

#122

#1220

#1222

#1223

#1225

#1228

#1229

#1229

#123

#1230

#1230

#1231

#1231

#1234

#1237

#1237

#1238

#124

#124

#1240

#1241

#1242

#1243

#1245

#125

#1251

#1251

#1252

#1252

#1253

#1257

#1258

#1259

#126

#1260

#1261

#1262

#127

#127

#129

#130

#131

#131

#132

#134

#135

#135

#137

#137

#138

#139

#14

#14

#140

#141

#142

#143

#144

#145

#146

#146

#147

#148

#149

#15

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#16

#160

#161

#162

#163

#164

#165

#166

#167

#169

#17

#17

#173

#174

#174

#175

#175

#176

#177

#177

#179

#18

#18

#180

#181

#182

#184

#185

#186

#188

#189

#19

#19

#190

#191

#191

#192

#193

#194

#194

#195

#197

#199

#2

#2

#200

#202

#204

#206

#207

#208

#209

#210

#214

#214

#215

#216

#216

#218

#22

#22

#220

#221

#224

#224

#227

#23

#23

#231

#232

#233

#234

#234

#236

#236

#237

#24

#24

#240

#244

#245

#246

#246

#247

#248

#248

#249

#25

#25

#250

#250

#251

#252

#253

#254

#256

#258

#26

#26

#260

#260

#262

#263

#263

#264

#266

#267

#27

#27

#274

#276

#277

#277

#278

#279

#28

#28

#280

#282

#283

#286

#293

#294

#295

#296

#300

#301

#302

#303

#304

#305

#306

#307

#308

#31

#31

#311

#312

#316

#317

#317

#318

#319

#32

#32

#320

#324

#325

#326

#327

#329

#330

#332

#333

#334

#336

#337

#338

#339

#340

#342

#343

#344

#345

#346

#347

#348

#349

#35

#35

#350

#351

#352

#353

#354

#357

#358

#359

#360

#361

#362

#363

#364

#365

#366

#368

#369

#371

#372

#373

#374

#376

#378

#379

#379

#38

#38

#382

#384

#385

#386

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#4

#400

#402

#403

#403

#405

#406

#408

#409

#411

#414

#414

#415

#416

#417

#417

#418

#419

#42

#42

#420

#421

#422

#423

#424

#425

#425

#426

#428

#429

#430

#432

#435

#436

#438

#439

#440

#442

#443

#446

#447

#448

#450

#451

#452

#453

#455

#456

#459

#462

#462

#467

#468

#469

#47

#47

#470

#470

#471

#471

#472

#473

#474

#475

#476

#477

#480

#482

#484

#486

#487

#487

#488

#489

#49

#49

#491

#492

#494

#495

#497

#50

#500

#502

#504

#504

#506

#507

#509

#510

#511

#511

#512

#514

#516

#517

#519

#520

#522

#523

#524

#526

#526

#527

#53

#53

#530

#530

#532

#535

#535

#537

#538

#539

#540

#543

#544

#545

#547

#549

#55

#55

#550

#551

#551

#552

#553

#553

#554

#555

#559

#56

#56

#560

#562

#563

#564

#565

#566

#567

#568

#569

#570

#571

#572

#573

#574

#574

#575

#577

#579

#58

#58

#580

#581

#581

#582

#583

#583

#584

#586

#586

#587

#588

#589

#59

#59

#590

#592

#593

#595

#597

#597

#598

#599

#60

#60

#600

#601

#603

#604

#605

#608

#609

#609

#610

#611

#612

#613

#614

#615

#616

#617

#618

#619

#62

#621

#622

#624

#625

#627

#628

#63

#63

#631

#632

#633

#635

#638

#638

#639

#640

#641

#641

#643

#644

#645

#647

#647

#648

#648

#649

#649

#650

#650

#651

#652

#654

#656

#657

#658

#659

#660

#661

#664

#665

#666

#667

#668

#669

#670

#671

#672

#672

#673

#674

#675

#676

#677

#677

#678

#679

#680

#681

#683

#683

#685

#686

#687

#69

#69

#690

#691

#692

#695

#696

#697

#698

#699

#7

#7

#70

#70

#700

#702

#704

#705

#706

#707

#709

#71

#710

#711

#714

#715

#716

#717

#719

#72

#72

#720

#720

#721

#722

#725

#727

#728

#728

#730

#731

#732

#735

#736

#737

#738

#741

#742

#744

#746

#747

#748

#749

#75

#75

#750

#751

#752

#753

#756

#756

#757

#759

#76

#76

#760

#765

#767

#768

#769

#77

#77

#770

#771

#772

#779

#78

#780

#784

#786

#787

#789

#79

#79

#790

#791

#793

#796

#797

#798

#799

#799

#8

#8

#80

#80

#800

#801

#801

#803

#803

#806

#81

#81

#810

#810

#811

#811

#812

#812

#814

#815

#817

#818

#819

#821

#823

#824

#829

#829

#83

#83

#831

#832

#833

#834

#835

#836

#838

#840

#841

#841

#842

#843

#844

#844

#845

#846

#849

#850

#851

#852

#852

#854

#86

#86

#862

#862

#864

#866

#866

#867

#867

#868

#868

#869

#869

#870

#870

#872

#872

#873

#873

#874

#874

#875

#877

#877

#878

#878

#879

#879

#88

#88

#880

#880

#881

#882

#883

#884

#885

#886

#887

#888

#889

#89

#89

#890

#891

#892

#893

#894

#895

#896

#897

#898

#899

#9

#9

#90

#90

#900

#901

#902

#903

#905

#907

#91

#91

#910

#911

#912

#916

#918

#921

#921

#922

#922

#926

#929

#93

#93

#934

#935

#936

#937

#94

#94

#943

#945

#947

#948

#949

#95

#95

#950

#951

#952

#953

#954

#955

#956

#957

#958

#959

#960

#961

#962

#963

#964

#965

#966

#967

#968

#969

#970

#971

#972

#973

#974

#975

#976

#977

#978

#979

#98

#98

#981

#982

#984

#99

#993

#993

#994

#995

4e5a68e5a9 Merge 87d2180ef94db4acf91d1310e7ef064ea1348671 into 544d8f45c81de8edc9dc20239d4005b38c3bddf4 engelnyst 2013-10-28 17:15:57 -07:00
544d8f45c8 Merge pull request #71 from weakish/gh-pages Phil Haack 2013-10-28 17:09:18 -07:00
73ef835ef2 Merge bb7c80b4c9488ab1ea74e3292eed0b123955e4fe into bb0906b57594c64b0796afb7e92c6ae383557e42 ncoghlan 2013-10-28 17:03:14 -07:00
536132b203 Merge 4cbba5aeff1d2b660a7446f4169c5219d2f78f0f into bb0906b57594c64b0796afb7e92c6ae383557e42 Aaron Weiss 2013-10-28 16:56:58 -07:00
95d34dc9bd Group licenses together Haacked 2013-10-28 16:10:43 -07:00
c16bf2fb88 Merge 716f735b27bc55095c0ab45ad9657f5cf559cc5c into bb0906b57594c64b0796afb7e92c6ae383557e42 wweber 2013-10-28 15:06:24 -07:00
bb0906b575 Merge pull request #110 from github/tekkub-patch-1 Phil Haack 2013-10-27 18:05:05 -07:00
b0797771e1 Kill email notifications Tekkub 2013-10-27 18:12:30 -06:00
7ec8e0630f Merge pull request #103 from IQAndreas/fix-artistic-license-formatting Phil Haack 2013-10-23 19:21:55 -07:00
1e50a84d47 Add fields for year and fullname Andreas Renberg (IQAndreas) 2013-10-24 02:53:20 +02:00
13e73e8682 Merge pull request #108 from github/gjtorikian-patch-1 Ben Balter 2013-10-23 15:19:11 -07:00
383f0dbb83 Add AddALicense.com Garen Torikian 2013-10-23 14:56:31 -07:00
edf26ee075 Merge d6c7959f9fdc9c6a4873de1fc6839988b39ad9ca into 677674114baafc970f30719033e75b53357f5bda Scott Chacon 2013-10-23 11:54:03 -07:00
d6c7959f9f scary to awesome Scott Chacon 2013-10-23 14:52:22 -04:00
677674114b fix indentation of projects using Eclipse Aidan Feldman 2013-10-23 09:43:11 -07:00
1aaa72baae Merge branch 'gh-pages' of github.com:waynebeaton/choosealicense.com into waynebeaton-gh-pages Aidan Feldman 2013-10-23 09:41:35 -07:00
ab44eabad2 Merge bee7665b869d8e336376e5275392b7e3c2d9db90 into 96bff79ddc3910cebf92979dd4be805f0fb0e51f Wayne Beaton 2013-10-23 09:38:23 -07:00
96bff79ddc Merge pull request #104 from github/html-proofer Aidan Feldman 2013-10-23 09:31:58 -07:00
31177b66b8 Merge pull request #102 from github/fix-using Aidan Feldman 2013-10-23 09:31:48 -07:00
44341c5bc7 Merge pull request #106 from github/tools Aidan Feldman 2013-10-23 09:12:38 -07:00
cd4c3ae9b7 Merge pull request #105 from github/build-status Aidan Feldman 2013-10-23 09:12:25 -07:00
6a028997c4 include list of tools Aidan Feldman 2013-10-23 00:56:24 -07:00
d967bf06a7 display build status in readme Aidan Feldman 2013-10-23 00:37:21 -07:00
27ff916e91 build gh-pages branch on travis Aidan Feldman 2013-10-23 00:37:09 -07:00
08bba211da make testing instructions match travis build steps Aidan Feldman 2013-10-23 00:28:50 -07:00
d0f2cc3424 run html-proofing as part of travis build Aidan Feldman 2013-10-23 00:23:57 -07:00
b5ff5db785 tweaks to make html-proofing pass Aidan Feldman 2013-10-23 00:20:44 -07:00
0527976cee add HTML::Proofer Aidan Feldman 2013-10-23 00:07:51 -07:00
af62acc3f6 remove garbage 'using' link Aidan Feldman 2013-10-22 23:58:11 -07:00
1b5debd6bf fix 'using' display in sidebar Aidan Feldman 2013-10-22 23:55:54 -07:00
c3f8ee7c88 Use the plaintext formatting of the Artistic License 2.0 Andreas Renberg (IQAndreas) 2013-10-23 08:53:11 +02:00
a5b5d4ade7 Merge pull request #101 from IQAndreas/fix-missing-sources Aidan Feldman 2013-10-22 23:37:33 -07:00
dc58abef62 Add license sources where missing Andreas Renberg (IQAndreas) 2013-10-23 08:09:55 +02:00
800d8bbdb8 Only include link to source if one has been provided Andreas Renberg (IQAndreas) 2013-10-23 07:37:32 +02:00
686367b1e0 Merge pull request #99 from IQAndreas/fix-apache-formatting Phil Haack 2013-10-22 09:00:52 -07:00
f07c1f9beb Change braces to match the rest of the site Andreas Renberg (IQAndreas) 2013-10-22 14:21:04 +02:00
d2b1145e6d Switch to use the plaintext formatting for Apache License Andreas Renberg (IQAndreas) 2013-10-22 14:14:30 +02:00
bee7665b86 Updated the description and using statements in eclipse.txt Wayne Beaton 2013-10-17 13:59:11 -04:00
73aab7b9a0 Added zlib license Nick Lockwood 2013-09-26 14:41:21 +01:00
a75d9e1b0f Merge pull request #94 from github/remove-callout-class Jason Long 2013-09-26 04:55:05 -07:00
6905a28136 Merge 02470e2452875e9c5ea6f9b722313cb5ab5444e6 into 58272d537b1b60e7841c9bc598cdd5ef2ad7a856 Jason Long 2013-09-26 04:45:01 -07:00
02470e2452 removed unused callout class Jason Long 2013-09-26 07:43:15 -04:00
58272d537b Merge pull request #93 from github/better-text-contrast Phil Haack 2013-09-25 09:01:20 -07:00
ceac38a69f Merge 85755edd74f8c0a020df9dff2d1c0998f0228a1c into 1613f337d59b7b458930fd8201932956eb170f4d Jason Long 2013-09-25 06:09:35 -07:00
85755edd74 put license text in lighter container for better contrast Jason Long 2013-09-25 08:58:07 -04:00
fffcebbbb1 Merge 3b95be5ee64fcf2aa1f3486314d719203c9b0c24 into 1613f337d59b7b458930fd8201932956eb170f4d Jou Sung-Shik 2013-09-20 03:27:56 -07:00
1613f337d5 Merge pull request #56 from rohieb/gh-pages Aidan Feldman 2013-09-16 13:51:53 -07:00
1f864745a1 Merge 3edf479745e250219579a02e739632f10bfb3de3 into abd17d181f4d9ef05d7b18be09d9f72d42d89981 Roland Hieber 2013-09-16 13:50:15 -07:00
efd1517074 Merge 688abde66cc8d9512eaf17e9a56917f77436cffe into abd17d181f4d9ef05d7b18be09d9f72d42d89981 camillem 2013-09-16 13:42:47 -07:00
abd17d181f Merge pull request #77 from engelnyst/rephrase Aidan Feldman 2013-09-16 13:12:49 -07:00
0ab6e98736 Merge a0e3974eb3a87bba67895b0637455d738fc1a719 into a5f4538c000a2faa3e3840bed2d8e95ef5423895 engelnyst 2013-09-16 13:11:54 -07:00
a5f4538c00 Merge pull request #89 from github/cc Phil Haack 2013-09-16 13:03:33 -07:00
1dc503294d Merge b2892098a00561009efa9e48757f1e34832e35a1 into a35e09a45bff3795a7292aa5395ee2432fa6d964 Aidan Feldman 2013-09-16 12:47:42 -07:00
b2892098a0 tighten up index part deux copy Ben Balter 2013-09-16 15:47:27 -04:00
f03c77d9fa separate first and second row of homepage questions Aidan Feldman 2013-09-16 15:42:21 -04:00
6e91d6b529 change text of second row homepage questions to be consistent with the first Aidan Feldman 2013-09-16 15:39:10 -04:00
b4e302a73c increase vertical spacing between homepage questions Aidan Feldman 2013-09-16 15:38:22 -04:00
0177da529a reorder homepage questions Aidan Feldman 2013-09-16 15:17:53 -04:00
837cb3e1d2 reduce text in the homepage FAQ Aidan Feldman 2013-09-16 15:17:02 -04:00
a47bbeea43 make the additinal homepage questions side-by-side Aidan Feldman 2013-09-16 15:16:10 -04:00
be6def2b46 Merge remote-tracking branch 'origin/gh-pages' into cc Aidan Feldman 2013-09-16 14:35:43 -04:00
a35e09a45b Merge pull request #90 from github/resources Aidan Feldman 2013-09-16 11:24:20 -07:00
57e200dc9f Merge 97a644642021b954dcba007d0f4641f4cb29653e into 27b6b5222de1645c513a445730b673653660e16c Aidan Feldman 2013-09-16 11:21:35 -07:00
97a6446420 convert resource list to kramdown syntax Aidan Feldman 2013-09-16 14:21:19 -04:00
972ae57106 Merge remote-tracking branch 'origin/gh-pages' into resources Aidan Feldman 2013-09-16 14:12:24 -04:00
27b6b5222d Merge pull request #91 from github/kramdown Aidan Feldman 2013-09-16 11:10:50 -07:00
c0697cf19c Merge 5cb937aa9d255f05d1967f0352f5ec2fbcdc9d48 into a21fe69a2a2ba2e44cbc52b3aee2c1f1fc87ff06 Ben Balter 2013-09-16 11:08:34 -07:00
5cb937aa9d use kramdown to process markdown Ben Balter 2013-09-16 14:06:50 -04:00
a21fe69a2a Merge pull request #88 from github/ruby-version Ben Balter 2013-09-15 11:30:21 -07:00
08c0635e0a include list of resources Aidan Feldman 2013-09-14 02:15:12 -04:00
5126e72b4a add line re: non-code projects Aidan Feldman 2013-09-14 00:57:53 -04:00
d2e717b14c Merge 678ae0686f201426d7b5bb5d3e54ef907c12e5f5 into 09c99b4ab447673b1a844e55ff610aea31930a2f Aidan Feldman 2013-09-13 21:42:15 -07:00
678ae0686f upgrade ruby version for travis Aidan Feldman 2013-09-14 00:42:13 -04:00
319bd3677e upgrade to gh-pages 4 Aidan Feldman 2013-09-14 00:39:58 -04:00
29c9fe142a specify required ruby version Aidan Feldman 2013-09-14 00:35:25 -04:00
d4733742c5 standardize license descriptions ashley williams 2013-09-11 12:05:04 -04:00
a535303a77 word wrap 80col ashley williams 2013-09-11 12:00:26 -04:00
6794ac34cc Merge branch 'gh-pages' of github.com:jmburges/choosealicense.com into gh-pages ashley williams 2013-09-11 11:57:36 -04:00
695209a283 adding CC by-nc-nd 3.0 license ashley williams 2013-09-11 11:55:59 -04:00
72b07ba29a Merge branch 'gh-pages' of https://github.com/jmburges/choosealicense.com into gh-pages Joe Burgess 2013-09-11 11:53:18 -04:00
d65a4eb8cb Adding Creative Commons By-SA Joe Burgess 2013-09-11 11:52:43 -04:00
39bcc97424 adding cc by-nd 3.0 license ashley williams 2013-09-11 11:51:16 -04:00
ed280a3010 Wrapping at 80 Characters Joe Burgess 2013-09-11 11:49:36 -04:00
9de0d93018 Adding trailing "/" to permalink Joe Burgess 2013-09-11 11:47:56 -04:00
49b2407ef7 add slash to fi link ashley williams 2013-09-11 11:47:31 -04:00
a5cee5aa74 Adding Creative Common By-NC License Joe Burgess 2013-09-11 11:47:04 -04:00
4203c1880e adding CC by 3.0 license ashley williams 2013-09-11 11:45:41 -04:00
0b03c23513 Adding CC by-nc-sa 3.0 license Joe Burgess 2013-09-11 11:40:49 -04:00
9bb7afb09e Adding in Non-Commercial to forbidden Joe Burgess 2013-09-11 11:38:54 -04:00
b17961c2ec Adding Attribution tag to required options Joe Burgess 2013-09-11 11:37:54 -04:00
87d2180ef9 OK, additional is still better instead of explicit. It suggests it's by difference to v2 (as it should) and keeps the same wordcount. enyst 2013-08-22 00:49:10 +03:00
240a7b57d3 Documented more neutrally the additional properties of v3 vs v2, thanks to R. Fontana. The added provisions are enumerated, without interpretation. enyst 2013-08-20 21:01:45 +03:00
09c99b4ab4 Merge pull request #79 from engelnyst/gpl Phil Haack 2013-08-27 08:17:57 -07:00
ddbc6c738b Merge a509d32214a4dec3654048c912f8e905641f8b62 into 1050344f92a7be13d1a3696013d54cf1b7823876 James McKinney 2013-08-23 16:39:34 -07:00
c64932ec13 Merge 1487e9af5033592af02b8771d2c641907ec6bca4 into 1050344f92a7be13d1a3696013d54cf1b7823876 engelnyst 2013-08-21 14:25:38 -07:00
1050344f92 Merge pull request #81 from pathawks/gh-pages Phil Haack 2013-08-20 10:12:11 -07:00
dcb37698a6 Merge d32dc360eab42c1888b0839b290aa6d6de68bc34 into 787459658534c4b6f205bc7527105a3f3e355361 Pat Hawks 2013-08-19 22:38:09 -07:00
d32dc360ea Compress images Pat Hawks 2013-08-20 01:34:27 -04:00
a0e3974eb3 Added "legal" qualifier to clarify a legal professional is advisable. enyst 2013-08-19 23:55:46 +03:00
be016feab0 Merge 04bde23e8d9abf3b8607dac2509783aa1de243ea into 787459658534c4b6f205bc7527105a3f3e355361 engelnyst 2013-08-19 13:52:09 -07:00