oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity
9234 commits 5 branches 133 tags 218 MiB
Commit graph

9234 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Chen
8830f0a594 Clean up ahead of PR. 2018-10-15 15:11:20 -04:00
Matthew Chen
0b4ed1175d Create AppEnvironment. 2018-10-15 15:08:37 -04:00
Matthew Chen
d7e52367ff Create AppEnvironment. 2018-10-15 15:08:37 -04:00
Matthew Chen
dbaa49d2f9 Merge branch 'charlesmchen/buildBreakage' 2018-10-15 15:08:14 -04:00
Matthew Chen
bc4ac8cd15 Respond to CR. 2018-10-15 15:08:00 -04:00
Matthew Chen
df6fe05d0d Get tests running. 2018-10-15 13:39:45 -04:00
Matthew Chen
53466386fd Get tests running. 2018-10-15 12:59:28 -04:00
Matthew Chen
32cf68bece Get all tests building. 2018-10-15 12:50:07 -04:00
Matthew Chen
8149219359 Merge remote-tracking branch 'origin/release/2.30.2' 2018-10-15 12:25:17 -04:00
Matthew Chen
88c96f3c21 Update Cocoapods. 2018-10-15 12:22:58 -04:00
Michael Kirk
ab9e959613 Merge branch 'mkirk/call-missing-retain' into master 2018-10-15 09:41:03 -06:00
Michael Kirk
5b8d712add add missing retain in peer connection client 2018-10-15 09:40:44 -06:00
Matthew Chen
5a6c2d32ff Merge branch 'charlesmchen/smEnvironment' 2018-10-15 11:35:00 -04:00
Matthew Chen
603e3bf0b6 Move SM singletons to Environment. 2018-10-15 11:34:42 -04:00
Michael Kirk
b9d592ed15 Merge branch 'mkirk/upgrade-promisekit' into master 2018-10-13 16:10:29 -06:00
Michael Kirk
0cfa5c07fe update pods 2018-10-13 16:04:20 -06:00
Michael Kirk
d6a6024f37 Update PromiseKit 2018-10-13 16:04:20 -06:00
Michael Kirk
0767dd66a0 "Bump build to 2.30.2.16." 2018-10-12 21:40:43 -06:00
Michael Kirk
1a1bf38ff6 update translations 2018-10-12 21:40:24 -06:00
Michael Kirk
3d3454ceb0 "Bump build to 2.30.2.15." 2018-10-12 21:35:28 -06:00
Michael Kirk
d2ac64b304 update carthage 2018-10-12 21:35:23 -06:00
Michael Kirk
f578ab1df2 Merge branch 'mkirk/dev-fixups' into private-master 2018-10-12 16:22:03 -06:00
Michael Kirk
92e8b117f5 fixup debug contacts 2018-10-12 16:20:03 -06:00
Matthew Chen
9b6d2be370 "Bump build to 2.31.0.2." 2018-10-12 17:56:58 -04:00
Michael Kirk
c9abd5a6e7 Merge branch 'mkirk/fix-new-account-registration' into master 2018-10-12 15:56:27 -06:00
Michael Kirk
c425aa9493 dont rotate profile keys for unregistered user 2018-10-12 15:55:41 -06:00
Matthew Chen
b44a5e9d2a "Bump build to 2.31.0.1." 2018-10-12 17:39:12 -04:00
Matthew Chen
f4db5e6bbb Merge branch 'charlesmchen/accountAttributeUpdates' 2018-10-12 17:38:29 -04:00
Matthew Chen
c9922cda3e Respond to CR. 2018-10-12 17:38:13 -04:00
Matthew Chen
8fdf6009f9 Sync contacts after rotating profile key. 2018-10-12 17:19:00 -04:00
Matthew Chen
eb7abdfc64 Account attributes updates. 2018-10-12 17:19:00 -04:00
Matthew Chen
f1d93d4472 Merge remote-tracking branch 'origin/release/2.30.2' 2018-10-12 16:00:42 -04:00
Matthew Chen
c995c838d2 "Bump build to 2.30.2.14." 2018-10-12 15:32:50 -04:00
Matthew Chen
97d6ac3706 Merge branch 'mkirk/blue-group' into release/2.30.2 2018-10-12 15:32:37 -04:00
Michael Kirk
d5f69e4bba feature flag for group avatar color 2018-10-12 15:32:03 -04:00
Matthew Chen
ebd3560547 "Bump build to 2.30.2.13." 2018-10-12 14:13:24 -04:00
Matthew Chen
6fe05a61bf Merge branch 'charlesmchen/sendDeliveryReceipts' 2018-10-12 14:09:00 -04:00
Matthew Chen
5e0bc1bc1e Respond to CR. 2018-10-12 14:08:42 -04:00
Michael Kirk
3e85c8c023 clang-format branch changes 2018-10-12 13:52:46 -04:00
Matthew Chen
b53cb9e616 Clean up ahead of PR. 2018-10-12 13:52:46 -04:00
Matthew Chen
5cf8909a28 Modify OWSOutgoingReceiptManager to handle read receipts. 2018-10-12 13:52:46 -04:00
Matthew Chen
010ce1f6c2 Rename to OWSOutgoingReceiptManager. 2018-10-12 13:52:46 -04:00
Matthew Chen
2b45a8348e Clean up ahead of PR. 2018-10-12 13:52:46 -04:00
Matthew Chen
f5591ef7b7 Clean up ahead of PR. 2018-10-12 13:52:46 -04:00
Matthew Chen
62d1fd2025 Clean up ahead of PR. 2018-10-12 13:52:46 -04:00
Matthew Chen
45d6250aee Send delivery receipts. 2018-10-12 13:52:46 -04:00
Matthew Chen
de7bffa593 Send delivery receipts. 2018-10-12 13:52:46 -04:00
Matthew Chen
13373db3bc Send delivery receipts. 2018-10-12 13:52:46 -04:00
Matthew Chen
b5f6670dee Merge branch 'charlesmchen/obsoleteCDSConstant' 2018-10-12 13:51:44 -04:00
Matthew Chen
9ef0f35d26 Remove obsolete CDS constant. 2018-10-12 13:51:33 -04:00