Commit Graph

8372 Commits

Author SHA1 Message Date
Matthew Chen 34a404f589 Clean up ahead of PR. 2018-08-07 13:20:22 -04:00
Matthew Chen 379104c532 Migrate to WebRTC proto wrappers. 2018-08-07 13:20:22 -04:00
Matthew Chen 67110d0def Migrate to websocket proto wrappers. 2018-08-07 13:20:22 -04:00
Matthew Chen f795ec352e Migrate to backup proto wrappers. 2018-08-07 13:20:22 -04:00
Matthew Chen eaf59b122d Migrate to provisioning proto wrappers. 2018-08-07 13:20:22 -04:00
Matthew Chen 50db472be5 Migrate to fingerprint proto wrappers. 2018-08-07 13:20:22 -04:00
Matthew Chen cace335d45 Merge branch 'charlesmchen/orphanDataCleanerV2' 2018-08-07 13:18:33 -04:00
Matthew Chen aeb539502d Update Cocoapods. 2018-08-07 13:18:04 -04:00
Matthew Chen 2fd77fcc29 Fix typo. 2018-08-07 13:16:30 -04:00
Matthew Chen 4bb0122c07 Respond to CR. 2018-08-07 13:07:26 -04:00
Matthew Chen 815ccbdcd1 Respond to CR. 2018-08-07 13:07:26 -04:00
Matthew Chen 06d84860ae Fix rebase breakage. 2018-08-07 13:07:26 -04:00
Matthew Chen 45e782c243 Revamp orphan data cleaner. 2018-08-07 13:07:26 -04:00
Roger Hu 95d734b1bd Update BUILDING.md
Fix spelling
2018-08-06 16:02:15 -06:00
Roger Hu 58897928fc Update BUILDING.md
Fix https://
2018-08-06 16:01:50 -06:00
Michael Kirk b26ebee3a9 Merge branch 'mkirk/update-pods2' 2018-08-06 14:17:21 -06:00
Michael Kirk 495c334d14 update pods
// FREEBIE
2018-08-06 14:16:44 -06:00
Matthew Chen d3a4447f81 Convert overzealous assert. 2018-08-06 09:34:26 -04:00
Matthew Chen 64c6d820fd Fix typo. 2018-08-06 09:26:02 -04:00
Matthew Chen 3395bdab69 Merge branch 'charlesmchen/redundantContentInsets' 2018-08-06 09:09:01 -04:00
Matthew Chen cea93784b1 Avoid redundant content inset updates. 2018-08-06 09:08:54 -04:00
Matthew Chen 55158e2a59 Merge branch 'charlesmchen/cleanupFormatting2' 2018-08-06 09:03:37 -04:00
Matthew Chen c687c09762 Update Cocoapods. 2018-08-06 09:02:40 -04:00
Matthew Chen d709a02493 Clean up formatting. 2018-08-06 09:02:40 -04:00
Matthew Chen 9b45a15c35 Merge branch 'release/2.28.1' 2018-08-06 09:01:19 -04:00
Michael Kirk f633ebe2d9 update socketrocket 2018-08-03 14:41:06 -06:00
Michael Kirk c6697bb4bf Merge branch 'mkirk/seed' 2018-08-03 14:26:48 -06:00
Michael Kirk 0bc03b0fd4 Move seed 2018-08-03 14:26:43 -06:00
Michael Kirk 4704c6751a Merge branch 'mkirk/update-pods' 2018-08-03 14:25:49 -06:00
Michael Kirk a7bc023526 update pods 2018-08-03 14:24:44 -06:00
Michael Kirk ae488d330f Merge branch 'mkirk/upstream-yap-db' 2018-08-03 14:11:23 -06:00
Michael Kirk fc1ce02ae5 CR: Now that we have transaction semantics, this shouldn't happen.
// FREEBIE
2018-08-03 14:10:46 -06:00
Michael Kirk 1eb7fc986c YapDB introduced a method purpose built to do what we were approximating.
This seems a little more future proof / less error prone if we change the
registered extensions.
2018-08-03 14:09:35 -06:00
Michael Kirk df01c7e63e Update to latest YapDB (with Signal patches applied)
Applied branches:

- mkirk/invalidFinalIndices
- mkirk/upstream-unencrypted-headers

Also fixed up test suite.
2018-08-03 14:09:35 -06:00
Matthew Chen c8f33e4fc6 "Bump build to 2.28.1.1." 2018-08-03 15:58:42 -04:00
Matthew Chen 89b3ebb72b Merge branch 'charlesmchen/deferMessageResizing' into release/2.28.1 2018-08-03 15:58:26 -04:00
Matthew Chen 4918b8994e Delay footer collapse in new messages. 2018-08-03 15:57:54 -04:00
Matthew Chen 95cf4f5c6d Don't reserve space for timestamp in footer. 2018-08-03 15:57:54 -04:00
Matthew Chen 251eef46a2 Delay footer collapse in new messages. 2018-08-03 15:57:54 -04:00
Matthew Chen 2ba5f65d89 Merge branch 'charlesmchen/protoWrappers3' 2018-08-03 15:54:30 -04:00
Matthew Chen 2433a08c82 Update Cocoapods. 2018-08-03 15:54:10 -04:00
Matthew Chen a647b5be48 Respond to CR. 2018-08-03 15:50:27 -04:00
Matthew Chen 3f47524373 Respond to CR. 2018-08-03 14:52:55 -04:00
Michael Kirk c957578a01 Merge branch 'mkirk/fix-remaining-navbar' into release/2.28.1 2018-08-03 12:43:44 -06:00
Michael Kirk dbbccaadbe fixup block table vis a new navbar style
// FREEBIE
2018-08-03 12:40:52 -06:00
Michael Kirk 991848b364 Fix "blue navbar" for contact picker
- content flows behind navbar
- unify search bar style with rest of app

// FREEBIE
2018-08-03 12:40:49 -06:00
Matthew Chen 03a9b21cfd Respond to CR. 2018-08-03 14:35:22 -04:00
Matthew Chen 632dc145fd Code generate Swift wrappers for protocol buffers. 2018-08-03 14:05:20 -04:00
Matthew Chen 6be3d2e42d Code generate Swift wrappers for protocol buffers. 2018-08-03 14:05:20 -04:00
Matthew Chen 8d814a5210 Code generate Swift wrappers for protocol buffers. 2018-08-03 14:05:20 -04:00