Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into tlt-integration-bra…
Browse files Browse the repository at this point in the history
…nch3

* origin/master: (66 commits)
  ImageOptim on assets (jessesquires#1845)
  update changelog and spec for 7.3.4
  Fix issue jessesquires#1583: Don't highlight cell outside message bubble (when long press) (jessesquires#1744)
  update changelog and version for 7.3.3
  Updated `canPerformAction:withSender:` in `JSQMessagesComposerTextView` to call super (jessesquires#1664). Fixes jessesquires#1663.
  Update CHANGELOG and version nums for 7.3.2
  fix KVO crash. close jessesquires#1631
  formatting
  small fix regarding scrollToIndexPath (jessesquires#1642) close jessesquires#1640
  Update CHANGELOG.md
  update CHANGLOG. bump version numbers
  Reverted jessesquires#1588 to fix jessesquires#1602 and fix jessesquires#1604. (jessesquires#1623)
  bump version numbers
  Update CHANGELOG.md
  provide default init values for JSQMessagesCollectionViewLayoutAttributes to prevent assertion. fix jessesquires#1338
  follow up for jessesquires#1247 and jessesquires#1591. obfuscate private APIs. swizzle via +initialize
  copy attributes
  clean up
  fix keyboard hiding bug on iOS 9 (jessesquires#1307). fix jessesquires#1063
  - cleanup from PR jessesquires#1281 - fix menu actions, close jessesquires#1321 - make notification methods public - partially apply changes from PR jessesquires#1563
  ...
  • Loading branch information
pcoltau committed Apr 16, 2017
2 parents ea7bf70 + c3282c8 commit bc3e430
Show file tree
Hide file tree
Showing 143 changed files with 2,702 additions and 123 deletions.
34 changes: 34 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
codecov:
branch: develop

coverage:
precision: 2
round: nearest
range: "60...100"
ignore:
- JSQMessagesDemo/*
- Pods/*
- JSQMessagesTests/*

status:
project:
default:
target: auto
threshold: 2.0
branches:
- master
- develop

patch:
default:
target: auto
branches:
- master
- develop

comment:
layout: "header, diff, changes, sunburst, uncovered"
branches:
- master
- develop
behavior: default
2 changes: 1 addition & 1 deletion .github/CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
reported by contacting the project team at **jesse.squires.developer [at] gmail [dot] com**. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
53 changes: 9 additions & 44 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
## New issue checklist
<!-- Before submitting this issue, make sure you have done the following -->

- [ ] I have read all of the [`README`](https://github.com/jessesquires/JSQMessagesViewController/blob/develop/README.md).
- [ ] I have read the [documentation](http://cocoadocs.org/docsets/JSQMessagesViewController/).
- [ ] I have read all of the [`README`](https://github.com/jessesquires/JSQMessagesViewController/blob/develop/README.md), [documentation](http://cocoadocs.org/docsets/JSQMessagesViewController/), and [FAQ](https://github.com/jessesquires/JSQMessagesViewController/blob/develop/Documentation/faq.md).
- [ ] I have reviewed the [contributing guidelines](https://github.com/jessesquires/JSQMessagesViewController/blob/develop/.github/CONTRIBUTING.md). Confirmation: ____
- [ ] I have reviewed the [FAQ](https://github.com/jessesquires/JSQMessagesViewController/blob/develop/Documentation/faq.md).
- [ ] I have searched [existing issues](https://github.com/jessesquires/JSQMessagesViewController/issues?q=is%3Aissue+sort%3Acreated-desc) and **this is not a duplicate**.


<details>
<summary><strong>Bug report</strong></summary>
<!-- If this is a bug report, please provide the following information. Otherwise, you can delete this section. -->

#### General information
### General information

- Library version(s):
- iOS version(s):
- Devices/Simulators affected:
- Reproducible in the demo project (Y/N):
- Link to a project that exhibits the issue (if possible):
- List any related issues:
- Reproducible in the demo project? (Yes/No):
- Related issues:

## Bug report

#### Expected behavior

Expand All @@ -29,43 +23,14 @@

> ...
#### Steps to reproduce the behavior

> ...
#### Crash log?

*Can you provide a crash log?*

>...
#### Screenshots or videos?

*Can you provide screenshots, GIFs, or videos showing the issue?*
#### Steps to reproduce

> ...
</details>

<details>
<summary><strong>Question/Help</strong></summary>
<!-- If this is a question, please provide the following information. Otherwise, you can delete this section. -->

#### My question
#### Crash log? Screenshots? Videos? Sample project?

>...
</details>

<details>
<summary><strong>Feature Request</strong></summary>
<!-- If this is a feature request, please provide the following information. Otherwise, you can delete this section. -->

#### My feature request

- Why should it be included in the library?
- What problems does it solve?
- Please provide design/implementation details, if possible.
## Question or Feature Request

> ...
</details>
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Pull request checklist

- [ ] This fixes issue #<issue number>.
- [ ] All tests pass. Demo project builds and runs.
- [ ] I have resolved any merge conflicts.
- [ ] I have squashed my commits into 1 commit.
- [ ] I have followed the [coding style](https://github.com/jessesquires/HowToContribute#style-guidelines), and reviewed the [contributing guidelines](https://github.com/jessesquires/JSQMessagesViewController/blob/develop/.github/CONTRIBUTING.md). Confirmation: ____

#### This fixes issue #___.

## What's in this pull request?

>...
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: objective-c
osx_image: xcode7.1
osx_image: xcode7.3

env:
global:
- LANG=en_US.UTF-8
- WORKSPACE="JSQMessages.xcworkspace"
- IOS_SCHEME="JSQMessages"
- IOS_SDK=iphonesimulator9.1
- IOS_SDK=iphonesimulator9.3

matrix:
- DESTINATION="OS=8.1,name=iPhone 5" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" COVERAGE="NO"
Expand All @@ -15,6 +15,10 @@ env:
before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet

# skip pod install on travis-ci
# since we check-in the pods folder, etc. this isn't needed
install: true

script:

- if [ $POD_LINT == "YES" ]; then
Expand Down
Binary file modified Assets/JSQmessages.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/jsq_message_chat_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/jsq_messages_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
120 changes: 120 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,123 @@
The changelog for `JSQMessagesViewController`. Also see the [releases](https://github.com/jessesquires/JSQMessagesViewController/releases) on GitHub.

--------------------------------------

7.3.4
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.3.4+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.3.4)

7.3.3
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.3.3+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.3.3)

7.3.2
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.3.2+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.3.2)

7.3.1
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.3.1+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.3.1)

7.3.0
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.3.0+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.3.0)


7.2.0
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.2.0+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.2.0)

7.1.0
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.1.0+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.1.0)

7.0.2
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.0.2+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.0.2)

7.0.1
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.0.1+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.0.1)

7.0.0
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A7.0.0+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/7.0.0)

6.1.3
-----

- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/6.1.3)

6.1.2
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A6.1.2+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/6.1.2)

6.1.1
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A6.1.1+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/6.1.1)

6.0.0
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A6.0.0+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/6.0.0)

5.3.0
-----

- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/5.3.0)

5.2.0
-----

- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/5.2.0)

5.1.0
-----

- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/5.1.0)

5.0.3
-----

- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/5.0.3)

5.0.0
-----

- [Milestone](https://github.com/jessesquires/JSQMessagesViewController/issues?q=milestone%3A5.0.0+is%3Aclosed)
- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/5.0.0)

4.0.0
-----

- [GitHub release notes](https://github.com/jessesquires/JSQMessagesViewController/releases/tag/4.0.0)

All previous versions
---------------------

Unfortunately, release notes are not available for earlier versions of the library.
2 changes: 2 additions & 0 deletions Documentation/apps_using_this_library.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ These are the (known) apps that use `JSQMessagesViewController`. Submit a [pull
* [Roomie](https://itunes.apple.com/us/app/roomie-find-your-roomie/id962585201)
* [PimpMyCall](https://itunes.apple.com/us/app/pimp-my-call/id990167537)
* [Yellow Partner](https://itunes.apple.com/us/app/yellow-partner/id1062994361?ls=1&mt=8)
* [Radiate](https://itunes.apple.com/us/app/radiate/id939284774?mt=8)
* [Criptext](https://itunes.apple.com/us/app/criptext-secure-messenger/id848647361?mt=8)
* *Your app here, submit a [pull request](https://github.com/jessesquires/JSQMessagesViewController/compare)!*
1 change: 1 addition & 0 deletions Documentation/contributor_onboarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Core contributors have push access and are responsible for:

Current core contributors:
- Harlan Haskans ([**@harlanhaskins**](https://github.com/harlanhaskins))
- Eli Burke ([**@eliburke**](https://github.com/eliburke))

## Pushing code

Expand Down
2 changes: 1 addition & 1 deletion Documentation/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ There are 2 approaches to this, which one you choose depends on your needs.
1. Customize appearance and behavior of existing cells. (Easy)
2. Provide your own completely custom cell prototypes. (Hard)

> Also see [previous issues](https://github.com/jessesquires/JSQMessagesViewController/issues?utf8=✓&q=%5BCustomize+cells%5D+in%3Atitle+).
> Also see [previous issues](https://github.com/jessesquires/JSQMessagesViewController/issues?utf8=✓&q=custom+cell+in%3Atitle).
##### (1) Customizing existing cells

Expand Down
5 changes: 4 additions & 1 deletion Documentation/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@

* **Demo Project**
* There's a sweet demo project: `JSQMessages.xcworkspace`.
* Run `pod install` first.
* Run `pod install` first.
* Swift Example can be found in the SwiftExample folder just open the `SwiftExample.xcworkspace`.
* Run `pod install` first.
* [Firebase](https://www.firebase.com) also has a sweet [demo project](https://github.com/firebase/ios-swift-chat-example), and it's in Swift!


* **Message Model**
* Your message model objects should conform to the `JSQMessageData` protocol.
Expand Down
Loading

0 comments on commit bc3e430

Please sign in to comment.