Commit Graph

9263 Commits

Author SHA1 Message Date
Michael Kirk
aff35329bd make factory Swift 4.1 compatible 2018-10-16 17:12:13 -04:00
Matthew Chen
cccd246122 Revert "Revert Factories."
This reverts commit 7aabb821bd.
2018-10-16 17:09:25 -04:00
Matthew Chen
44b951fdf8 Merge branch 'charlesmchen/migrationCompletion' 2018-10-16 17:08:41 -04:00
Matthew Chen
2b8c70ef9e Fix UD attributes migration completion. 2018-10-16 17:08:31 -04:00
Matthew Chen
2e4a655b77 Merge branch 'charlesmchen/pasteLogUpdates' 2018-10-16 16:47:03 -04:00
Matthew Chen
92b55b945b Revert copy change. 2018-10-16 16:46:55 -04:00
Matthew Chen
866338fba6 Refine debug logs UI. 2018-10-16 16:46:38 -04:00
Matthew Chen
d5aa72a228 Merge branch 'charlesmchen/singletonAgain' 2018-10-16 16:31:27 -04:00
Matthew Chen
c6ef7f18e7 Improve test logging. 2018-10-16 13:01:24 -04:00
Matthew Chen
79ed05133c Move db connections to environments. 2018-10-16 13:01:11 -04:00
Matthew Chen
f1646b6cbc Move db connections to environments. 2018-10-16 13:00:50 -04:00
Matthew Chen
829851bd7b Hang PushManager on AppEnvironment. 2018-10-16 11:47:54 -04:00
Matthew Chen
fa89e487a4 Merge branch 'charlesmchen/udThreadlessErrors' 2018-10-16 11:13:16 -04:00
Matthew Chen
9d7c3afdaf Show (threadless) error notifications for UD decrypt failures. 2018-10-16 11:00:38 -04:00
Matthew Chen
10309faf53 "Bump build to 2.31.0.6." 2018-10-16 10:43:06 -04:00
Matthew Chen
b1e52c30b3 Fix build breakage. 2018-10-16 10:42:51 -04:00
Matthew Chen
3cf13ee15b "Bump build to 2.31.0.5." 2018-10-16 10:31:08 -04:00
Matthew Chen
7aabb821bd Revert Factories. 2018-10-16 10:31:04 -04:00
Matthew Chen
d5bf17e594 "Bump build to 2.31.0.4." 2018-10-16 10:21:32 -04:00
Matthew Chen
92f21e96bc Update Cocoapods. 2018-10-16 10:21:05 -04:00
Matthew Chen
ce8b182740 "Bump build to 2.31.0.3." 2018-10-16 09:51:50 -04:00
Michael Kirk
0a56b8258d Merge branch 'mkirk/fix-testutils-breakage' into master 2018-10-15 16:07:23 -06:00
Michael Kirk
d6cbdddc42 Fix test build, rename src/Test/ ->src/TestUtils/ to avoid confusion with the
existing test/ directory
2018-10-15 15:58:54 -06:00
Michael Kirk
db09a4dae9 Merge branch 'mkirk/test-factories' into master 2018-10-15 15:21:04 -06:00
Michael Kirk
ac7f9f62d4 factories for tests 2018-10-15 15:20:23 -06:00
Matthew Chen
59551ddab4 Merge branch 'charlesmchen/enableOrphanDataCleaner' 2018-10-15 17:01:01 -04:00
Matthew Chen
72d21f5119 Enable orphan data cleaner. 2018-10-15 17:00:54 -04:00
Matthew Chen
f92ef84477 Merge branch 'charlesmchen/buildBreakage3' 2018-10-15 16:20:58 -04:00
Matthew Chen
48c4576c06 Fix failing test. 2018-10-15 15:51:43 -04:00
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