153 Commits

Author	SHA1	Message	Date
Peter	652832e32b	Merge commit '3ca08f7aae8e4c108730926be5954d371b4d5ef7' ... # Conflicts: # TelegramCore/StoreMessage_Telegram.swift	2017-03-14 17:22:32 +03:00
Peter	b7bd388ff4	no message	2017-03-14 17:21:25 +03:00
overtake	3ca08f7aae	forward messages fro channel with unsigned messages	2017-03-14 17:14:49 +03:00
overtake	edd14a8f41	no message	2017-03-13 19:43:35 +03:00
overtake	02269ab60e	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore	2017-03-12 21:07:50 +03:00
Peter	6457c89007	no message	2017-03-12 21:03:01 +03:00
overtake	f99074c62d	for migration	2017-03-12 19:04:13 +03:00
overtake	ff5c66e7bb	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore	2017-03-12 19:03:56 +03:00
Peter	44ff4fe420	no message	2017-03-12 19:01:07 +03:00
overtake	94ec63f287	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore	2017-03-12 15:19:17 +03:00
Peter	e840d27434	no message	2017-03-12 13:28:38 +03:00
overtake	d3a0226f72	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore ... Conflicts: TelegramCore/ProcessSecretChatIncomingDecryptedOperations.swift	2017-03-10 21:43:46 +03:00
overtake	678236b6bc	- no message	2017-03-10 21:43:11 +03:00
Peter	c4021393ea	no message	2017-03-10 21:34:58 +03:00
overtake	98e376cdd7	passcode	2017-03-09 10:22:57 +03:00
Peter	6e6a71dabb	Merge commit '056de30392d16a29cce16c0a240271f30093e528'	2017-03-09 01:02:30 +03:00
Peter	18fae85e67	no message	2017-03-09 01:02:25 +03:00
overtake	056de30392	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore	2017-03-08 09:10:09 +03:00
Peter	deca9e61de	no message	2017-03-08 01:05:38 +03:00
Peter	f5c7871b05	no message	2017-03-08 01:03:20 +03:00
overtake	4985373538	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore	2017-03-07 18:00:35 +03:00
Peter	624b6e160f	no message	2017-03-07 18:00:11 +03:00
overtake	16ce327863	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore	2017-03-07 16:12:00 +03:00
Peter	55d3f0cc75	no message	2017-03-07 16:10:43 +03:00
overtake	4508ce5278	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore	2017-03-07 16:00:35 +03:00
overtake	86d259e7c9	check media changes after copy to mediabox	2017-03-07 15:58:57 +03:00
Peter	976f82204d	Merge commit 'c63302459dbfd7c543b9bd7260f53eb3c34bacb6'	2017-03-07 15:58:40 +03:00
Peter	9af14df09e	no message	2017-03-07 15:58:35 +03:00
overtake	c63302459d	- no message	2017-03-07 10:09:50 +03:00
Peter	d57b82cc15	no message	2017-03-07 01:36:18 +03:00
Peter	d6025daae8	no message	2017-03-06 21:43:07 +03:00
Peter	f5a6cfdc1b	Merge commit '4c7d17b3dd6c6450058e9e8822e56134832a7059'	2017-03-06 17:23:07 +03:00
Peter	91ed2e4bd0	no message	2017-03-06 17:22:54 +03:00
overtake	4c7d17b3dd	import fixes	2017-03-06 14:35:06 +03:00
Peter	49d1aea8d2	no message	2017-03-06 02:11:11 +03:00
Peter	ca74503c28	no message	2017-03-06 01:16:00 +03:00
Peter	117004025d	Merge commit 'faa3d0317deee578665860a1c667c62eaaadc91b'	2017-03-05 20:11:58 +03:00
Peter	9ef97cfe86	no message	2017-03-05 20:11:49 +03:00
overtake	faa3d0317d	- importAccount small changes	2017-03-05 16:26:28 +03:00
overtake	b5d13dbcb3	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore	2017-03-05 13:10:07 +03:00
overtake	b7900da12a	enable logging	2017-03-05 13:10:01 +03:00
Peter	652566ee5d	no message	2017-03-04 23:13:19 +04:00
Peter	de5cba0182	no message	2017-03-03 19:32:51 +04:00
Peter	7c14fc1191	no message	2017-03-03 18:39:54 +04:00
Peter	b794fa0b65	no message	2017-03-03 14:56:18 +04:00
overtake	90ff4b170b	Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore	2017-03-03 13:07:12 +03:00
overtake	476286a618	- groups in common	2017-03-03 13:07:00 +03:00
Peter	8cdda3067b	Merge commit '27ca0524910c00918931c6550bf1b85f3dbfa65b'	2017-03-03 13:46:43 +04:00
Peter	dc79b1d7b4	Merge commit '4ec50d09e0230ddf47af86680879c2a0a4ad82bd'	2017-03-03 13:46:34 +04:00
Peter	2b70c7702f	Merge commit 'a267d8dd89bed337236709fbf38f1698845f807a' ... # Conflicts: # TelegramCore.xcodeproj/project.pbxproj	2017-03-03 13:46:08 +04:00