AndelaOSP / andela-societies-frontend

79%

develop: 92%

LAST BUILD ON BRANCH ft-156336053-show-verify-activity-page

branch: ft-156336053-show-verify-activity-page

CHANGE BRANCH

x

Reset

• ft-156336053-show-verify-activity-page
• FAB-button-at-the-bottom-page
• Resolves#16-Refactor-code-to-adhere-to-the-rules-in-the-description
• bg-156034201-show-signin-notification-on-redirect
• bg-157116995-rework-display-of-activity-cards
• bg-159036599-fix-redemptions-page-stats-component
• bg-159517835-display-success-error-message-redemptions
• bg-159518063-display-president-society-redemptions
• bg-159695959-fix-activiy-card-description-in-society-pages
• bg-159761995-fix-datepicker
• bg-159763170-display-activities-logged-on-verifyactivities-page
• bg-159820120-close-log-activity-form-on-submit
• bg-159882293-close-modal
• bg-160092898-fix-redirection-on-reloading-a-page
• bg-160376833-approve-activity-society-secretary
• bg-160416376-rename-numberOf-to-numberOfParticipants
• bg-160583562-diplay-completed-redemptions-finance-view
• bg-160618987-remove-successops-redemption-rights
• bg-160635714-refactor-urls-to-verify-activities
• bg-ass-with-failing-redemption-crx#159789546
• bg-create-CD-pipeline-staging-157836717
• bg-fix-creating-activities
• bg-fix-dropdown-menu
• bg-fix-for-society-page#159430139
• bg-fix-redemption-display#159519211
• bg-fix-sparks-logo
• bg-make-https-secure-158916136
• bg-modify-stats-display-on-my-activities-page#159799750
• bg-points-earned-to-reflect-approved-activities#159519054
• bg-refactor-status-and-verify-redemptions-url
• bg-remove-floating-action-button-on-verify
• bg-signin
• ch-15-configure-max-len-in-elsint
• ch-158355400-display-error-messages
• ch-158489323-verify-activities-linear-view
• ch-159326777-refactor-verify-redemption-url
• ch-159443464-refactor-url-for-review-approve-logged-activity-service
• ch-160618987-revoke-successops-redemption-rights
• ch-160618987-revoke-successops-redemtion-rights
• ch-17-add-code-comments
• ch-18-enforce-single-quote-rules
• ch-27-fix-comment-for-PageHeader-PropType
• ch-32-add-config-file
• ch-add-continuous-deployment-to-heroku-154728500
• ch-add-update-loader#159071395
• ch-deploy-develop-to-staging-160418381
• ch-des-title-stats-redemption-page#159518152
• ch-eslint
• ch-fix-ActivityCard-dimensions-161249746
• ch-fix-card-styling
• ch-fix-deployment-errors-61
• ch-fix-found-issues-v1#159128682
• ch-fix-sparks-logo
• ch-grey-out-approve-button-if-no-task-is-found#159804941
• ch-grey-out-selected-button#159804941
• ch-integrate-coveralls-154781953
• ch-remove-comment-section-fend
• ch-remove-modal-button-161249824
• ch-rename-activity-action-files-160377049
• ch-setup-react-router-155749607
• ch-setup-redux-155750012
• ch-update-readme-file
• change-fab-icon
• chore-#9-reorganize-file-structure
• design
• develop
• fetch-activities
• filter-status-dropdown
• fix-35-fix-bug-in-router
• fix-found-issues-v1#159128682
• form-model
• ft-155907023-display-userinfo
• ft-156307063-create-society-page
• ft-156914066-create-redeem-points-modal
• ft-156998268-add-activity-approval-buttons
• ft-158124097-additional-input-field
• ft-158259850-president-redemptions-page-view
• ft-158484808-force-redirect-http-to-https
• ft-158792482-add-activity-categories
• ft-158915792-add-a-page-loading-screen
• ft-158936624-display-relevant-stats-on-the-different-pages
• ft-159032573-success-ops-request-additional-details
• ft-159229919-form-field-validation
• ft-159851509-edit-category
• ft-159956751-category-supports-multiple
• ft-160491066-display-error-message-approving-20-items
• ft-161482151-page-not-found
• ft-23-create-signin-page
• ft-38-create-mystats-component-155907350
• ft-add-modal-to-confirm-delete#159820410
• ft-add-notifications-back
• ft-add-production-dockerfile
• ft-allow-society-secretary-comment-on-logged-activity#159101182
• ft-create-CD-pipeline-staging-157836717
• ft-create-design-branch-162496788
• ft-create-modal-156038187
• ft-create-redmptions-page-156309348
• ft-create-signin-page-154729549
• ft-fetch-activity-categories
• ft-fetch-society-info
• ft-filter-activity-dropdown
• ft-finance-status-update-redemption
• ft-finance-update-status-redemption
• ft-implement-filter-on-society-view-161249558
• ft-log-points-157426670
• ft-logging-frontend-162052401
• ft-placeholder-component-for-missing-functionality-161249441
• ft-remove-modal-button-161249824
• ft-remove-notifications-sidebar
• ft-request-additional-details-and-edit-redemption
• ft-sandbox-159817309
• ft-slack-notifications-161539722
• ft-update-new-server-package-159105395
• ft-user-should-be-able-to-logout-155808774
• ft-verify-activities-for-success-ops-users-158894695
• master
• protected-routes
• redemptions-cio
• refactor-8-remove-unused-packages
• release
• staging

sorted merge conflict