Build/2.8.2 to develop #2677
Merged
Build/2.8.2 to develop #2677
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge 2.8 master
Apply fixes from StyleCI
…into misc/kiosk-tweaks
Misc/kiosk tweaks
Highlight selected dataTable rows
…ble-row Merge pull request #2541 from Adnan0703/highlight-selected-datatable-row
Apply fixes from StyleCI
2.8.0 locale-text
* tweaks * kiosk tweaks * Apply fixes from StyleCI
2.8.2 locale update download
Apply fixes from StyleCI
Changelog after 2.8.1
Fixes Family Search
Starting 2.8.2
un-comment family lat/long update
# Conflicts: # CHANGELOG.md # locale/messages.po # package.json # src/ChurchCRM/model/ChurchCRM/Family.php # src/composer.json # src/locale/de_DE/LC_MESSAGES/messages.po # src/locale/en_AU/LC_MESSAGES/messages.po # src/locale/en_CA/LC_MESSAGES/messages.po # src/locale/en_GB/LC_MESSAGES/messages.po # src/locale/es_ES/LC_MESSAGES/messages.js # src/locale/es_ES/LC_MESSAGES/messages.mo # src/locale/es_ES/LC_MESSAGES/messages.po # src/locale/fr_FR/LC_MESSAGES/messages.js # src/locale/fr_FR/LC_MESSAGES/messages.mo # src/locale/fr_FR/LC_MESSAGES/messages.po # src/locale/hu_HU/LC_MESSAGES/messages.po # src/locale/it_IT/LC_MESSAGES/messages.po # src/locale/nb_NO/LC_MESSAGES/messages.po # src/locale/nl_NL/LC_MESSAGES/messages.po # src/locale/pl_PL/LC_MESSAGES/messages.po # src/locale/pt_BR/LC_MESSAGES/messages.js # src/locale/pt_BR/LC_MESSAGES/messages.mo # src/locale/pt_BR/LC_MESSAGES/messages.po # src/locale/ro_RO/LC_MESSAGES/messages.po # src/locale/ru_RU/LC_MESSAGES/messages.po # src/locale/sq_AL/LC_MESSAGES/messages.po # src/locale/sv_SE/LC_MESSAGES/messages.po # src/locale/vi_VN/LC_MESSAGES/messages.js # src/locale/vi_VN/LC_MESSAGES/messages.mo # src/locale/vi_VN/LC_MESSAGES/messages.po # src/locale/zh_CN/LC_MESSAGES/messages.po # src/locale/zh_TW/LC_MESSAGES/messages.po # src/mysql/upgrade.json # src/skin/js/Kiosk.js # src/skin/js/KioskJSOM.js
ghost
assigned 
DawoudIO
approved these changes
Jul 3, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.