Michael Kirk
|
5c3b30104a
|
Merge branch 'mkirk/moving-repo'
|
2017-07-21 15:53:34 -04:00 |
|
Michael Kirk
|
1499840de5
|
update README and podspec to direct upgrading users to proper source
// FREEBIE
|
2017-07-21 15:09:14 -04:00 |
|
Matthew Chen
|
d98c07ecff
|
Merge branch 'charlesmchen/countryNameVsiOS8'
|
2017-07-20 09:14:49 -04:00 |
|
Matthew Chen
|
493aaca242
|
Avoid nil country names on iOS 8.
// FREEBIE
|
2017-07-19 14:21:54 -04:00 |
|
Matthew Chen
|
e20d63240b
|
Merge branch 'mkirk/cleanup-with-transaction'
|
2017-07-14 09:26:35 -04:00 |
|
Michael Kirk
|
faeb7100b9
|
use existing transaction in cleanup
// FREEBIE
|
2017-07-14 09:26:28 -04:00 |
|
Matthew Chen
|
fe0f01daec
|
Merge branch 'charlesmchen/pasteVoiceMessages'
|
2017-07-13 17:22:18 -04:00 |
|
Matthew Chen
|
c255504959
|
Fix copy and paste of voice messages.
// FREEBIE
|
2017-07-13 14:31:12 -04:00 |
|
Matthew Chen
|
640ec13b2e
|
Merge branch 'charlesmchen/orphanCleanup'
|
2017-07-12 12:13:14 -04:00 |
|
Matthew Chen
|
6fa3fac4ae
|
Fix broken tests.
// FREEBIE
|
2017-07-12 12:12:59 -04:00 |
|
Matthew Chen
|
7a50d6b996
|
Fix broken tests.
// FREEBIE
|
2017-07-12 12:12:59 -04:00 |
|
Matthew Chen
|
762f915179
|
Respond to CR.
// FREEBIE
|
2017-07-12 12:12:59 -04:00 |
|
Matthew Chen
|
96da091e9b
|
Run orphan cleanup on startup.
// FREEBIE
|
2017-07-12 12:12:59 -04:00 |
|
Michael Kirk
|
9115a1f973
|
Merge branch 'mkirk/update-ci-gems'
|
2017-07-12 11:36:38 -04:00 |
|
Michael Kirk
|
57b90e1462
|
update ci gems
// FREEBIE
|
2017-07-12 11:36:33 -04:00 |
|
Michael Kirk
|
e0f805f80f
|
Merge branch 'mkirk/fix-persistence-upgrade'
|
2017-07-11 15:26:11 -04:00 |
|
Michael Kirk
|
ab6c1fb3b8
|
Fix persist view for upgrade scenarios
// FREEBIE
|
2017-07-11 13:22:23 -04:00 |
|
Michael Kirk
|
9d3175b5cf
|
Merge branch 'mkirk/cleanup-logging'
|
2017-07-11 13:19:51 -04:00 |
|
Michael Kirk
|
957979585c
|
remove unhelpful logging
// FREEBIE
|
2017-07-10 12:37:03 -05:00 |
|
Michael Kirk
|
8361ffb818
|
Merge branch 'mkirk/persist-thread-view'
|
2017-07-10 11:52:45 -05:00 |
|
Michael Kirk
|
ea681a61e2
|
persist thread view
// FREEBIE
|
2017-07-10 11:52:37 -05:00 |
|
Matthew Chen
|
c1e1247eff
|
Merge branch 'charlesmchen/identityManagerVsStartup'
|
2017-07-06 14:38:52 -04:00 |
|
Matthew Chen
|
92276157dc
|
Don’t sync verification state until app has finished becoming active.
// FREEBIE
|
2017-07-06 12:34:08 -04:00 |
|
Michael Kirk
|
2216c2d413
|
Merge pull request #295 from WhisperSystems/mkirk/fix-tests
fix tests
|
2017-07-06 10:28:28 -05:00 |
|
Michael Kirk
|
a23b4871e0
|
fix tests
// FREEBIE
|
2017-07-06 09:37:12 -05:00 |
|
Michael Kirk
|
72e893d5f7
|
Merge commit 'e24f18320d3aefe87d2532c9f0520348c4598cb2'
|
2017-07-06 09:08:02 -05:00 |
|
Matthew Chen
|
e24f18320d
|
Merge branch 'charlesmchen/modelConnection' into hotfix/2.13.3.0
|
2017-07-05 19:06:30 -04:00 |
|
Matthew Chen
|
58fb86b8e0
|
Use a dedicated connection for model reads & writes.
// FREEBIE
|
2017-07-05 18:54:48 -04:00 |
|
Matthew Chen
|
065017cafd
|
Merge branch 'charlesmchen/sharedReadAndWriteConnections' into hotfix/2.13.3.0
|
2017-07-05 17:23:03 -04:00 |
|
Matthew Chen
|
daae31d30e
|
Modify TSStorageManager to use separate shared read and write connections.
// FREEBIE
|
2017-07-05 16:58:39 -04:00 |
|
Michael Kirk
|
8714a8f37c
|
Merge branch 'mkirk/no-sync-to-unregistered-number'
|
2017-07-05 13:00:35 -05:00 |
|
Michael Kirk
|
deff1fa4e7
|
FIX: verifiying unregistered user prints "no longer registered" error on
every launch
// FREEBIE
|
2017-07-05 12:59:53 -05:00 |
|
Michael Kirk
|
1fc5f77286
|
Merge branch 'mkirk/declined-call-notification'
|
2017-07-05 12:42:51 -05:00 |
|
Michael Kirk
|
fd625dff50
|
remove default case for better compiler warnings
// FREEBIE
|
2017-07-05 12:42:21 -05:00 |
|
Michael Kirk
|
89f86c4fd2
|
call type for declined call
// FREEBIE
|
2017-07-03 13:45:17 -05:00 |
|
Michael Kirk
|
04ef06ce95
|
Merge branch 'mkirk/fix-unread-badge'
|
2017-06-30 10:21:30 -10:00 |
|
Michael Kirk
|
f59779c118
|
message manager updates badge count
// FREEBIE
|
2017-06-30 06:13:26 -10:00 |
|
Michael Kirk
|
85fe68d3c4
|
Fix typo after rename
// FREEBIE
|
2017-06-28 19:09:04 -10:00 |
|
Michael Kirk
|
d6c5497f64
|
Merge branch 'mkirk/fix-tests'
|
2017-06-28 18:40:37 -10:00 |
|
Michael Kirk
|
0b33ef6161
|
try fastlane scan, since build is timing out.
// FREEBIE
|
2017-06-28 18:30:17 -10:00 |
|
Michael Kirk
|
acf31db4b3
|
bump travis image to 8.3
// FREEBIE
|
2017-06-28 18:04:25 -10:00 |
|
Michael Kirk
|
a8ea2428c6
|
gemfile for consistent build on dev/CI
// FREEBIE
|
2017-06-28 17:42:24 -10:00 |
|
Michael Kirk
|
605db6b788
|
Fix up deleteAttachments method since making attachmentFolder
dispatchOnce
// FREEBIE
|
2017-06-28 17:07:11 -10:00 |
|
Michael Kirk
|
1d71ca5e50
|
Fix some more tests.
Adapt to IdentityManager refactor
Adapt to DisappearingMessages refactor
// FREEBIE
|
2017-06-28 16:18:13 -10:00 |
|
Michael Kirk
|
8f9af85cca
|
prefer hacks in test to hacks in code.
Adding a completion handler would be a bit gnarly since we're snaking
through a pretty long method chain.
// FREEBIE
|
2017-06-28 08:09:23 -10:00 |
|
Michael Kirk
|
1b9aae2ea6
|
CR: renaming var to be more general
// FREEBIE
|
2017-06-28 07:32:31 -10:00 |
|
Michael Kirk
|
e652dff4b4
|
Allow override of singleton enforcement in test app
We frequently build multiple instances of "singletons" for the purpose
of testing.
// FREEBIE
|
2017-06-28 07:30:02 -10:00 |
|
Michael Kirk
|
edf5852e82
|
set-expiration dispatches *sync* so we can test it.
// FREEBIE
|
2017-06-28 07:30:02 -10:00 |
|
Michael Kirk
|
1fb9fa79df
|
Fix up some more tests.
// FREEBIE
|
2017-06-28 07:30:02 -10:00 |
|
Michael Kirk
|
13c5bdb8c5
|
fix disappearing messages test
// FREEBIE
|
2017-06-28 07:30:02 -10:00 |
|