appleguy
c8cbd2ec4a
Merge pull request #1393 from ejensen/cleanup
...
[Refactoring] Redundant function removal; Ternary formatting
2016-03-17 13:47:02 -07:00
Engin Kurutepe
2a978054f2
remove Cartfile.resolved
2016-03-17 20:27:03 +01:00
Lukas Spieß
f6fe032bfe
Merge branch 'feature/metrics/events-crash-callback' into feature/metrics/develop
...
# Conflicts:
# Classes/BITChannel.h
# Classes/BITChannel.m
2016-03-17 19:25:01 +01:00
Eric Jensen
6739a3a4ab
Condition logic simplification
2016-03-17 11:22:53 -07:00
Lukas Spieß
41bda8ae43
Remove unused serializeToString
2016-03-17 19:16:08 +01:00
Lukas Spieß
44ad0da6dc
Update tests to handle removal of BITOrderedDictionary
2016-03-17 19:15:56 +01:00
Lukas Spieß
32fc8be933
Merge branch 'feature/metrics/custom-events' into feature/metrics/develop
...
# Conflicts:
# Classes/BITChannel.h
# Classes/BITChannel.m
# Classes/BITMetricsManager.h
# Classes/BITMetricsManager.m
# Classes/BITMetricsManagerPrivate.h
2016-03-17 19:05:52 +01:00
Lukas Spieß
73848744c5
Update code style
2016-03-17 18:55:38 +01:00
Lukas Spieß
17080d79ff
Allow to disable MetricsManager at any time
2016-03-17 18:55:38 +01:00
Eric Jensen
17aebcbaba
Add a space between the ? and : in ternarys
2016-03-17 10:38:51 -07:00
Eric Jensen
14a389c5e0
Replace ASTextKitAttributes' objectsEqual with the shared ASObjectIsEqual
2016-03-17 10:36:35 -07:00
Lukas Spieß
3f6ca05cf5
Update handling of JSON Stream queue
2016-03-17 18:03:01 +01:00
Engin Kurutepe
ad09d83f19
make the sample scheme shared
2016-03-17 15:22:00 +01:00
Lukas Spieß
20edd64fb3
Restore functionality of isQueueBusy method
2016-03-17 15:18:41 +01:00
Lukas Spieß
ef8994f64d
Move internal Channel methods to private header
2016-03-17 15:18:08 +01:00
Engin Kurutepe
e11ed66d99
use current-branch in carthage build
2016-03-17 15:00:32 +01:00
Engin Kurutepe
229bce7f42
disable autocreate schemes
2016-03-17 14:49:14 +01:00
Lukas Spieß
186df88f53
Always build test target to catch build errors earlier
2016-03-17 14:35:42 +01:00
Lukas Spieß
655edfd366
Fix check if loaded metadata is of the right class
2016-03-17 14:33:42 +01:00
Lukas Spieß
5a5eaf018b
Reuse NSURLSession instead of creating a new one with each request
2016-03-17 14:33:33 +01:00
Engin Kurutepe
618febd29b
Merge pull request #2 from ekurutepe/master
...
pull changes from master
2016-03-17 14:15:55 +01:00
Engin Kurutepe
780b00c0f9
Merge pull request #1 from facebook/master
...
pull changes from upstream
2016-03-17 14:13:41 +01:00
Hannah Troisi
69c3b6172c
Merge remote-tracking branch 'facebook/master'
2016-03-17 03:09:21 -07:00
appleguy
d9ef0922d8
Merge pull request #1354 from ejensen/cleanup
...
[Refactoring] Objective-C 2.0 / Modern syntax for arrays, dictionaries, numbers; logic simplification
2016-03-17 01:06:33 -07:00
Hannah Troisi
19f0d5982b
Merge remote-tracking branch 'facebook/master'
2016-03-16 23:16:39 -07:00
appleguy
2ad9d83520
Merge pull request #1353 from ejensen/spelling
...
[Documentation] Correct spelling errors
2016-03-16 22:53:15 -07:00
Hannah Troisi
2d1a8ff4d2
Merge remote-tracking branch 'facebook/master'
2016-03-16 22:48:25 -07:00
appleguy
37a0ba200c
Merge pull request #1391 from facebook/ImageNodeDeadlock
...
[ASImageNode] -setDefaultImage: should release lock before calling -setImage:
2016-03-16 22:16:06 -07:00
appleguy
5788e40719
Merge pull request #1389 from maicki/ImproveASViewControllerExample
...
[Examples] Improve ASViewController example
2016-03-16 21:32:57 -07:00
Scott Goodson
a966b7b6a6
[ASImageNode] -setDefaultImage: should release lock before calling -setImage:
...
This allows -setImage: to fully unlock before it calls -invalidateCalculatedSize.
2016-03-16 20:55:08 -07:00
Christoph Wendt
95c2076c24
Fix bug: Forward custom endpoint to MetricsManager
2016-03-16 18:19:39 -07:00
Hannah Troisi
e4348c0516
Merge remote-tracking branch 'facebook/master'
2016-03-16 18:16:59 -07:00
Christoph Wendt
9588de1ffb
Fix tests
2016-03-16 18:02:05 -07:00
appleguy
5f58b9d8af
Merge pull request #1382 from maicki/AutomaticRangeModeImprovements
...
[ASRangeController] Improvements for automatic range mode to ensure it is persistent / stable if set for an invisible view.
2016-03-16 16:50:28 -07:00
Michael Schneider
e297608e2a
In the first range update and the range mode is not explicitly use the automatic range mode detection
...
This is necessary to get out of the initial range mode state into the first defined range mode state
2016-03-16 16:44:58 -07:00
Michael Schneider
e82118e72f
Add assertion for ASDisplayNode is layer backed if using ASInterfaceStateForDisplayNode
2016-03-16 16:27:08 -07:00
Michael Schneider
41ca796ef4
Improve logic around choosing the range mode automatically and update documentation around logic
2016-03-16 13:37:33 -07:00
Michael Schneider
8d771f930a
Refactor calculation of interface state based on ASDisplayNode and window
2016-03-16 13:26:17 -07:00
Michael Schneider
3b4e8d732c
Improve way to detect interface state of ASCollectionView and ASTableView
2016-03-16 11:45:22 -07:00
Michael Schneider
19232ac493
Address pull request comments
2016-03-16 11:44:56 -07:00
Michael Schneider
d3ba80ccfd
Improvements for automatic range mode
...
- Only update range mode if visibility changes if the node is not range controlled
- Only change explicitly set range mode if ASRangeController becomes visible
- Return interface state for range controller in ASCollectionView and ASTableView based on if the containing node is range managed
2016-03-16 11:44:56 -07:00
appleguy
b30fa8b2f6
Merge pull request #1373 from maicki/FullRangeModeOnScroll
...
[ASRangeController] Go into full range mode if a scroll happens
2016-03-16 11:33:43 -07:00
appleguy
85cba28744
Merge pull request #1378 from hannahmbanana/arrayUtils
...
[ASMultidimensionalArrayUtils] Optimization for recursive version, expanded use case of more efficient 2D version
2016-03-16 11:25:49 -07:00
appleguy
9b26d94da7
Merge pull request #1386 from maicki/ReplaceRecursiveCallsWithHelperFunction
...
[ASDisplayNode] Replace recursive methods with ASDisplayNodePerformBlockOnEveryNode
2016-03-16 11:20:17 -07:00
Michael Schneider
788cdbd326
Improve ASViewController example
2016-03-16 09:36:35 -07:00
Peter
2a0ce4ac86
Merge commit '192e9398e53685be52e0eab26501a1f2a2926cdd'
2016-03-16 14:57:35 +03:00
Peter
771c71117b
no message
2016-03-16 14:56:50 +03:00
Eric Jensen
33fda7ab49
- Use modern Objective-C syntax.
...
- Simplify comparisons.
- Remove dead stores.
2016-03-15 22:34:29 -07:00
Eric Jensen
ddd5ff1f75
Correct spelling errors
2016-03-15 21:56:51 -07:00
appleguy
192e9398e5
Merge pull request #1381 from ejensen/image_modification_block_nullability
...
[ASImageNode] Annotate imageModificationBlock as nullable
2016-03-15 17:49:34 -07:00
