Commit Graph

13022 Commits

Author SHA1 Message Date
Ilya Laktyushin
5833833664 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI
# Conflicts:
#	TelegramUI/ChatMessageWebpageBubbleContentNode.swift
#	TelegramUI/InstantPageSettingsNode.swift
2018-08-31 04:35:21 +03:00
Peter
368a96b291 no message 2018-08-31 04:26:44 +03:00
Peter
d8eac512ba no message 2018-08-31 04:26:23 +03:00
Peter
d18eae7936 no message 2018-08-31 04:25:51 +03:00
Peter
bc36d2dabf Merge commit '33dd02f7a98f863c7bb6e3667b7014fe87918872' 2018-08-31 04:24:35 +03:00
Peter
2b1b6211cd no message 2018-08-31 04:23:19 +03:00
Peter
d6a6951aaf no message 2018-08-31 04:22:34 +03:00
Peter
e3bfc2003c no message 2018-08-31 04:22:15 +03:00
Peter
98112c5f79 no message 2018-08-31 04:21:30 +03:00
Peter
ca25ed763a no message 2018-08-31 04:21:02 +03:00
Ilya Laktyushin
a1b592611d no message 2018-08-31 00:42:24 +03:00
Ilya Laktyushin
33dd02f7a9 no message 2018-08-30 23:32:52 +03:00
Garrett Moon
cae37623fd Add subnode should not be called with the lock held. (#1088) 2018-08-30 09:30:34 -07:00
J.T. Burgess
dcda33b692 Fix Typo (#1089)
"preform" -> "perform"
2018-08-29 17:39:23 -07:00
Ilya Laktyushin
fb495b8182 no message 2018-08-30 02:53:20 +03:00
Grishka
31fe4afdd0 windows fixes 2018-08-28 23:55:21 +03:00
overtake
5dfc159ada Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev 2018-08-28 23:32:26 +03:00
Peter
664082f1f0 no message 2018-08-28 23:27:43 +03:00
Peter
09573be008 Merge commit 'e299f91950807d4a4f1fd4aeec09da6c55f6a8cd' 2018-08-28 22:33:52 +03:00
Peter
2a0866ff3e no message 2018-08-28 22:27:33 +03:00
Peter
b10a2225a4 no message 2018-08-28 22:27:02 +03:00
appleguy
465abb1ded [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)
* [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses)

With permission of the Facebook Open Source team, we are simplifying the Texture
license so that clients can rely on the Apache 2 terms that most of Texture is
already covered by. This means that code originally forked from AsyncDisplayKit
will be re-licensed from "BSD 3-clause + PATENTS v2" to Apache 2 without a
PATENTS file.

After getting confirmation that the updates to these core files look good, we'll
propagate this new license header to all files (in this same PR) and get sign-off
from all parties before landing.

* [License] Update all Texture source files to be pure Apache 2.

* Changelog entry for Apache 2 license update.

* Revert "[License] Update all Texture source files to be pure Apache 2."

This reverts commit ffa0fbbba9717d871dd16c4b07539f2f8208fc2b.

* [License] Update all Texture source files to be pure Apache 2, maintaining copyrights.

* [License] Update CONTRIBUTING, README, Podspec & Dangerfile.
2018-08-28 07:39:18 -07:00
overtake
e299f91950 no message 2018-08-28 13:09:12 +03:00
overtake
844392f644 no message 2018-08-28 12:48:40 +03:00
Grishka
bfa1e6ab76 Proxy fix 2018-08-27 14:39:27 +03:00
Jia Wern Lim
1d31fc21d4 Refactored accessibleElements to accessibilityElements (#1069)
* Refactored `accessibleElements` to `accessibilityElements`, and removed the re-definition of the property.

With this refactor, the field can now be used as a single access point into the accessibility elements of a view. Also, removing the re-definition of the property in _ASDisplayViewAccessibility.h enables us to make use of the field and its associated helper methods directly from the `UIAccessibilityContainer` API rather than rolling our own implementation.

* Added tests for the accessors to ASDisplayView.accessibilityElements.

* Commented out tests for older a11y accessors & added relevant warnings.

Also added assertions that the getter and setter for the accessibilityElements
property are used only on the main thread.
2018-08-24 20:41:27 +02:00
Grishka
23ae67306d closes #50 2018-08-24 18:38:09 +03:00
Ilya Laktyushin
8028166b15 no message 2018-08-24 07:28:53 +03:00
Grishka
1ca50fdce7 fixes again 2018-08-24 02:31:27 +03:00
Huy Nguyen
31cb65b38a Fix compiler error in ASLocking #trivial (#1079) 2018-08-22 16:14:03 -07:00
overtake
95c47f013c Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-08-22 17:40:50 +03:00
Peter
f8cb1f2332 no message 2018-08-22 17:40:42 +03:00
overtake
0f7d0266f8 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-08-22 16:10:13 +03:00
overtake
6503224afb no message 2018-08-22 16:10:06 +03:00
Peter
217f472d3b no message 2018-08-22 15:44:39 +03:00
Peter
81892e714e no message 2018-08-22 15:44:18 +03:00
JK Junkyu Jeon
2e95f5503e Update showcase to add Wishpoke (#1078) 2018-08-21 07:54:36 -07:00
Michael Schneider
022b6b7785 Fix multiple documentation issues #trivial (#1073) 2018-08-20 14:26:14 -07:00
overtake
de8b1adfb6 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-08-20 20:19:58 +03:00
Peter
7d32314cba no message 2018-08-20 20:19:10 +03:00
Peter
27a5472a86 no message 2018-08-20 20:17:28 +03:00
overtake
4b8e908bc0 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-08-20 20:10:10 +03:00
overtake
10d72feae6 no message 2018-08-20 20:10:01 +03:00
Peter
7e593e715a no message 2018-08-20 17:36:54 +03:00
overtake
e7b4f3c59f Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-08-20 15:42:16 +03:00
Peter
d730e16897 no message 2018-08-17 19:29:07 +03:00
Ilya Laktyushin
c013a50d31 Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents 2018-08-17 18:24:22 +03:00
Ilya Laktyushin
fecf8300ca no message 2018-08-17 18:22:21 +03:00
Peter
d2ed3a95af no message 2018-08-17 14:45:03 +03:00
overtake
9ab8b6788a Merge commit '3b4fa7456125b3f35b4d73896dd152dacc30495e' into feature/secureid
* commit '3b4fa7456125b3f35b4d73896dd152dacc30495e':
  no message
2018-08-16 23:47:06 +03:00