2.5.0 develop master #1645
Merged
2.5.0 develop master #1645
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
Starting 2 5 0
Some gettext more
Changed PHP tag
Some gettext more
- Checking Once at LocalConfig Load - Tested setting BlockURL to true and redirect
New ChurchCRM Vagrant Box
Moved checkAllowedURL to SystemURLs
# Conflicts: # src/composer.json # src/mysql/upgrade.json
2.5.0 update from master 2.4.3
# Conflicts: # vagrant/bootstrap.sh
Churchcrm css via npm
* added master file * fixed echo issue * Apply fixes from StyleCI (#1614)
* 1st commit for verify code
working views
- enter data
- view family
* add get people by Role
* fixed get photo
* using SystemURLs::getDocumentRoot()
* added getPeopleSorted
* sRootPath = SystemURLs::getRootPath()
* no longer passing sRootPath
* people are displayed in order
* added Tokens table
* removed invalid head Classification
* added missing SystemURLs use
* fixed ORM debug string
* verify by token is working
* added valid token check
* Renamed the class token not tokens
* final tokens table sql
* check to make sure we have the family in the db before rendering
* fixed renaming
* added more helper methdos and new isValid Logic
* added verify api to create the token for now
* php cleanup
* added getId
* moved FamilyVerify to API call
* Moved family verify to API call
* moved verifyDownloadPDF to button click and remove Email PDF
* there is no role 7
* Send Email with Verification Token
* Moved Confirm PDF email to Email Classes
* Moved ConfirmReport to Member Dashbaord
No need to hide it
* removed unsued buttons
* created BaseFamilyVerification
* added default index to getURL
* MVP no self request of the info
* moved JS to new JS file
* passing token to page
* new flooting buttons for verify/update/remove info
* now consume a use if a token has a max count
* Update Token Table
- renamed useCount to setRemainingUses
- updated verify to verifyFamily
- added verifyPerson
* renamed emails var to toAddresses
* updated route to /families/{id}/family
* default auth on smtp is off
* fixed naming issue
* Single verify button
* added gettext where missing
* added 404 page
* check group size
* select verification
* adding note when user submits info
* submit data and handle errors
* fixed getSendNewsletter
* fixed SMTP
* delete old token for the fmaily
* format cleanup
* Updated Confirm button with text also
* Apply fixes from StyleCI (#1619)
|
Nice travis-ci found a build issue due to missing ruby ;) |
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.