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

Fix #3406: [RTL] High-fi Recently- Played Activity List #3466

Merged
merged 70 commits into from
Aug 12, 2021
Merged
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
76c542f
Update selection_interaction_item.xml
veena14cs Jun 20, 2021
03dbae2
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jun 20, 2021
1eaa794
Update selection_interaction_item.xml
veena14cs Jun 20, 2021
c122fa9
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jun 22, 2021
fa01718
Update return_to_topic_button_item.xml
veena14cs Jun 24, 2021
1ddff1b
Update return_to_topic_button_item.xml
veena14cs Jun 24, 2021
75f3191
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jun 24, 2021
0153870
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jun 30, 2021
b655173
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 2, 2021
251b720
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 4, 2021
21402ab
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 4, 2021
77ed59c
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 9, 2021
dd9379c
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 10, 2021
290719a
fix rtl support in ongoing story card
veena14cs Jul 12, 2021
a05f750
Update ongoing_story_card.xml
veena14cs Jul 12, 2021
eceec2f
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 15, 2021
b136ffc
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 16, 2021
d01b5e6
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 17, 2021
9942983
Merge branch 'develop' into fix-recently-played
veena14cs Jul 17, 2021
63dc60d
Update MarginBindingAdapters.java
veena14cs Jul 17, 2021
ecbd020
Update OngoingStoryViewModel.kt
veena14cs Jul 21, 2021
1494b90
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 23, 2021
231a322
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 23, 2021
2d744e1
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 25, 2021
3ba1e71
Merge branch 'develop' into fix-recently-played
veena14cs Jul 25, 2021
50621f3
Update MarginBindingAdapters.java
veena14cs Jul 25, 2021
a989dfb
Update OngoingListAdapter.kt
veena14cs Jul 25, 2021
77d9961
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 26, 2021
736fe91
Merge branch 'develop' into fix-recently-played
veena14cs Jul 26, 2021
26bd197
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 29, 2021
754b2b1
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 29, 2021
17e4f52
Merge branch 'develop' into fix-recently-played
veena14cs Jul 29, 2021
d4e95c1
Update OngoingListAdapter.kt
veena14cs Jul 31, 2021
839e45a
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 31, 2021
6cbf6d2
Merge branch 'develop' into fix-recently-played
veena14cs Jul 31, 2021
95ce22c
added testcases
veena14cs Aug 1, 2021
005553c
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 1, 2021
51222df
Merge branch 'develop' into fix-recently-played
veena14cs Aug 1, 2021
8fa1abd
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 3, 2021
69d749d
Merge branch 'develop' into fix-recently-played
veena14cs Aug 3, 2021
a2e294e
Fixed testcases
veena14cs Aug 3, 2021
3b6cbda
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 3, 2021
aa94712
Merge branch 'develop' into fix-recently-played
veena14cs Aug 3, 2021
d089c26
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 4, 2021
464e228
Merge branch 'develop' into fix-recently-played
veena14cs Aug 4, 2021
4e49e45
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 4, 2021
ccbafa8
Merge branch 'develop' into fix-recently-played
veena14cs Aug 4, 2021
347e2de
Update RecentlyPlayedFragmentTest.kt
veena14cs Aug 4, 2021
1311938
Update app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPla…
veena14cs Aug 5, 2021
c602107
Update RecentlyPlayedFragmentTest.kt
veena14cs Aug 5, 2021
02c7333
Merge branch 'fix-recently-played' of https://github.com/veena14cs/op…
veena14cs Aug 5, 2021
ed7044b
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 5, 2021
c45cb5d
Merge branch 'develop' into fix-recently-played
veena14cs Aug 5, 2021
17a0935
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 6, 2021
dee7065
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 8, 2021
a490086
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 9, 2021
573cfb5
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 9, 2021
1dab09c
Merge branch 'develop' into fix-recently-played
veena14cs Aug 9, 2021
9f4e414
fixed nits
veena14cs Aug 10, 2021
c12ae71
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 10, 2021
6120b91
Merge branch 'develop' into fix-recently-played
veena14cs Aug 10, 2021
26566ba
Update BUILD.bazel
veena14cs Aug 10, 2021
b56702e
Update BUILD.bazel
veena14cs Aug 10, 2021
b543396
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 10, 2021
add6960
Merge branch 'develop' into fix-recently-played
veena14cs Aug 10, 2021
db3862e
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 11, 2021
57837cc
Merge branch 'develop' into fix-recently-played
veena14cs Aug 11, 2021
5f58c96
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 11, 2021
938e41a
Merge branch 'develop' into fix-recently-played
veena14cs Aug 11, 2021
8a713e8
Update RecentlyPlayedFragmentTest.kt
veena14cs Aug 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/develop' into develop
  • Loading branch information
veena14cs committed Aug 10, 2021
commit c12ae7153e4a428fe9fd725451acdcc2f6a3ba8c

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.