Code

Kkdkdk#419

Code

Open

Kdksjdjsnskwkwm wants to merge 162 commits intofeature/trimURLsoptonaut/ActiveLabel.swift:feature/trimURLsfrom

masteroptonaut/ActiveLabel.swift:masterCopy head branch name to clipboard

Commits

Commits on Mar 14, 2016

• Avoid multiple calls to updateTextStorage by batching customizations

  polqf

  committed
  b20c78a

  Copy full SHA for b20c78a

Commits on Mar 16, 2016

• Unset selected element when parsing text

  krjackso

  committed
  086096b

  Copy full SHA for 086096b

• Merge pull request #56 from krjackso/master

  Show description for 7306cc9
  polqf

  committed
  7306cc9

  Copy full SHA for 7306cc9

Commits on Mar 21, 2016

• Merge pull request #55 from optonaut/feature/blockCustomization

  Show description for 513c0fb
  polqf

  committed
  513c0fb

  Copy full SHA for 513c0fb

• Podspec bump

  polqf

  committed
  de01870

  Copy full SHA for de01870

Commits on Mar 27, 2016

• Add support for accent/diacritics (fix #58)

  lastMove

  committed
  05557c8

  Copy full SHA for 05557c8

• Merge pull request #59 from lastMove/master

  Show description for 6e39aa3
  polqf

  committed
  6e39aa3

  Copy full SHA for 6e39aa3

Commits on Apr 2, 2016

• Add mention and hashtag filtering

  krjackso

  committed
  b591413

  Copy full SHA for b591413

• Update readme for hashtag and mention filter

  krjackso

  committed
  3a39f38

  Copy full SHA for 3a39f38

Commits on Apr 5, 2016

• Filter elements in same pass as parsing, add test for filtering

  krjackso

  committed
  d94c039

  Copy full SHA for d94c039

• Merge pull request #61 from krjackso/master

  Show description for 5200fde
  polqf

  committed
  5200fde

  Copy full SHA for 5200fde

Commits on Apr 18, 2016

• Selected color not applied appropriately

  

  Rob Hudson

  committed
  f60bfb7

  Copy full SHA for f60bfb7

Commits on Apr 21, 2016

• fix for issue https://github.com/optonaut/ActiveLabel.swift/issues/64

  wowbroforce

  committed
  a971ba4

  Copy full SHA for a971ba4

• Add the operation during move

  Econa77

  committed
  b239961

  Copy full SHA for b239961

Commits on Apr 22, 2016

• Merge pull request #69 from wowbroforce/master

  Show description for 0a5d064
  polqf

  committed
  0a5d064

  Copy full SHA for 0a5d064

Commits on Apr 24, 2016

• Call updateAttributesWhenSelected on Cancelled

  Econa77

  committed
  c2c6497

  Copy full SHA for c2c6497

• Fix linespacing setting.

  Show description for 1504cc7
  Econa77

  committed
  1504cc7

  Copy full SHA for 1504cc7

• Add support numberOfLines and lineBreakMode

  Econa77

  committed
  f2ed0a4

  Copy full SHA for f2ed0a4

Commits on Apr 26, 2016

• Merge pull request #73 from Econa77/fix-cancel-handler

  Show description for c903b50
  polqf

  committed
  c903b50

  Copy full SHA for c903b50

• Merge pull request #75 from Econa77/fix-linespacing

  Show description for 375f79f
  polqf

  committed
  375f79f

  Copy full SHA for 375f79f

• Merge pull request #76 from Econa77/add-line-number-and-break

  Show description for 7a04e10
  polqf

  committed
  7a04e10

  Copy full SHA for 7a04e10

• Merge pull request #65 from robtimp/selected-color

  Show description for c6b74c6
  polqf

  committed
  c6b74c6

  Copy full SHA for c6b74c6

• Merge pull request #70 from Econa77/master

  Show description for 5dca7ec
  polqf

  committed
  5dca7ec

  Copy full SHA for 5dca7ec

Commits on May 2, 2016

• Display text on uncustomized label

  

  Econa77

  authored and

  ShunsukeFurubayashi

  committed
  9ba320a

  Copy full SHA for 9ba320a

• Merge pull request #74 from Econa77/fix-no-custom

  Show description for 0c70466
  polqf

  committed
  0c70466

  Copy full SHA for 0c70466

Commits on May 8, 2016

• Fix auto layout size calculation

  Econa77

  committed
  c9f9bad

  Copy full SHA for c9f9bad

Commits on May 11, 2016

• Clear text when set the empty string

  

  ShunsukeFurubayashi

  committed
  8ff649a

  Copy full SHA for 8ff649a

• Merge pull request #81 from Econa77/feature/update-empty-string

  Show description for e63152a
  polqf

  committed
  e63152a

  Copy full SHA for e63152a

Commits on May 17, 2016

• Merge pull request #77 from Econa77/feature/fix-autolayout

  Show description for 4700673
  polqf

  committed
  4700673

  Copy full SHA for 4700673

Commits on May 31, 2016

• Fix #9 - Allow dots in mentions

  polqf

  committed
  e3aa02e

  Copy full SHA for e3aa02e

• Revert "Fix #9 - Allow dots in mentions"

  Show description for ccda955
  polqf

  committed
  ccda955

  Copy full SHA for ccda955

Commits on Jun 10, 2016

• Fix: Super obscure bug that would truncate text in some edge cases while using Auto-layout constraints

  

  Adriaan iMac

  committed
  a2e80fa

  Copy full SHA for a2e80fa

• Bumb version to 0.5.1

  

  Adriaan iMac

  committed
  1ecaecd

  Copy full SHA for 1ecaecd

• Reverse podspec source

  

  Adriaan iMac

  committed
  337d476

  Copy full SHA for 337d476

Commits on Jun 12, 2016

• Merge pull request #85 from nxtstep/master

  Show description for 707f4cb
  polqf

  authored
  707f4cb

  Copy full SHA for 707f4cb

Commits on Jun 16, 2016

• Avoid force unwraps that could crash on tests - Fixes #87

  polqf

  committed
  fa897a0

  Copy full SHA for fa897a0

Commits on Jul 21, 2016

• added minimumLineHeight and applied ceil on height

  Show description for a741ac8
  demonar

  authored
  a741ac8

  Copy full SHA for a741ac8

Commits on Jul 29, 2016

• Support for new .Custom ActiveType

  polqf

  committed
  93c0f36

  Copy full SHA for 93c0f36

• Add tests for new .Custom ActiveType

  polqf

  committed
  8cd014a

  Copy full SHA for 8cd014a

• Update travis to use xcode7.3

  polqf

  committed
  b98394c

  Copy full SHA for b98394c

• Improve parsing logic

  polqf

  committed
  c173e71

  Copy full SHA for c173e71

• Update README with Custom Types documentation

  polqf

  committed
  cf19a96

  Copy full SHA for cf19a96

• Remove unused ActiveType property

  polqf

  committed
  f652c62

  Copy full SHA for f652c62

• Merge pull request #98 from optonaut/custom-types

  Show description for 30a1794
  polqf

  authored
  30a1794

  Copy full SHA for 30a1794

• Update podspec

  polqf

  committed
  162f8f8

  Copy full SHA for 162f8f8

• Update to Swift3.0

  polqf

  committed
  fda2b1d

  Copy full SHA for fda2b1d

• Update travis to use Xcode 8

  polqf

  committed
  2a11c9f

  Copy full SHA for 2a11c9f

Commits on Aug 20, 2016

• Update ActiveLabel.podspec

  bAmpT

  authored
  7c46c13

  Copy full SHA for 7c46c13

• Update ActiveType.swift

  Show description for fc7e172
  bAmpT

  authored
  fc7e172

  Copy full SHA for fc7e172

• Update ActiveType.swift

  Show description for 1765a81
  bAmpT

  authored
  1765a81

  Copy full SHA for 1765a81

• Update ActiveType.swift

  bAmpT

  authored
  4c578db

  Copy full SHA for 4c578db

Commits on Aug 24, 2016

• Updated to latest Swift and Xcode 8 (beta 6)

  MarvinNazari

  committed
  f6dbed0

  Copy full SHA for f6dbed0

Commits on Aug 25, 2016

• Update ActiveType.swift

  bAmpT

  authored
  c590f41

  Copy full SHA for c590f41

• Merge pull request #103 from bAmpT/patch-2

  Show description for a353f91
  polqf

  authored
  a353f91

  Copy full SHA for a353f91

• Merge pull request #105 from MarvinNazari/swift-3

  Show description for c47e5c3
  polqf

  authored
  c47e5c3

  Copy full SHA for c47e5c3

• Update for Xc8b6

  polqf

  committed
  7d5e89b

  Copy full SHA for 7d5e89b

Commits on Sep 4, 2016

• Add ability to trim long URLs

  polqf

  committed
  85dcbdc

  Copy full SHA for 85dcbdc

• Update demo text

  polqf

  committed
  f67dae3

  Copy full SHA for f67dae3

• Fix broken tests

  polqf

  committed
  41b78e4

  Copy full SHA for 41b78e4

• Fix leading dot not being highlighted

  polqf

  committed
  23945e9

  Copy full SHA for 23945e9

• Prepare for 0.6.2

  polqf

  committed
  485285e

  Copy full SHA for 485285e

• Merge pull request #107 from optonaut/trim-long-urls

  Show description for 3fdcb84
  polqf

  authored
  3fdcb84

  Copy full SHA for 3fdcb84

• Merge branch 'master' into swift-3

  polqf

  committed
  d2b602d

  Copy full SHA for d2b602d

• Update Swift version in Readme & podspec

  polqf

  committed
  1f9ceb5

  Copy full SHA for 1f9ceb5

• Fix crash due to range out of bounds - caused by #107

  polqf

  committed
  f27a513

  Copy full SHA for f27a513

Commits on Sep 5, 2016

• Improve performance for non urlMaximumLength users

  polqf

  committed
  f609665

  Copy full SHA for f609665

• Merge + adapt to Swift 3 master changes related to url max length

  polqf

  committed
  80fae94

  Copy full SHA for 80fae94

Commits on Sep 26, 2016

• Different font for mention, highlight and URLs.

  amoiz-cc

  committed
  82618b0

  Copy full SHA for 82618b0

Commits on Sep 27, 2016

• removed property useDifferentHighlightFont

  amoiz-cc

  committed
  db97681

  Copy full SHA for db97681

Commits on Oct 14, 2016

• Merge branch 'master' into swift-3

  polqf

  committed
  2116600

  Copy full SHA for 2116600

• Merge pull request #99 from optonaut/swift-3

  Show description for 967db0c
  polqf

  authored
  967db0c

  Copy full SHA for 967db0c

• Update README.md

  polqf

  authored
  065f46e

  Copy full SHA for 065f46e

• Update ActiveLabel.podspec

  polqf

  authored
  3028181

  Copy full SHA for 3028181

• Add .swift-version

  polqf

  committed
  c7c5cf7

  Copy full SHA for c7c5cf7

Commits on Oct 16, 2016

• Update project configuration

  polqf

  committed
  dcfba9a

  Copy full SHA for dcfba9a

• Cache regular expressions to avoid them to be created on the fly - #114

  polqf

  committed
  a23081d

  Copy full SHA for a23081d

• Update travis.yml to use scan

  polqf

  committed
  332db73

  Copy full SHA for 332db73

Commits on Oct 24, 2016

• Merge remote-tracking branch 'optonaut/master' into differentFontForHighlights

  amoiz-cc

  committed
  80ead38

  Copy full SHA for 80ead38

Commits on Oct 25, 2016

• Here are the changes you requested.

  amoiz-cc

  committed
  66e67d5

  Copy full SHA for 66e67d5

• Merge pull request #117 from Abdul-Moiz/differentFontForHighlights

  Show description for affdf38
  polqf

  authored
  affdf38

  Copy full SHA for affdf38

• Public configureLinkAttributes to full customize the attributed string

  

  Josh Holtz

  committed
  95963d6

  Copy full SHA for 95963d6

• Added functions to clear custom tap handlers

  

  Josh Holtz

  committed
  8bf643f

  Copy full SHA for 8bf643f

• Fixes from PR review

  

  Josh Holtz

  committed
  bc29d14

  Copy full SHA for bc29d14

• Added tests and configureLinkAttributes now supports isSelected

  

  Josh Holtz

  committed
  bab356f

  Copy full SHA for bab356f

• Updated tests

  

  Josh Holtz

  committed
  ae24304

  Copy full SHA for ae24304

• Split tests up

  

  Josh Holtz

  committed
  ab5414b

  Copy full SHA for ab5414b

• Merge pull request #128 from joshdholtz/swift-3

  Show description for c1ba467
  polqf

  authored
  c1ba467

  Copy full SHA for c1ba467

Commits on Dec 21, 2016

• feedback fixes

  demonar

  committed
  6439861

  Copy full SHA for 6439861

• Merge remote-tracking branch 'upstream/master'

  Show description for b62f462
  demonar

  committed
  b62f462

  Copy full SHA for b62f462

Commits on Dec 29, 2016

• Merge pull request #95 from demonar/master

  Show description for 338c06b
  polqf

  authored
  338c06b

  Copy full SHA for 338c06b

Commits on Jan 24, 2017

• Add tests to discard issue #150

  polqf

  committed
  446dbcd

  Copy full SHA for 446dbcd

• Update ActiveLabel.podspec

  polqf

  authored
  5c030f3

  Copy full SHA for 5c030f3

Commits on Sep 14, 2017

• Update to Swift 4

  polqf

  committed
  3a095f0

  Copy full SHA for 3a095f0

• Update Podfile to use Xcode 9

  polqf

  committed
  e1977df

  Copy full SHA for e1977df

Commits on Sep 15, 2017

• Merge pull request #202 from optonaut/swift-4

  Show description for 3f869d1
  polqf

  authored
  3f869d1

  Copy full SHA for 3f869d1

Commits on Oct 10, 2017

• Updated version for tag to use Swift 4

  sherwinzadeh

  authored
  4bec2da

  Copy full SHA for 4bec2da

Commits on Nov 20, 2017

• Merge pull request #212 from sherwinzadeh/patch-1

  Show description for 0cf36d3
  ejoebstl

  authored
  0cf36d3

  Copy full SHA for 0cf36d3

Commits on Nov 27, 2017

• 'characters' Deprecation

  Show description for 75d8009
  xuaninbox

  authored
  75d8009

  Copy full SHA for 75d8009

Commits on Jan 10, 2018

• bump version to 0.8.1

  maziyarpanahi

  committed
  d0d7e46

  Copy full SHA for d0d7e46

• update cocoapod build to swift 4.0

  maziyarpanahi

  committed
  fe07609

  Copy full SHA for fe07609

• Update .swift-version

  lasha-ring

  authored
  bf54d9d

  Copy full SHA for bf54d9d

• Merge pull request #231 from efremidze/patch-1

  Show description for 7f6d729
  maziyarpanahi

  authored
  7f6d729

  Copy full SHA for 7f6d729

Commits on Jan 11, 2018

• Update README.md

  clineu

  authored
  955afe2

  Copy full SHA for 955afe2

Commits on Jan 12, 2018

• Merge pull request #232 from clineu/patch-1

  Show description for 2f4b1dd
  maziyarpanahi

  authored
  2f4b1dd

  Copy full SHA for 2f4b1dd

Commits on Jan 31, 2018

• Fixed typo maxLenght

  iSapozhnik

  committed
  80a7d6b

  Copy full SHA for 80a7d6b

Commits on Feb 19, 2018

• Merge pull request #225 from xuaninbox/patch-1

  Show description for 2919456
  maziyarpanahi

  authored
  2919456

  Copy full SHA for 2919456

Commits on Feb 21, 2018

• Merge and fixing the rest of typos

  iSapozhnik

  committed
  0b26862

  Copy full SHA for 0b26862

• Merge pull request #236 from iSapozhnik/bugfix/typo

  Show description for 3e98a76
  maziyarpanahi

  authored
  3e98a76

  Copy full SHA for 3e98a76

Commits on Jun 11, 2018

• Merge branch 'master' of https://github.com/maziyarpanahi/ActiveLabel.swift

  maziyarpanahi

  committed
  608c5e7

  Copy full SHA for 608c5e7

• Update podspec to 0.9.0

  maziyarpanahi

  committed
  78e33d0

  Copy full SHA for 78e33d0

• Merge pull request #260 from maziyarpanahi/master

  Show description for a24e4c4
  maziyarpanahi

  authored
  a24e4c4

  Copy full SHA for a24e4c4

Commits on Jul 8, 2018

• Update Custom types example

  Show description for cf7818a
  maziyarpanahi

  authored
  cf7818a

  Copy full SHA for cf7818a

Commits on Sep 20, 2018

• Align README.md swift codes

  cruisediary

  committed
  f1d79f9

  Copy full SHA for f1d79f9

Commits on Sep 28, 2018

• Merge pull request #276 from cruisediary/master

  Show description for bdbb2e6
  maziyarpanahi

  authored
  bdbb2e6

  Copy full SHA for bdbb2e6

Commits on Oct 9, 2018

• Update project metadata

  maziyarpanahi

  committed
  d52c88b

  Copy full SHA for d52c88b

• Update travis config

  maziyarpanahi

  committed
  231a2d0

  Copy full SHA for 231a2d0

• Update README.md

  maziyarpanahi

  authored
  0642119

  Copy full SHA for 0642119

• Update to Swift 4.2 and Xcode 10

  maziyarpanahi

  committed
  c739832

  Copy full SHA for c739832

• Merge branch 'master' of https://github.com/maziyarpanahi/ActiveLabel.swift

  maziyarpanahi

  committed
  26ef609

  Copy full SHA for 26ef609

• Update .swift-version

  maziyarpanahi

  committed
  9cc680a

  Copy full SHA for 9cc680a

• Update .travis.yml

  maziyarpanahi

  committed
  1b2597d

  Copy full SHA for 1b2597d

• Update travis with fastlane

  maziyarpanahi

  committed
  fb71483

  Copy full SHA for fb71483

• Merge pull request #282 from maziyarpanahi/master

  Show description for 95f1ddb
  maziyarpanahi

  authored
  95f1ddb

  Copy full SHA for 95f1ddb

• Update ActiveLabel.podspec

  maziyarpanahi

  authored
  4f2ee26

  Copy full SHA for 4f2ee26

• Update podspec for Swift 4.2 and Xcode 10

  maziyarpanahi

  authored
  7476ffe

  Copy full SHA for 7476ffe

• Update README.md

  maziyarpanahi

  authored
  2463840

  Copy full SHA for 2463840

Commits on Nov 23, 2018

• Create stale.yml

  Show description for c33e4b1
  maziyarpanahi

  authored
  c33e4b1

  Copy full SHA for c33e4b1

• Change label to stale instead of wontfix

  maziyarpanahi

  authored
  a459287

  Copy full SHA for a459287

• Update stale.yml

  maziyarpanahi

  authored
  ab0f6e8

  Copy full SHA for ab0f6e8

Commits on Mar 13, 2019

• Add basic SwiftPM manifest file

  Jeehut

  authored
  c8083c5

  Copy full SHA for c8083c5

Commits on Mar 22, 2019

• Issue #312: Fixed intrinsicContentSize size calculation

  lancheg

  committed
  bafbead

  Copy full SHA for bafbead

Commits on Mar 28, 2019

• Merge pull request #308 from Dschee/master

  Show description for b4dbc65
  maziyarpanahi

  authored
  b4dbc65

  Copy full SHA for b4dbc65

Commits on Apr 7, 2019

• Release candidate for Swift 5.0

  maziyarpanahi

  committed
  1005db4

  Copy full SHA for 1005db4

Commits on Apr 11, 2019

• Bump version and remove iOS 8 support

  maziyarpanahi

  committed
  0afc63b

  Copy full SHA for 0afc63b

• Update project

  maziyarpanahi

  committed
  b022d6d

  Copy full SHA for b022d6d

• Update Info.plist

  maziyarpanahi

  committed
  2fff181

  Copy full SHA for 2fff181

• Update ActiveLabel.podspec

  maziyarpanahi

  committed
  dd221b8

  Copy full SHA for dd221b8

• Update ActiveLabel.swift

  maziyarpanahi

  committed
  af93c76

  Copy full SHA for af93c76

• Update ActiveType.swift

  maziyarpanahi

  committed
  cfcd992

  Copy full SHA for cfcd992

• Migrate to Swift 5.0

  maziyarpanahi

  committed
  b00d14f

  Copy full SHA for b00d14f

• Update ViewController.swift

  maziyarpanahi

  committed
  2da28c6

  Copy full SHA for 2da28c6

• Update AppDelegate.swift

  maziyarpanahi

  committed
  7e5a93e

  Copy full SHA for 7e5a93e

• Update .gitignore

  maziyarpanahi

  committed
  969a62e

  Copy full SHA for 969a62e

• Update project.pbxproj

  maziyarpanahi

  committed
  0573e88

  Copy full SHA for 0573e88

• Update travis to use Xcode 10.2

  maziyarpanahi

  committed
  201f31e

  Copy full SHA for 201f31e

Commits on May 13, 2019

• Merge pull request #317 from optonaut/release-candidate-110

  Show description for dacc4cf
  maziyarpanahi

  authored
  dacc4cf

  Copy full SHA for dacc4cf

• Update minimum iOS version

  Show description for e709f23
  maziyarpanahi

  authored
  e709f23

  Copy full SHA for e709f23

Commits on Feb 11, 2020

• added email support

  mehulmodihb

  committed
  69e25cb

  Copy full SHA for 69e25cb

• added email type to test cases

  mehulmodihb

  committed
  2e3680c

  Copy full SHA for 2e3680c

• Update README.md

  mehulmodihb

  authored
  6d1f638

  Copy full SHA for 6d1f638

Commits on Mar 27, 2020

• Added in missing cases for new UITouchPhases, iOS 13.4

  casperson

  committed
  6bbe600

  Copy full SHA for 6bbe600

Commits on Jun 28, 2020

• Adjust height to zero when there's no text set

  filipealva

  committed
  4cdd88f

  Copy full SHA for 4cdd88f

Commits on Jul 20, 2020

• Merge pull request #313 from lancheg/bug/intrinsicContentSize

  Show description for 8986a93
  maziyarpanahi

  authored
  8986a93

  Copy full SHA for 8986a93

• Merge pull request #360 from casperson/update-touch-phases

  Show description for ae45939
  maziyarpanahi

  authored
  ae45939

  Copy full SHA for ae45939

• Merge branch '115-release-candidate' into master

  filipealva

  authored
  7b73fd1

  Copy full SHA for 7b73fd1

• Merge pull request #367 from filipealva/master

  Show description for 4682a9f
  maziyarpanahi

  authored
  4682a9f

  Copy full SHA for 4682a9f

Commits on Nov 15, 2020

• Merge pull request #354 from mehulmodihb/master

  Show description for 167fe3c
  maziyarpanahi

  authored
  167fe3c

  Copy full SHA for 167fe3c

• [skip travis] Update travis to Xcode 12.2

  maziyarpanahi

  committed
  85136b1

  Copy full SHA for 85136b1

• Bump version to 1.1.5

  maziyarpanahi

  committed
  b3bfb45

  Copy full SHA for b3bfb45

• Update README.md

  maziyarpanahi

  committed
  726af7f

  Copy full SHA for 726af7f

• Update ActiveLabel.podspec

  maziyarpanahi

  committed
  c3ad1cf

  Copy full SHA for c3ad1cf

• Merge pull request #370 from optonaut/115-release-candidate

  Show description for 36949c1
  maziyarpanahi

  authored
  36949c1

  Copy full SHA for 36949c1