Matthew Chen
c947f6b22a
Modify build version script to support --version and --internal switches.
2018-01-18 13:19:01 -05:00
Matthew Chen
4e15e9bf2c
Add Signal "internal" scheme with DEBUG and INTERNAL flags set for signal project.
2018-01-18 13:19:01 -05:00
Matthew Chen
a21bc4f4b4
Convert SAE scheme to a shared scheme.
2018-01-18 13:19:01 -05:00
Michael Kirk
c7376d76c1
Merge branch 'mkirk/fullscreen-approval'
2018-01-18 13:12:27 -05:00
Michael Kirk
5dde17d939
Show approval/caption view in app.
...
ApprovalView/Captioning is shown for:
- Images/Videos from Library
- Images/Video from Camera
- Document Picker
- GIFs
Voice notes are intentionally not captionable.
Also, in main app, hide status bar when ApprovalView is presented
// FREEBIE
2018-01-17 18:19:48 -05:00
Michael Kirk
58558b36de
Add clarifying comment.
...
// FREEBIE
2018-01-17 18:11:48 -05:00
Michael Kirk
d75b577580
Merge branch 'mkirk/ri-2-19-4'
2018-01-17 18:08:47 -05:00
Michael Kirk
3f3a4bc499
Merge remote-tracking branch 'origin/master' into mkirk/ri-2-19-4
2018-01-17 18:08:42 -05:00
Matthew Chen
6532a32374
Merge branch 'CollinStuart-collinstuart/update-build-documentation'
2018-01-17 09:52:23 -05:00
Collin B. Stuart
225ad5a4a2
Update build instructions
...
- clarify capability settings
// FREEBIE
2018-01-17 09:52:02 -05:00
Collin B. Stuart
f542e0d25c
Update build instructions
...
- clarify capability settings
// FREEBIE
2018-01-17 09:52:02 -05:00
Michael Kirk
94d58b88b8
Play video inline in approval view
...
Previously we launched the MPMoviePlayerController
// FREEBIE
2018-01-16 17:57:14 -05:00
Michael Kirk
0c6a42003f
clang-format after RI
...
// FREEBIE
2018-01-16 15:27:53 -05:00
Michael Kirk
a423fe8a0e
WIP Merge tag '2.19.4.4'
...
- restore video playback in fullscreen
This was a large merge, so I'm opting to make some changes in separate
commits.
2018-01-16 15:25:58 -05:00
Matthew Chen
7947cc0fef
Merge branch 'charlesmchen/updateOpenSSL'
2018-01-12 17:19:43 -05:00
Matthew Chen
63dc3391be
Update OpenSSL to new version, app extension compliant.
2018-01-12 17:19:32 -05:00
Matthew Chen
5aa016adda
Merge branch 'charlesmchen/sessionEdgeCases_'
2018-01-12 16:50:12 -05:00
Matthew Chen
0d5b5bc44c
Respond to CR.
2018-01-12 16:49:51 -05:00
Matthew Chen
3de9a4ea55
Add debug UI actions around clearing and snapshotting session state.
2018-01-12 16:42:18 -05:00
Matthew Chen
a1770ec7fc
Merge branch 'charlesmchen/robustBackup'
2018-01-12 16:41:09 -05:00
Matthew Chen
05b034e925
Clear out NSUserDefaults during backup restore.
2018-01-12 16:40:57 -05:00
Matthew Chen
67197ddf15
Rename any existing files and directories in restored directories.
2018-01-12 16:40:57 -05:00
Matthew Chen
09032552cf
Merge branch 'charlesmchen/dontUseMainApplicationState'
2018-01-12 16:40:16 -05:00
Michael Kirk
56112e79be
bump build
...
// FREEBIE
2018-01-12 15:53:15 -05:00
Michael Kirk
7eb6b1cdd6
Revert submodule update from "Bump version to 2.19.4."
...
Partial revert of commit e11ac51e31
to remove unintentional submodule update
2018-01-12 15:51:24 -05:00
Matthew Chen
2b528ad894
Don't use mainApplicationState in business logic.
2018-01-12 14:24:35 -05:00
Matthew Chen
b271eab4c7
Merge branch 'charlesmchen/skipRedundantSyncMessages'
2018-01-12 10:36:25 -05:00
Matthew Chen
fec2410ac2
Respond to CR.
2018-01-12 10:36:09 -05:00
Matthew Chen
3f2bee8383
Respond to CR.
2018-01-12 10:36:09 -05:00
Matthew Chen
d81d85c386
Respond to CR.
2018-01-12 10:36:09 -05:00
Matthew Chen
c308e25115
Skip redundant sync messages.
2018-01-12 10:36:09 -05:00
Matthew Chen
a2b67a17fd
Skip redundant sync messages.
2018-01-12 10:36:09 -05:00
Matthew Chen
41e6eaeafc
Skip redundant sync messages.
2018-01-12 10:36:09 -05:00
Matthew Chen
de4c5e0b17
Merge branch 'charlesmchen/sessionDatabaseRevert2_'
2018-01-12 10:25:13 -05:00
Matthew Chen
76676659f8
Respond to CR.
2018-01-12 10:25:04 -05:00
Matthew Chen
17907dca10
Clean up ahead of PR.
2018-01-12 10:23:54 -05:00
Matthew Chen
15b8e58324
Retain changes from session database branch.
2018-01-12 10:23:54 -05:00
Matthew Chen
76a295aaa5
Merge branch 'charlesmchen/backup'
2018-01-12 10:21:47 -05:00
Michael Kirk
a4cadfecfa
bump build
...
// FREEBIE
2018-01-12 00:55:17 -05:00
Michael Kirk
764b815356
bump build
...
// FREEBIE
2018-01-12 00:22:52 -05:00
Michael Kirk
9c9734f5a1
Merge branch 'hotfix-2-19-4/fix-zoom' into hotfix/2.19.4
2018-01-12 00:21:33 -05:00
Michael Kirk
63c23b77d0
Cleanup presentation view, feels less blurry
...
// FREEBIE
2018-01-12 00:17:06 -05:00
Michael Kirk
1ef824029e
Fix distorted images
...
// FREEBIE
2018-01-11 23:58:11 -05:00
Michael Kirk
3582ab42db
Fix media detail presentation
...
- video view now scales during presentation
- no "swooping" when presenting large res images
// FREEBIE
2018-01-11 23:49:21 -05:00
Michael Kirk
7c2bfdfb1f
rename: imageView -> mediaView
...
// FREEBIE
2018-01-11 23:05:59 -05:00
Michael Kirk
8851413b35
CR: cleanup, remove debug animation time, move constant
...
// FREEBIE
2018-01-11 23:05:59 -05:00
Michael Kirk
e140ffc423
Fullscreen presentation touchups
...
"zoom" presentation now accounts for zoomScale.
Fix background flicker as status bar hides
Round corners during presentation/dismiss. Smooths transition a bit.
// FREEBIE
2018-01-11 23:05:59 -05:00
Michael Kirk
d6ea5bad6b
Merge branch 'hotfix-2-19-4/fix-content-offset' into hotfix/2.19.4
2018-01-11 23:05:25 -05:00
Michael Kirk
74e03aad01
Fix intermittent content offset problem
...
Using the CollectionView's frame to determine if we're at the bottom
doesn't make sense unless the collection view is correctly layed out.
// FREEBIE
2018-01-11 23:04:18 -05:00
Matthew Chen
59933ce1d6
Fix rebase breakage.
2018-01-11 11:15:50 -05:00