Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 21, 2014
  1. Squashed commit of the following:

    authored
    commit 1373e67910aac20827bcbcc95560b4f935ea8591
    Author: Mattt Thompson <m@mattt.me>
    Date:   Thu Nov 20 17:07:26 2014 -0800
    
        Only set firstLineHeadIndent
    
    commit f71109c91eb7effa79b1e6cc8cc5557226039d33
    Merge: ae0ff32 bc6a3ca
    Author: Mattt Thompson <m@mattt.me>
    Date:   Thu Nov 20 16:56:08 2014 -0800
    
        Merge branch 'master' of github.com:coverback/TTTAttributedLabel into coverback-master
    
    commit bc6a3ca
    Author: Romans Karpelcevs <karpelcev@gmail.com>
    Date:   Tue Jun 17 12:13:34 2014 +0300
    
        Revert link alignment fix in favor of head indent support
    
        This partially reverts commit 843d390.
        Breaks fix for Issue #376.
        Implemented fix for #376 breaks first line head indent functionality
        without a workaround possibility. Link alignment can be fixed pretty
        easily using paragraph attributes.
Commits on Nov 20, 2014
  1. Squashed commit of the following:

    authored
    commit 541df93ddcd946136fcc3b8bfff1fd1f2f5ec447
    Author: Mattt Thompson <m@mattt.me>
    Date:   Thu Nov 20 12:26:38 2014 -0800
    
        Deprecating truncationTokenString and truncationTokenStringAttributes in favor of truncationTokenAttributedString
    
    commit 2a41c545fc2e96820d12440141dbbb93dd6d855b
    Author: Mattt Thompson <m@mattt.me>
    Date:   Thu Nov 20 12:22:15 2014 -0800
    
        Refactoring containsLinkAtPoint:
    
    commit 37898812fad90929a30bec14c80ee7739b1af1d5
    Author: Mattt Thompson <m@mattt.me>
    Date:   Thu Nov 20 12:19:33 2014 -0800
    
        Copy editing header documentation
    
    commit 8a129d530886bb8497bb2181e7a672122868fde5
    Author: Mattt Thompson <m@mattt.me>
    Date:   Thu Nov 20 12:16:26 2014 -0800
    
        Refactoring link insets to use UIEdgeInset
    
    commit 0c790c07f4ddeaf1687882978eed26fb6208ef0d
    Author: Mattt Thompson <m@mattt.me>
    Date:   Thu Nov 20 12:09:50 2014 -0800
    
        Squashed commit of the following:
    
        commit 7dbeb0ddde8a65e501651fbdfb0951c783d7d740
        Merge: f829afe 1132421
        Author: Mattt Thompson <m@mattt.me>
        Date:   Thu Nov 20 12:08:32 2014 -0800
    
            Merge branch 'master' of github.com:milqfm/TTTAttributedLabel into milqfm-master
    
        commit 1132421
        Merge: 31cd9dc 446d434
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Tue Sep 2 17:20:34 2014 -0400
    
            Merge branch 'master-renssies'
    
            * master-renssies:
              Fixed a typo in the method name
              Woops, added it to the wrong part of the header file
              Added "containsLinkAtPoint:"
              Added background schifting for links
              Add link support for truncationTokenString
    
        commit 446d434
        Author: Rens Verhoeven <rens@renssies.nl>
        Date:   Wed Jul 30 17:55:38 2014 +0200
    
            Fixed a typo in the method name
    
        commit bf42631
        Author: Rens Verhoeven <rens@renssies.nl>
        Date:   Wed Jul 30 17:53:18 2014 +0200
    
            Woops, added it to the wrong part of the header file
    
        commit 356bb91
        Author: Rens Verhoeven <rens@renssies.nl>
        Date:   Wed Jul 30 17:49:58 2014 +0200
    
            Added "containsLinkAtPoint:"
    
        commit 31cd9dc
        Merge: 2a4e2a0 76aec74
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Fri Jul 25 12:58:58 2014 -0400
    
            Merge branch 'master-original'
    
            * master-original:
              Bumping version to 1.10.1
              Removing unnecessary call to init, since initWithFrame: is apparently the designated initializer, not init
              [Issue #398][Issue #397] Fixing crash caused by UIAccessibilityElement implementation
              add accessibility label to links in addition to accessibility values
    
        commit e986132
        Author: Rens Verhoeven <rens@renssies.nl>
        Date:   Wed Jun 18 13:22:46 2014 +0200
    
            Added background schifting for links
    
        commit b76787e
        Merge: 8d7053c 76aec74
        Author: Rens Verhoeven <rens@renssies.nl>
        Date:   Mon Jun 16 13:26:52 2014 +0200
    
            Merge branch 'master' of https://github.com/mattt/TTTAttributedLabel
    
        commit 2a4e2a0
        Merge: 3380be0 6e2d043
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Wed Jun 4 16:12:50 2014 -0400
    
            Merge branch 'master' into master-milq
    
            * master: (61 commits)
              Add missing __bridge to casts in order to avoid errors building for iOS 6
              Adding Communication section to README
              Minor README copy-editing
              Add accessibility documentation to README
              Replace deprecated `leading` with `lineSpacing` in README.
              Bumping version to 1.10.0
              Replacing __LP64__ macros with more semantic  CGFLOAT_IS_DOUBLE
              [Issue #380] Taking minimumScaleFactor into account for automatic resizing of text
              [Issue #376] Fixing alignment and trunctionation issue on last line of text
              [Issue #385] Deprecating leading property, in favor of lineSpacing property
              [Issue #383] Reorganizing and refactoring boundingRectForCharacterRange:
              [Issue #383] Adding support for UIAccessibilityElement
              fix hitTest:WithEvent:
              Fixing precision warning with double to CGFloat conversion
              Changing return type of initWithFrame to instancetype
              [Issue #359] Implementing init, to allow for use with non-designated initializer with auto layout
              [Issue #372] Punching up documentation for active and inactive links
              [Issue #372] Minor code reformatting
              [FIX] lineHeightMultiple is ignored.
              [Issue #371] Opt out of inactive link styling when inactiveLinkAttributes is `nil` or empty.
              ...
    
        commit 6e2d043
        Merge: b3775bc 81e83b6
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Thu May 29 08:46:14 2014 -0400
    
            Merge branch 'master-mattt'
    
        commit 8d7053c
        Author: Rens Verhoeven <rens@renssies.nl>
        Date:   Tue Apr 8 13:58:21 2014 +0200
    
            Add link support for truncationTokenString
    
        commit 3380be0
        Merge: 9c44867 b3775bc
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Thu Jan 30 12:52:33 2014 -0500
    
            Merge branch 'master' into master-milq
    
            * master:
    
        commit b3775bc
        Merge: ef4b035 4c82aca
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Thu Jan 30 12:51:56 2014 -0500
    
            Merge branch 'master' of github.com:runmad/TTTAttributedLabel
    
            # Via Rune Madsen (6) and Byunghoon Yoon (1)
            * 'master' of github.com:runmad/TTTAttributedLabel:
              Add functionality for specifying an NSAttributedString to use for the truncation token with a new property: ` truncationTokenAttributedString`. This allows for a bit more customization of the truncation token, such as inclusion of different font, colours or anything else you would do with an NSAttributedString.
    
        commit 9c44867
        Merge: 4c82aca ef4b035
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Thu Jan 30 09:58:32 2014 -0500
    
            Merge branch 'master' into master-milq
    
            * master:
              Invalidate intrinsic content size when attributed text changes
    
        commit 4c82aca
        Merge: 6178908 526ebdc
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Tue Jan 21 15:07:49 2014 -0500
    
            Merge branch 'master' of github.com:mattt/TTTAttributedLabel
    
            # By Mattt Thompson
            # Via Mattt Thompson
            * 'master' of github.com:mattt/TTTAttributedLabel:
              [Issue #314] Removing unused UILineBreakModeFromTTTLineBreakMode
    
        commit 6178908
        Merge: f9fad79 e624273
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Wed Jan 15 16:34:31 2014 -0500
    
            Merge branch 'master' of github.com:mattt/TTTAttributedLabel
    
            # By Mattt Thompson
            # Via Mattt Thompson
            * 'master' of github.com:mattt/TTTAttributedLabel:
              [Issue #308] Fixing inactive link range check
    
        commit f9fad79
        Merge: 1073845 3d523c5
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Tue Jan 14 19:00:48 2014 -0500
    
            Merge branch 'master' of github.com:mattt/TTTAttributedLabel
    
            # By Mattt Thompson
            # Via Mattt Thompson
            * 'master' of github.com:mattt/TTTAttributedLabel:
              Bumping version to 1.8.1
              [Issue #307] Fixing initWithCoder:
    
        commit 1073845
        Merge: 469430c 945df55
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Mon Jan 13 09:51:47 2014 -0500
    
            Merge branch 'master' of github.com:mattt/TTTAttributedLabel
    
            # By Mattt Thompson
            # Via Mattt Thompson
            * 'master' of github.com:mattt/TTTAttributedLabel:
              Minor reformatting
              [Issue #296] Improving paragraph styling with text insets property
              Fixing typo in initWithCoder:
    
        commit 469430c
        Merge: 3cce1cd 6b38fe8
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Fri Jan 10 11:45:13 2014 -0500
    
            Merge branch 'master' of github.com:mattt/TTTAttributedLabel
    
            # By Mattt Thompson (2) and others
            # Via Mattt Thompson
            * 'master' of github.com:mattt/TTTAttributedLabel:
              Minor reformatting
              [Issue #303] Implementing tintColorDidChange by adding inactiveLinkAttributes @property
              Removing unnecessary call to willChangeValueForKey: / didChangeValueForKey:
              Adding check for point within range for setActiveLink:
    
        commit 3cce1cd
        Merge: 66c3108 628de3f
        Author: Byunghoon Yoon <bh2yoon@gmail.com>
        Date:   Mon Jan 6 14:36:31 2014 -0500
    
            Merge branch 'master' of github.com:runmad/TTTAttributedLabel
    
        commit 628de3f
        Author: Rune Madsen <runemadsen@mac.com>
        Date:   Thu Dec 19 16:56:42 2013 -0500
    
            Add functionality for specifying an NSAttributedString to use for the truncation token with a new property: ` truncationTokenAttributedString`. This allows for a bit more customization of the truncation token, such as inclusion of different font, colours or anything else you would do with an NSAttributedString.
  2. @jksk

    [Issue #443] Adding range check in tintColorDidChange

    jksk authored committed
    Signed-off-by: Mattt Thompson <m@mattt.me>
  3. Merge pull request #445 from whiskit/master

    authored
    Switched NSDataDetector from "nonatomic" to "atomic"
  4. @benjaminjackson

    [Issue #421] Fixed vertical alignment in labels where the text exceed…

    benjaminjackson authored committed
    …ed the number of lines
    
    Signed-off-by: Mattt Thompson <m@mattt.me>
  5. Minor formatting

    authored
  6. @hpique

    Style conformance

    hpique authored
  7. @hpique
Commits on Sep 16, 2014
  1. @whiskit
Commits on Jun 12, 2014
  1. Removing unnecessary call to init, since initWithFrame: is apparently…

    authored
    … the designated initializer, not init
Commits on Jun 9, 2014
  1. add accessibility label to links in addition to accessibility values

    Paul Zabelin & Siena Aguayo authored
Commits on May 13, 2014
  1. @gustavo-the-rabbit
Commits on May 12, 2014
  1. [Issue #376] Fixing alignment and trunctionation issue on last line o…

    Al DeLucca authored committed
    …f text
    
    Signed-off-by: Mattt Thompson <m@mattt.me>
  2. @getaaron

    [Issue #383] Adding support for UIAccessibilityElement

    getaaron authored committed
    Signed-off-by: Mattt Thompson <m@mattt.me>
Commits on May 9, 2014
  1. @DimaVartanian

    fix hitTest:WithEvent:

    DimaVartanian authored
    It now respects userInteractionEnabled, hidden, and alpha.
Commits on May 1, 2014
  1. [Issue #359] Implementing init, to allow for use with non-designated …

    authored
    …initializer with auto layout
Commits on Apr 30, 2014
  1. Merge pull request #372 from JmeHsieh/master

    authored
    Opt out of inactive link styling when inactiveLinkAttributes is `nil` or empty.
Commits on Apr 29, 2014
  1. @kevinoneill

    [FIX] lineHeightMultiple is ignored.

    kevinoneill authored
    The lineHeightMultiple is effectively ignored unless minimumLineHeight or maximumLineHeight are set for decreasing or increasing the line height respectively. This was introduced in an attempt to fix [Issue #314] (see [Commit #871b932]). The ternary operator applied the multiple to the wrong side of the result.
Commits on Apr 28, 2014
  1. @JmeHsieh
Commits on Apr 15, 2014
  1. [Issue #365] Defering to super implementation of hitTest:withEvent: i…

    authored
    …f no link is at point of touch
Something went wrong with that request. Please try again.