Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upmerge from Nyaruka #1304

Merged
merged 107 commits into from Aug 14, 2020
Merged

Upmerge from Nyaruka #1304

merged 107 commits into from Aug 14, 2020

Conversation

rowanseymour
Copy link
Contributor

No description provided.

rowanseymour and others added 30 commits July 9, 2020 14:38
@rowanseymour
Update some dependencies to work with Python 3.8 and MacOS
2fec1d6
@rowanseymour
New mixin for list views with bulk actions
ec68c9a
@rowanseymour
Coverage
49a06af
@rowanseymour
Use bulk_actions to distinguish between per object actions and SmartC…
557eb36 
…RUDL actions
@rowanseymour
Covert trigger list views to use new bulk actions mixin
e8e7fbf
@rowanseymour
Rebuild locale
4699658
@rowanseymour
Test bulk actions returning errors
f656a67
@rowanseymour
Use toast message for errors from bulk actions
f6f029d
@rowanseymour
Revert template changes
5e0d6c3
@rowanseymour
Convert contact, msg and flow list views to use BulkActionMixin
cf82c7c
@rowanseymour
Update xlrd
7e1048e
@rowanseymour
Rebuild locale
e8edfcc
@rowanseymour
Simplify apply_action_ methods which don't need to return anything
3545752
@rowanseymour
Fix test
9a77a8d
@rowanseymour
Coverage
1942221
@rowanseymour
Merge branch 'master' into list_actions
e083421
@rowanseymour
Add start_type and created_by to queued flow starts
94a1ada
@rowanseymour
Merge pull request #2877 from nyaruka/flow_start_queue_tweak
2a687c4 
🏁 Add start_type and created_by to queued flow starts
@rowanseymour
Improve error messages and other tweaks from review
2427615
@rowanseymour
Fix test
557e8a2
@rowanseymour
Merge pull request #2873 from nyaruka/list_actions
406ea4b 
🚧 Cleanup how we do bulk actions from list views
@rowanseymour
Merge pull request #2872 from nyaruka/dep_updates
87a9dfe 
✨ Update some dependencies to work with Python 3.8 and MacOS
Update CHANGELOG.md for v5.7.0
1d8d211
@rowanseymour
Have mailroom reset URNs after contact creation to ensure order is co…
0dba7d8 
…rrect
@rowanseymour
Fix test
bda8c5f
@rowanseymour
Merge pull request #2879 from nyaruka/api_urns_fix
f8d0455 
📇 Ensure URN order is correct when API creates contacts
@rowanseymour
Add session history to flowstarts
6e53d73
@rowanseymour
Merge pull request #2881 from nyaruka/start_session_history
5afb89f 
🧱 Add session history to flowstarts
Update CHANGELOG.md for v5.7.1
1fdf969
@paulobernardoaf
fix: org selector and header text alignment
5a4704b
nicpottier and others added 28 commits August 10, 2020 15:37
@nicpottier
merge
8df91bd
@nicpottier
update locales
2f14c30
@ericnewcomer
Merge pull request #2897 from nyaruka/plan-end
8889c5c 
remove old stripe subscription code, add plan_end field
Update CHANGELOG.md for v5.7.8
45c64ff
@rowanseymour
Fix reading of S3 event streams
42ce3e4
@rowanseymour
Merge pull request #2900 from nyaruka/populate_from_archives
eeaff45 
👁️ Migration to populate last_seen_on from msg archives
@rowanseymour
Coverage
8c0c8b2
@rowanseymour
Merge pull request #2901 from nyaruka/s3_event_streams
3e8299d 
🚰 Fix reading of S3 event streams
Update CHANGELOG.md for v5.7.9
aebc9df
@rowanseymour
Tweak search_archives to allow JSONL output
d185ed7
@rowanseymour
Add Last Seen On as a system field so it can be used in campaigns
84e425f
@rowanseymour
Rebuild locale
c8fbe26
@rowanseymour
Fix tests
a08e713
@rowanseymour
Add test for migration.. and fix it
59c5c07
@rowanseymour
Merge pull request #2902 from nyaruka/last_seen_sys_field
fbb32b5 
📅 Add Last Seen On as a system field so it can be used in campaigns
@rowanseymour
Update floweditor to 1.9.10
d06108b
Update CHANGELOG.md for v5.7.10
f14a8b8
@rowanseymour
Expose last_seen_on on contact API endpoint
a679271
@rowanseymour
Fix mailroom_db command
75401da
@rowanseymour
Tweak msg_console so it can include sent messages which are not replies
c2670bd
@rowanseymour
Merge pull request #2906 from nyaruka/msg_console_async
180bfc2 
🕹️ Tweak msg_console so it can include sent messages which are not replies
@rowanseymour
Fix creating of campaign events based on last_seen_on
ffac48a
@rowanseymour
Remove unused code
2190d36
@rowanseymour
Merge pull request #2905 from nyaruka/last_seen_api
7bf0e75 
🔭 Expose last_seen_on on contact API endpoint
@rowanseymour
Merge pull request #2907 from nyaruka/last_seen_on_campaign_fix
ddf5459 
⌚ Fix creating of campaign events based on last_seen_on
Update CHANGELOG.md for v5.7.11
9978f13
@rowanseymour
Use Django language code on html tag
e1ea107
@rowanseymour
Merge pull request #2908 from nyaruka/lang_tweak
70e41d8 
Use Django language code on html tag
@codecov-commenter
Copy link

codecov-commenter commented Aug 14, 2020 •
edited

Codecov Report

Merging #1304 into master will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##            master     #1304   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          371       379    +8     
  Lines        25389     25436   +47     
=========================================
+ Hits         25389     25436   +47
Impacted Files Coverage Δ
temba/api/v2/views.py 100.00% <ø> (ø)
temba/campaigns/models.py 100.00% <ø> (ø)
temba/mailroom/queue.py 100.00% <ø> (ø)
temba/api/v2/serializers.py 100.00% <100.00%> (ø)
...ba/archives/management/commands/search_archives.py 100.00% <100.00%> (ø)
...mba/archives/migrations/0012_auto_20200807_1913.py 100.00% <100.00%> (ø)
temba/archives/models.py 100.00% <100.00%> (ø)
temba/campaigns/views.py 100.00% <100.00%> (ø)
...a/contacts/migrations/0109_contact_last_seen_on.py 100.00% <100.00%> (ø)
.../contacts/migrations/0110_populate_last_seen_on.py 100.00% <100.00%> (ø)
... and 28 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b4d0578...70e41d8. Read the comment docs.

@rowanseymour rowanseymour merged commit 44c5488 into rapidpro:master Aug 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@rowanseymour @codecov-commenter @paulobernardoaf @norkans7 @ericnewcomer @nicpottier