add confirmation dialog and fix merge logic

capture status

store new token in a local variable

Fix for issue associated with super-admins and department affiliation in a given organisation. (#2165) ...

Changes made:
  - Department policies now allow both org admins and super admins to
    create update and delete departments, whilst org_admins can only do this
    for their own org. Super admins can do it for any org department.
  - When a super admin switches organisation their department_id is cleared.

Fix for issue #2088.

Add functionality for School/Department for an organisation. ...

Changes:
    - added a Department model whose instances belong to an org and require name.
    - added a DepartmentController and views for create, edit/update and a index view which is a tab
      of 'Organisational Details'.
    - added the optional attribute department_id to User model.
    - added Rspec tests.
    - updated app/controllers/registrations_controller.rb, app/models/org.rb and
      app/models/user.rb to get rid of outstanding Rubocop warnings

    Fix for issue #2088.

updated reviewer to be under can_org_admin? and fixed table of plans to show owner instead of random user (#2140)

fix issues with plan spec (#2142)

capture progress

Added code to make Search functionality case-insensitive. ...

Changes:
   - relevant models with :search scope updated with lower casing  of the column
     values and the search parameters.
   - fixed all rubocop warnings on the changed models except
     "Style/RedundantReturn: Redundant return detected."

   Note: one could not use 'ILIKE' in WHERE clauses changed as it is not supported by MariaDB and MySql.
   Hence we use lower() in changed WHERE clauses.

 Fix for issue #2080

Add a button to download a list of users by Org admins in CSV format. ...

- Super admins currently do not get the download option (as this would involve all users the can view and will be slow (over 20 min for 31K+ users))

    Issue #1754

Remove old JS form validations (#1867) ...

* added new form validation error handling

added tests for orgs controller

converted over remaining controllers to new errors

enhanced message handlers in application controller

finished form validations

* fixed rubocop for all controllers

* Fix broken specs

- Factories needed to be updated to meet new validation requirements
- Spec was broken since error message had changed

* Fix errors and warnings from npm audit

Reset other_organisation when User org changes ...

- Refactored how user model defines callbacks
- Add specs

Merge pull request #1802 from DMPRoadmap/refactor/database-cleanup ...

Remove redundant database tables and columns

Remove redundant database tables and columns ...

Remove redundant columns and tables listed in #1382

Update models and factories with new schema structure comments.

Replace YARD documentation with Tomdoc ...

These changes use the YARD gem, but in the lighter Tomdoc format.

You can read more about Tomdoc here: https://tomdoc.org

Merge branch 'development' into refactor/rspec-specs

Revert "Removed length constraints from users email" ...

This reverts commit 9ddd68b.

Removed length constraints from users email

Merge branch 'development' into refactor/rspec-specs

Update DB schema for MySQL support

Refactor User#active_for_authentication?

Refactor User.from_omniauth

Refactored model code for better readability

Update User specs ...

Also fixed bug in User.where_case_insensitive

Add extra validations for all models ...

- Includes specs using the Shoulda gem
- Includes a refactoring of update_numbers to a "sortable" abstraction

Add extra validations for all models ...

- Includes specs using the Shoulda gem
- Includes a refactoring of update_numbers to a "sortable" abstraction

Add annotate gem for models and Gemfile

Refactor queries without string interpolation

Implemented Notifications ...

updated tests to work with current test infrastructure

forgot to add test file

switched from url to path to correct 'Mixed content https vs http' issues

added active flag to users and updated admin users page to allow admin to update the value ...

updated column text

Updated inactive message

updated mailers to exclude inactive users except for sharing and devise emails about their account

added tests for super admin users. added functionality for super admin to edit user info

added org and created columns to users table

swapped in good schema.rb

removed debug line

added new field to schem.rb manually

fixed schema.rb

added button to go back to users and switched from and to &&

fixed typo in schema.rb