Commit 6a4500c
committed
Merge branch 'develop' of https://github.com/openedx/openedx-app-android into SAML_SSO
# Conflicts:
# app/src/main/java/org/openedx/app/AppActivity.kt
# auth/build.gradle
# auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt
# build.gradle
# gradle/wrapper/gradle-wrapper.propertiesFile tree
174 files changed
+7505
-2342
lines changed- app
- schemas/org.openedx.app.room.AppDatabase
- src/main
- java/org/openedx/app
- di
- room
- system/push
- res
- drawable
- mipmap-hdpi
- values-land
- values-w1240dp
- values-w600dp
- values
- auth
- src/main
- java/org/openedx/auth/presentation
- restore
- signup/compose
- sso
- ui
- res
- drawable
- values
- buildSrc
- core
- src
- main
- java/org/openedx/core
- adapter
- config
- data
- api
- model
- room
- storage
- domain/model
- extension
- module/download
- presentation/dialog
- downloaddialog
- selectorbottomsheet
- system/notifier
- ui
- theme
- utils
- res
- drawable
- font
- values
- openedx/org/openedx/core/ui/theme
- course
- src
- main
- java/org/openedx/course
- data
- repository
- storage
- domain/interactor
- presentation
- assignments
- container
- contenttab
- offline
- outline
- progress
- section
- ui
- unit
- container
- video
- videos
- res
- anim
- drawable
- values
- test/java/org/openedx/course/presentation
- outline
- section
- unit
- container
- video
- videos
- dashboard
- src/main
- java/org/openedx
- courses/presentation
- learn/presentation
- res/values
- discovery
- src/main/java/org/openedx/discovery/presentation
- info
- program
- ui
- discussion
- src/main
- java/org/openedx/discussion
- data/api
- presentation/threads
- res/values
- downloads
- src
- main/java/org/openedx/downloads/presentation/download
- test/java/org/openedx/downloads
- gradle/wrapper
- profile
- src/main/res/values
- whatsnew
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
174 files changed
+7505
-2342
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
| 32 | + | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
35 | | - | |
36 | | - | |
| 36 | + | |
| 37 | + | |
37 | 38 | | |
38 | 39 | | |
39 | 40 | | |
| |||
42 | 43 | | |
43 | 44 | | |
44 | 45 | | |
45 | | - | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
92 | | - | |
| 91 | + | |
| 92 | + | |
93 | 93 | | |
94 | | - | |
95 | | - | |
96 | | - | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
97 | 99 | | |
98 | 100 | | |
99 | 101 | | |
| |||
129 | 131 | | |
130 | 132 | | |
131 | 133 | | |
132 | | - | |
| 134 | + | |
133 | 135 | | |
134 | 136 | | |
135 | 137 | | |
136 | 138 | | |
137 | 139 | | |
138 | | - | |
| 140 | + | |
139 | 141 | | |
140 | 142 | | |
141 | | - | |
| 143 | + | |
142 | 144 | | |
143 | | - | |
144 | | - | |
| 145 | + | |
| 146 | + | |
145 | 147 | | |
146 | 148 | | |
147 | 149 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
0 commit comments