Commit graph

10401 commits

Author SHA1 Message Date
Matthew Chen 5adcbac5ef Landscape orientation. 2019-01-09 15:14:36 -05:00
Matthew Chen aefe0eabed Landscape orientation. 2019-01-09 15:14:36 -05:00
Matthew Chen 045b112724 Landscape orientation. 2019-01-09 15:14:36 -05:00
Matthew Chen 5fc88789b4 Merge branch 'charlesmchen/landscapeOrientation1' 2019-01-09 15:13:59 -05:00
Matthew Chen 460f160cbb Landscape orientation. 2019-01-09 15:13:48 -05:00
Matthew Chen feac8d2644 Merge branch 'mkirk/enable-multisend' 2019-01-09 15:11:40 -05:00
Michael Kirk 099b9f60c3 enable multisend 2019-01-09 12:29:31 -07:00
Michael Kirk fe59979705 Merge branch 'mkirk/multisend-delete-icon' 2019-01-09 12:28:00 -07:00
Michael Kirk 0ab326da92 Only show delete button on selected rail item 2019-01-09 12:27:15 -07:00
Matthew Chen 268d1c4b63 "Bump build to 2.34.0.2." 2019-01-08 16:52:04 -05:00
Matthew Chen c76bc6dbaa Merge branch 'charlesmchen/fixRegistration' 2019-01-08 16:51:43 -05:00
Matthew Chen 63260ee94d Fix registration. 2019-01-08 15:38:08 -05:00
Matthew Chen 736d0c421d Merge branch 'charlesmchen/removeLockInteractionController' 2019-01-08 13:52:51 -05:00
Matthew Chen c0922fc2c0 Remove LockInteractionController. 2019-01-08 13:52:36 -05:00
Matthew Chen 517458dc63 Merge tag '2.33.0.12' 2019-01-08 12:56:23 -05:00
Michael Kirk d873ac278d Merge branch 'mkirk/fix-ios9-crash' 2019-01-08 09:55:42 -07:00
Michael Kirk 014cf9c500 fix crash on iOS9 2019-01-08 09:55:35 -07:00
Michael Kirk 76c7ea8f7c Merge branch 'mkirk/fix-image-editor-swipe' 2019-01-08 09:52:20 -07:00
Michael Kirk 265552ae0e enable multisend in debug 2019-01-08 09:51:42 -07:00
Michael Kirk c690ac2710 allow deselecting tool 2019-01-08 09:51:42 -07:00
Michael Kirk a8200d6f4a Fix swipe between multi-images
gesture shouldn't be enabled until tool has been selected
2019-01-08 09:51:42 -07:00
Matthew Chen 5cc02501fd Merge branch 'charlesmchen/conversationViewModelAssert' 2019-01-08 10:26:59 -05:00
Matthew Chen c30f155221 Fix overzealous assert. 2019-01-07 17:04:54 -05:00
Matthew Chen 3f4ff23212 "Bump build to 2.34.0.1." 2019-01-07 15:40:55 -05:00
Matthew Chen 8dddea3c6e Merge branch 'charlesmchen/conversationScrollRefinements' 2019-01-07 15:37:41 -05:00
Matthew Chen 7df17251a2 Fix edge cases in conversation view scroll continuity. 2019-01-07 15:37:31 -05:00
Matthew Chen b92051c881 Fix edge cases in conversation view scroll continuity. 2019-01-07 15:37:31 -05:00
Matthew Chen 6b881b9efe Fix edge cases in conversation view scroll continuity. 2019-01-07 15:37:31 -05:00
Matthew Chen c92e0959c2 Update info.plist to reflect WebRTC update. 2019-01-07 15:24:01 -05:00
Michael Kirk 4daf764bd7 Merge branch 'mkirk/ci' 2019-01-07 12:52:01 -07:00
Michael Kirk edab44b899 include url in status message 2019-01-07 12:51:35 -07:00
Michael Kirk b95dcd4ae3 fix broken test 2019-01-07 12:51:35 -07:00
Michael Kirk 2233d4c72c Add jenkinsfile 2019-01-07 12:51:35 -07:00
Michael Kirk 2a2f30e2a6 update fastlane 2019-01-07 12:51:35 -07:00
Michael Kirk 5fe26b4ba5 bump ruby version 2019-01-07 12:51:35 -07:00
Matthew Chen b09ad7bf91 Merge branch 'charlesmchen/conversationViewMapping' 2019-01-07 12:47:43 -05:00
Matthew Chen f90e49226d Respond to CR. 2019-01-07 12:47:15 -05:00
Matthew Chen 46b0cdb872 Caution around group avatars. 2019-01-07 12:47:15 -05:00
Matthew Chen 73f5d9237d Avoid overflow. 2019-01-07 12:47:15 -05:00
Matthew Chen f32edc93e4 Tweak conversation view animations. 2019-01-07 12:47:15 -05:00
Matthew Chen 435379926a Introduce conversation view mapping; rework conversation view scrolling. 2019-01-07 12:47:15 -05:00
Matthew Chen c5b0c73055 Introduce conversation view mapping; rework conversation view scrolling. 2019-01-07 12:47:15 -05:00
Matthew Chen c775dbcd66 Introduce conversation view mapping; rework conversation view scrolling. 2019-01-07 12:47:15 -05:00
Michael Kirk 371a6a6f15 Merge branch 'mkirk/m71' 2019-01-07 10:39:45 -07:00
Michael Kirk e091551600 Fix: subsequent video calls fail to transmit video 2019-01-07 10:39:08 -07:00
Michael Kirk 91cf022716 WebRTC M71
Protocol was renamed in 416018d455%5E%21/

And the RTC_SUPPORTS_METAL define was removed from RTC headers.
2019-01-07 10:39:08 -07:00
Matthew Chen befe37a8d8 Merge branch 'charlesmchen/signalingKey' 2019-01-07 09:02:53 -05:00
Matthew Chen 951f0dab22 Respond to CR. 2019-01-07 09:02:39 -05:00
Matthew Chen 3a5de59dcb Try to update account attributes every time we upgrade. 2019-01-07 09:02:39 -05:00
Matthew Chen ed25f4748d Deprecate 'signaling key'. 2019-01-07 09:02:39 -05:00