-
Notifications
You must be signed in to change notification settings - Fork 443
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
QueryList QueryView ui fixes #1747
QueryList QueryView ui fixes #1747
Conversation
form, table, query info fixes ChurchCRM#1411
Can you address the style issues Also is this ready for testing |
I think the Yes, it's ready for testing. |
this is still failing the style check... this is styleci generic php style not just Church CRM check |
ok, I'll fix that. |
looks great |
* use bootbox for group membership remove confirmation * use bootbox for deposits and API Errors * more modals converted * underp merge * Apply fixes from StyleCI * underp merge * udpate develop to 2.6.0 * underp upgrade.json * update to latest versions * Move config definitions out of DB into code (#1817) * Proof of concept. Probably still has bugs * fix order and value setting * more cleanup and upgrade script * closes #1670 * Apply fixes from StyleCI * fix sql style * gettext for config descriptions * more gettext * fix annoying second refresh settings bug * Apply fixes from StyleCI * better null checking, and cleanup old code * Remove special handling of country and timezone settings. They are simple "choice" settings. * Apply fixes from StyleCI * move another country * Fix issue with choices containing a space * closes #1834 and #1831 (#1848) * replaced $sRootPath with SystemURLs::getRootPath() (#1840) * replaced $sRootPath with SystemURLs::getRootPath() * Apply fixes from StyleCI (#1841) * fixed if check * format cleanup and global cleanup * Apply fixes from StyleCI (#1847) * :( * using SystemURLs::getRootPath() * more sRoothPath * SystemURLs::getRootPath() cleanup * fixed imports * root path * closes #1597 (#1851) * closes #1597 * Apply fixes from StyleCI * Address George Comments * 2.6.0 Small fixes (#1859) * closes #1726 gettext ending in period * moving AdminLTE to the end * fixed dispaly Software Registration Country * removed unused headers opt * enable self registration in the demo sql * renamed grunt compress:demp-date to compress:demo * moved ShowAge.js to footer.php * bootstrap-datepicker.js is loaded in the footer.php * pace.min.js cleanup * moved IssueReporter.js to footer * moved in skin JS files for common location * renamed BuildConfig.json to BuildConfig.json.example and added BuildConfig.json to .gitignore * cp BuildConfig.json.example BuildConfig.json for build systems * 2.6.0 master dev (#1884) * using fam_datedeactivated fix-#1833 (#1835) * fix-#1833 Activate/Deactivate Families * StyleCI fixes StyleCI fixes * Using fam_datedeactivated fix-#1833 Update to FamilyView to handle the Activate/Deactivate Butoon and form. Update to CalendarService to filter out the deactivated families Update to DashboardService to filter out the deactivated families/members Update to MembersDashboard to filter out the deactivated families/members Update to Geoipage to filter out the deactivated families/members and to use responsive form and better table. Update SundayschoolService to filter out deactivated families. update MapUsingGoogle to filter deactivated families from groupid -1 (all fmilies) Updates to Family Route to create api functions. (not used) * Updates based on comments on pull/1835 * Dashboard service getFamilyCount() and getPersonCount() uses Propel query now *FamilyView.php uses deactivate() and activate() functions *churchcrm.scss added bscallout styles * Moving the inherited info alert box * moving the inherited info alert box from top to the left pane near the actual text. * Changes based on Pull comments. * changed the API Call to $this->post('/{familyId:[0-9]+}/activate/{status} * Changed to use API/AJAX call using bootbox * Removed bscallout scss * updates based on pull comments * Changed JSON econcode to $response->withJson(['success'=> true]); * added check to see if the status changed before updating datedeactivated. * also added a note to show the action deactivated/activated on the timeline. * StyleCI fixes StyleCI fixes * StyleCI fixes StyleCI fixes * styleCI changes styleCI changes * fixing popupMessage * Deactivate doc #1874 (#1878) * Add documentation for Family Deactivate/Activate feature * Added Section "How do I deactivate a Family? " * Added Section "How do I Activate a Deactivated Family?" * Update API docs Update API docs for Families Route to include /api/families/:familyId/activate/:status * Fix #1869 (#1870) * Fix #1869 Needs add paper roles "Unknown", "Head of Household", "Spouse", "Child" and "Other" to POEditor.com because they are hardcoded in DashboardService.php * Update DashboardService.php * Apply fixes from StyleCI (#1883) * QueryList QueryView ui fixes (#1747) * QueryView ui fixes form, table, query info fixes #1411 * QueryList.php ui fixes #1411 * coding style fixes * StyleCI fixes * StyleCI fixes
#1411