ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-27 22:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,012 Commits 3 Branches 309 Tags
e8d94de9ce4bb10fca1ccbf17f562f361e2bea35
Commit Graph

25012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Scholtysik (Reimold)
46cde6f2d6 Use fixes from https://github.com/bitstadium/HockeySDK-iOS/pull/417 and trigger reload of content in tableview to fix UI glitch 2017-06-13 22:57:23 -07:00
Peter
2bbad53f3f no message 2017-06-14 01:13:25 +03:00
Brandon Withrow
140663c839 Merge pull request #259 from airbnb/btw/timeFix 
Fixed bug with layer time being off by one frame
 2017-06-13 14:26:39 -07:00
brandon_withrow
b319db9a29 Fixed bug with layer time being off by one frame 2017-06-13 14:25:21 -07:00
overtake
75ee44149e Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-06-13 22:23:09 +03:00
Peter
cdef6a6b99 no message 2017-06-13 22:22:21 +03:00
overtake
11eba885a4 Merge commit '0a8559823e2909c1137ef2fb2802023960e66575' into devel 2017-06-13 22:01:57 +03:00
overtake
16c84c3d2a Merge branch 'devel' of https://github.com/peter-iakovlev/TelegramCore into devel 
Conflicts:
	TelegramCore/ChannelAdmins.swift
	TelegramCore/ChannelBlacklist.swift
	TelegramCore/ChannelMembers.swift
	TelegramCore/ChannelParticipants.swift
 2017-06-13 22:00:49 +03:00
overtake
acaf6f359d no message 2017-06-13 21:47:29 +03:00
Peter
0a8559823e Merge branch 'devel' 2017-06-13 21:46:51 +03:00
Peter
93fe592eb9 no message 2017-06-13 21:45:17 +03:00
Adlai Holler
6b3f8f8ad7 Add support for keeping letting cell nodes update to new view models when reloaded. #trivial (#357) 
* Add support for skipping reload if node decides it is compatible with new view model also

* Sort things right

* Put the order back

* No need for redundant expectation

* Fix license header

* Fix comment
 2017-06-13 10:10:37 -07:00
Lukas Spieß
c1ffd7291d Merge pull request #427 from bitstadium/feature/gender-neutral-language 
Use gender-neutral language everywhere
 2017-06-13 18:57:02 +02:00
Hannah Troisi
8861161d6c [Performance] Convert ASLayoutElementSize to atomic #trivial (#331) 
* [Performance] Convert ASLayoutElementSize to atomic

* [ASLayoutElementStyle] Put locks around setter methods.

* Also add lock to setSize: internal method.
 2017-06-12 21:31:37 -07:00
Adlai Holler
83111de0cc Add first-pass view model support to collection node. #trivial (#356) 
* Add first-pass view model support for collection node. Much more to come!

* Address issues

* Update the gorram license header

* Dear lord
 2017-06-12 16:50:33 -07:00
Brandon Withrow
dc796c95aa Merge pull request #257 from airbnb/btw/blankshapefix 
Fix for vertex out of bounds crash
 2017-06-12 15:37:43 -07:00
brandon_withrow
edff297c84 Fix for vertex out of bounds crash 2017-06-12 15:22:43 -07:00
Lukas Spieß
a79bd84127 Use gender-neutral language everywhere 2017-06-13 00:10:47 +02:00
Brandon Withrow
4b66739750 Merge pull request #256 from airbnb/btw/outTimeFix 
Fix for layer out frame
 2017-06-12 14:58:58 -07:00
brandon_withrow
f766cdadd9 Fix for layer out frame 2017-06-12 14:57:59 -07:00
Brandon Withrow
5b5d49664d Merge pull request #255 from airbnb/btw/buildfix 
Fix build error for bundle addition
 2017-06-12 14:46:09 -07:00
brandon_withrow
8bcd58b98a Fix build error for nbundle addition 2017-06-12 14:32:35 -07:00
Brandon Withrow
5f6f1c882f Merge pull request #238 from fnazrala/loadImageFromCustomBundle 
Allow load image from custom bundle
 2017-06-12 13:49:20 -07:00
Brandon Withrow
8dff2df857 Merge branch 'master' into loadImageFromCustomBundle 2017-06-12 13:48:48 -07:00
Brandon Withrow
d89b40d026 Merge pull request #223 from bellchen/master 
add rootDic for imageAsset
 2017-06-12 13:45:28 -07:00
Adlai Holler
c297060113 Add a unit test for double-initial-load issue (#352) 2017-06-12 13:13:49 -07:00
Brandon Withrow
bf11cb7084 Merge pull request #194 from aquarchitect/master 
macOS Public Header Build Error
 2017-06-12 12:57:21 -07:00
Benjamin Scholtysik (Reimold)
98e22f7681 Merge pull request #423 from cocologics/fix/Xcode9-warnings 
Xcode 9 update
 2017-06-12 11:27:48 -07:00
Peter
8a5b2f43ac no message 2017-06-12 21:02:16 +03:00
Fela Ameghino
4c653d0790 - Added Evgeny's aes_ctr_encrypt implementation 
- API availability check for AudioRoutingManager on UWP
 2017-06-12 12:59:35 +02:00
Fela Ameghino
d79d1a0eff Merge remote-tracking branch 'upstream/public' into public 2017-06-12 10:04:25 +02:00
Levi McCallum
267fe6e23b Fix title in changelog (#350) 2017-06-12 00:30:35 -07:00
bellchen
71326e9589 change rootDic to rootDirectory; 
change animationWithFile to animationWithFilePath
 2017-06-12 10:56:39 +08:00
Adlai Holler
8af1538a5b Add a Flag to Disable Main Thread Assertions #trivial (#348) 
* Add a thread-flag for disabling main thread assertions

* Fix the license header
 2017-06-11 18:53:20 -05:00
Adlai Holler
69e69873cc Migrate to Latest OCMock, Demonstrate Improved Unit Testing (#347) 
* Update OCMock 2.2 -> 3.4

* Clean up and port ASMultiplexImageNodeTests

* Clean up

* Be stricter about order

* Log change

* Update the licenses #important

* Update the license headers more
 2017-06-11 11:41:30 -05:00
Lukas Spieß
f433e98c39 Merge pull request #425 from pietbrauer/use-stefans-feedback 
Use __attribute__((noreturn))
 2017-06-11 16:35:43 +02:00
Adlai Holler
c9e4b98a55 Upgrade ASLayoutElementContext to an Object #trivial (#344) 
* Upgrade ASLayoutElementContext to an object

* Address feedback from Huy
 2017-06-10 00:25:39 -05:00
Lukas Spieß
de91938fd9 Merge pull request #426 from bitstadium/feature/fix-travis-carthage 
Remove manual unlinking of Carthage on Travis
 2017-06-10 02:10:26 +02:00
Lukas Spieß
28956c4d51 Use iOS 10.3.1 on Travis instead of 10.3 
Travis moved to 10.3.1, hence our required destinations now don't exist anymore.
 2017-06-09 20:43:11 +02:00
Lukas Spieß
66d163ea5f Remove manual unlinking of Carthage on Travis 
This hopefully fixes a CI failure for the Distribution target
 2017-06-09 17:33:57 +02:00
overtake
e9093ccf99 Merge branch 'devel' of https://github.com/peter-iakovlev/TelegramCore into devel 2017-06-09 14:27:28 +03:00
overtake
707608391a changes 2017-06-09 14:27:16 +03:00
Peter
26f4f3ebf9 no message 2017-06-09 13:38:12 +03:00
overtake
ef2035cd74 - admins reform 2017-06-09 05:57:18 +03:00
Huy Nguyen
05e9bdd092 Small changes required by the coming layout debugger (#337) 
* Small changes required by the layout debugger
- `ASDisplayNode` can be told to not flatten its layout immediately but later on. The unflattened layout is also stored in a separate property. It's needed for inspecting not only display nodes but also layout specs used to compute a layout tree.
- `ASLayout` can be told to always retain its sublayout elements. This is needed especially for layout specs since they are usually not retained after an ASLayout was computed.

* Update CHANGELOG

* Address comments
 2017-06-08 10:47:50 -07:00
Michael Schneider
13c467b2f4 Fix internal Linter warnings #trivial (#340) 
* Fix internal Linter warnings

* Remove explicit copy for block as let us just use the default one
 2017-06-08 10:45:03 -07:00
Federico Nazrala
d2eb8113fd Merge branch 'master' of github.com:airbnb/lottie-ios into loadImageFromCustomBundle 2017-06-07 18:51:52 -03:00
Federico Nazrala
5780e06ffb PR review 2017-06-07 18:50:04 -03:00
Brandon Withrow
4c623a8a2a Merge pull request #245 from 3sidedcube/fix/setting_progress 
Fixes setting initial progress of Lottie animation
 2017-06-07 12:19:32 -07:00
Brandon Withrow
a4dab2b0c0 Merge pull request #239 from yury-dymov/loop-pos-fix 
Duration fix for JSON based models
 2017-06-07 12:13:12 -07:00