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

Update master to version 6.8.0 to match digitalcampus repo #1

Merged
merged 79 commits into from
Jul 1, 2019

Conversation

hakimks
Copy link

@hakimks hakimks commented Jul 1, 2019

new update in version 6.8.0

alexlittle and others added 30 commits March 28, 2019 12:04
- Fixied x coordinate in menu item (for the end of the animation)
- Added background color animation in points view at the end of points translation animation
- Added configuration to enable or disable gamification points animation
- Added "Animate gamification points" in properties configuration
Animation in points notification.
…ers (instead of updating it in the TrackerService)
…y logs, use one with apiKey in case the current one was offline registered
Submit offline registered user
- Added selection of animation type view on settings and properties
Bluetooth connection detection
#813: Only try to send trackers and files if the user was actually su…
jjoseba and others added 25 commits May 28, 2019 11:12
Moved the new points preferences to the common_prefs.xml

# Conflicts:
#	app/src/admin/res/xml/prefs.xml
#	app/src/main/java/org/digitalcampus/oppia/activity/PrefsActivity.java
#	app/src/normal/res/xml/prefs.xml
#797: When there is only one tab, use a fullwidth tab in the viewpager
# Conflicts:
#	app/src/androidTest/java/InstallDownloadedCoursesTest.java
- Finished Issue #817, pending review
# Conflicts:
#	app/src/main/res/values/strings.xml
- Refactor of points animation feature to make more readable
@hakimks hakimks merged commit 9c5ef8d into nigersmartvillage:master Jul 1, 2019
hakimks pushed a commit that referenced this pull request Feb 19, 2020
hakimks pushed a commit that referenced this pull request Feb 19, 2020
hakimks added a commit that referenced this pull request Jul 23, 2020
Update master to version 6.8.0
hakimks pushed a commit that referenced this pull request Jul 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants