Skip to content
This repository
Browse code

Updating release notes and LICENSE for Fragaria syntax highlighting l…

…ibrary
  • Loading branch information...
commit 8a7921dbddd167f44ab3f4b6773b43c25ebae5f2 1 parent 6c85e37
Mike Mattozzi authored May 13, 2012
227  LICENSE.txt
... ...
@@ -1,4 +1,4 @@
1  
-Copyright (c) 2011, Michael Mattozzi
  1
+Copyright (c) 2010-2012, Michael Mattozzi
2 2
 All rights reserved.
3 3
 
4 4
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -8,7 +8,17 @@ Redistributions in binary form must reproduce the above copyright notice, this l
8 8
 Neither the name of Michael Mattozzi nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
9 9
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10 10
 
11  
-License for embedded json-framework (http://stig.github.com/json-framework/)
  11
+*******************************************************************************
  12
+  Third Party Licenses for frameworks included in CocoaRestClient
  13
+*******************************************************************************
  14
+
  15
+1. json-framework (http://stig.github.com/json-framework/)
  16
+2. Sparkle update framework (https://github.com/andymatuschak/Sparkle)
  17
+3. Frageria Syntax Highlighting (https://github.com/mugginsoft/Fragaria)
  18
+
  19
+*******************************************************************************
  20
+
  21
+1. License for embedded json-framework (http://stig.github.com/json-framework/)
12 22
 
13 23
 Copyright (C) 2007–2010 Stig Brautaset. All rights reserved.
14 24
 
@@ -19,8 +29,9 @@ Redistributions in binary form must reproduce the above copyright notice, this l
19 29
 Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
20 30
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
21 31
 
  32
+*******************************************************************************
22 33
 
23  
-License for Sparkle update framework (https://github.com/andymatuschak/Sparkle)
  34
+2. License for Sparkle update framework (https://github.com/andymatuschak/Sparkle)
24 35
 
25 36
 Copyright (c) 2006 Andy Matuschak
26 37
 
@@ -174,4 +185,212 @@ License for bspatch.c and bsdiff.c, from bsdiff 4.3 (<http://www.daemonology.net
174 185
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
175 186
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
176 187
 * POSSIBILITY OF SUCH DAMAGE.
177  
-*/
  188
+*/
  189
+
  190
+*******************************************************************************
  191
+
  192
+3. License for Frageria Syntax Highlighting (https://github.com/mugginsoft/Fragaria)
  193
+
  194
+Copyright 2010 mugginsoft.com. All rights reserved.
  195
+
  196
+                                 Apache License
  197
+                           Version 2.0, January 2004
  198
+                        http://www.apache.org/licenses/
  199
+
  200
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
  201
+
  202
+   1. Definitions.
  203
+
  204
+      "License" shall mean the terms and conditions for use, reproduction,
  205
+      and distribution as defined by Sections 1 through 9 of this document.
  206
+
  207
+      "Licensor" shall mean the copyright owner or entity authorized by
  208
+      the copyright owner that is granting the License.
  209
+
  210
+      "Legal Entity" shall mean the union of the acting entity and all
  211
+      other entities that control, are controlled by, or are under common
  212
+      control with that entity. For the purposes of this definition,
  213
+      "control" means (i) the power, direct or indirect, to cause the
  214
+      direction or management of such entity, whether by contract or
  215
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
  216
+      outstanding shares, or (iii) beneficial ownership of such entity.
  217
+
  218
+      "You" (or "Your") shall mean an individual or Legal Entity
  219
+      exercising permissions granted by this License.
  220
+
  221
+      "Source" form shall mean the preferred form for making modifications,
  222
+      including but not limited to software source code, documentation
  223
+      source, and configuration files.
  224
+
  225
+      "Object" form shall mean any form resulting from mechanical
  226
+      transformation or translation of a Source form, including but
  227
+      not limited to compiled object code, generated documentation,
  228
+      and conversions to other media types.
  229
+
  230
+      "Work" shall mean the work of authorship, whether in Source or
  231
+      Object form, made available under the License, as indicated by a
  232
+      copyright notice that is included in or attached to the work
  233
+      (an example is provided in the Appendix below).
  234
+
  235
+      "Derivative Works" shall mean any work, whether in Source or Object
  236
+      form, that is based on (or derived from) the Work and for which the
  237
+      editorial revisions, annotations, elaborations, or other modifications
  238
+      represent, as a whole, an original work of authorship. For the purposes
  239
+      of this License, Derivative Works shall not include works that remain
  240
+      separable from, or merely link (or bind by name) to the interfaces of,
  241
+      the Work and Derivative Works thereof.
  242
+
  243
+      "Contribution" shall mean any work of authorship, including
  244
+      the original version of the Work and any modifications or additions
  245
+      to that Work or Derivative Works thereof, that is intentionally
  246
+      submitted to Licensor for inclusion in the Work by the copyright owner
  247
+      or by an individual or Legal Entity authorized to submit on behalf of
  248
+      the copyright owner. For the purposes of this definition, "submitted"
  249
+      means any form of electronic, verbal, or written communication sent
  250
+      to the Licensor or its representatives, including but not limited to
  251
+      communication on electronic mailing lists, source code control systems,
  252
+      and issue tracking systems that are managed by, or on behalf of, the
  253
+      Licensor for the purpose of discussing and improving the Work, but
  254
+      excluding communication that is conspicuously marked or otherwise
  255
+      designated in writing by the copyright owner as "Not a Contribution."
  256
+
  257
+      "Contributor" shall mean Licensor and any individual or Legal Entity
  258
+      on behalf of whom a Contribution has been received by Licensor and
  259
+      subsequently incorporated within the Work.
  260
+
  261
+   2. Grant of Copyright License. Subject to the terms and conditions of
  262
+      this License, each Contributor hereby grants to You a perpetual,
  263
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
  264
+      copyright license to reproduce, prepare Derivative Works of,
  265
+      publicly display, publicly perform, sublicense, and distribute the
  266
+      Work and such Derivative Works in Source or Object form.
  267
+
  268
+   3. Grant of Patent License. Subject to the terms and conditions of
  269
+      this License, each Contributor hereby grants to You a perpetual,
  270
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
  271
+      (except as stated in this section) patent license to make, have made,
  272
+      use, offer to sell, sell, import, and otherwise transfer the Work,
  273
+      where such license applies only to those patent claims licensable
  274
+      by such Contributor that are necessarily infringed by their
  275
+      Contribution(s) alone or by combination of their Contribution(s)
  276
+      with the Work to which such Contribution(s) was submitted. If You
  277
+      institute patent litigation against any entity (including a
  278
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
  279
+      or a Contribution incorporated within the Work constitutes direct
  280
+      or contributory patent infringement, then any patent licenses
  281
+      granted to You under this License for that Work shall terminate
  282
+      as of the date such litigation is filed.
  283
+
  284
+   4. Redistribution. You may reproduce and distribute copies of the
  285
+      Work or Derivative Works thereof in any medium, with or without
  286
+      modifications, and in Source or Object form, provided that You
  287
+      meet the following conditions:
  288
+
  289
+      (a) You must give any other recipients of the Work or
  290
+          Derivative Works a copy of this License; and
  291
+
  292
+      (b) You must cause any modified files to carry prominent notices
  293
+          stating that You changed the files; and
  294
+
  295
+      (c) You must retain, in the Source form of any Derivative Works
  296
+          that You distribute, all copyright, patent, trademark, and
  297
+          attribution notices from the Source form of the Work,
  298
+          excluding those notices that do not pertain to any part of
  299
+          the Derivative Works; and
  300
+
  301
+      (d) If the Work includes a "NOTICE" text file as part of its
  302
+          distribution, then any Derivative Works that You distribute must
  303
+          include a readable copy of the attribution notices contained
  304
+          within such NOTICE file, excluding those notices that do not
  305
+          pertain to any part of the Derivative Works, in at least one
  306
+          of the following places: within a NOTICE text file distributed
  307
+          as part of the Derivative Works; within the Source form or
  308
+          documentation, if provided along with the Derivative Works; or,
  309
+          within a display generated by the Derivative Works, if and
  310
+          wherever such third-party notices normally appear. The contents
  311
+          of the NOTICE file are for informational purposes only and
  312
+          do not modify the License. You may add Your own attribution
  313
+          notices within Derivative Works that You distribute, alongside
  314
+          or as an addendum to the NOTICE text from the Work, provided
  315
+          that such additional attribution notices cannot be construed
  316
+          as modifying the License.
  317
+
  318
+      You may add Your own copyright statement to Your modifications and
  319
+      may provide additional or different license terms and conditions
  320
+      for use, reproduction, or distribution of Your modifications, or
  321
+      for any such Derivative Works as a whole, provided Your use,
  322
+      reproduction, and distribution of the Work otherwise complies with
  323
+      the conditions stated in this License.
  324
+
  325
+   5. Submission of Contributions. Unless You explicitly state otherwise,
  326
+      any Contribution intentionally submitted for inclusion in the Work
  327
+      by You to the Licensor shall be under the terms and conditions of
  328
+      this License, without any additional terms or conditions.
  329
+      Notwithstanding the above, nothing herein shall supersede or modify
  330
+      the terms of any separate license agreement you may have executed
  331
+      with Licensor regarding such Contributions.
  332
+
  333
+   6. Trademarks. This License does not grant permission to use the trade
  334
+      names, trademarks, service marks, or product names of the Licensor,
  335
+      except as required for reasonable and customary use in describing the
  336
+      origin of the Work and reproducing the content of the NOTICE file.
  337
+
  338
+   7. Disclaimer of Warranty. Unless required by applicable law or
  339
+      agreed to in writing, Licensor provides the Work (and each
  340
+      Contributor provides its Contributions) on an "AS IS" BASIS,
  341
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
  342
+      implied, including, without limitation, any warranties or conditions
  343
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
  344
+      PARTICULAR PURPOSE. You are solely responsible for determining the
  345
+      appropriateness of using or redistributing the Work and assume any
  346
+      risks associated with Your exercise of permissions under this License.
  347
+
  348
+   8. Limitation of Liability. In no event and under no legal theory,
  349
+      whether in tort (including negligence), contract, or otherwise,
  350
+      unless required by applicable law (such as deliberate and grossly
  351
+      negligent acts) or agreed to in writing, shall any Contributor be
  352
+      liable to You for damages, including any direct, indirect, special,
  353
+      incidental, or consequential damages of any character arising as a
  354
+      result of this License or out of the use or inability to use the
  355
+      Work (including but not limited to damages for loss of goodwill,
  356
+      work stoppage, computer failure or malfunction, or any and all
  357
+      other commercial damages or losses), even if such Contributor
  358
+      has been advised of the possibility of such damages.
  359
+
  360
+   9. Accepting Warranty or Additional Liability. While redistributing
  361
+      the Work or Derivative Works thereof, You may choose to offer,
  362
+      and charge a fee for, acceptance of support, warranty, indemnity,
  363
+      or other liability obligations and/or rights consistent with this
  364
+      License. However, in accepting such obligations, You may act only
  365
+      on Your own behalf and on Your sole responsibility, not on behalf
  366
+      of any other Contributor, and only if You agree to indemnify,
  367
+      defend, and hold each Contributor harmless for any liability
  368
+      incurred by, or claims asserted against, such Contributor by reason
  369
+      of your accepting any such warranty or additional liability.
  370
+
  371
+   END OF TERMS AND CONDITIONS
  372
+
  373
+   APPENDIX: How to apply the Apache License to your work.
  374
+
  375
+      To apply the Apache License to your work, attach the following
  376
+      boilerplate notice, with the fields enclosed by brackets "[]"
  377
+      replaced with your own identifying information. (Don't include
  378
+      the brackets!)  The text should be enclosed in the appropriate
  379
+      comment syntax for the file format. We also recommend that a
  380
+      file or class name and description of purpose be included on the
  381
+      same "printed page" as the copyright notice for easier
  382
+      identification within third-party archives.
  383
+
  384
+   Copyright [yyyy] [name of copyright owner]
  385
+
  386
+   Licensed under the Apache License, Version 2.0 (the "License");
  387
+   you may not use this file except in compliance with the License.
  388
+   You may obtain a copy of the License at
  389
+
  390
+       http://www.apache.org/licenses/LICENSE-2.0
  391
+
  392
+   Unless required by applicable law or agreed to in writing, software
  393
+   distributed under the License is distributed on an "AS IS" BASIS,
  394
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  395
+   See the License for the specific language governing permissions and
  396
+   limitations under the License.
1  ReleaseNotes/1.3.3.html
... ...
@@ -1,4 +1,5 @@
1 1
 New in 1.3.3:
  2
+* Adding syntax highlighting to raw requests and responses
2 3
 * Adding OPTIONS, PATCH and SEARCH HTTP verbs (ISSUE-18)
3 4
 
4 5
 New in 1.3.2:

0 notes on commit 8a7921d

Please sign in to comment.
Something went wrong with that request. Please try again.