Commit Graph

13 Commits

Author SHA1 Message Date
farhatahmad 5a3ad3159c
GRN2-45, GRN2-197: Upgrade Rails to 5.2.3 and removed sass-rails gem (#636)
* Removed deprecate sass-rails and replace with sassc-rails

* Upgraded to Rails 5.2.3

* Fixed travis

* Added back Spring code

* Fixed travis again
2019-07-15 10:13:41 -04:00
farhatahmad 3e0238eb0c
Replaced checkbox with dropdown (#552) 2019-05-23 13:21:43 -04:00
farhatahmad de1e75fbf8
Added check to emailer concern (#550) 2019-05-23 12:22:34 -04:00
shawn-higgins1 eac8290001 GRN2-148: Always check that email notifications are enabled before sending an email (#539)
* Always check that email notificatiosn are enabled before sending an email

* Fix tests

* Fix formating

* Change to hardcoding the validation
2019-05-22 13:38:34 -04:00
shawn-higgins1 f88d67f6fb GRN2-6: Notify admins when a approve/invite user signs up (#538)
* Notify admins when a approve/invite user signs up

* Fix formating

* Uses admins_url variable
2019-05-22 13:38:00 -04:00
shawn-higgins1 83a9edf81d GRN2-140: Added Email to inform user they've been promoted (#534)
* Added Email to inform user they've been promoted

* Update user_mailer.rb

* Send email when a user is demoted

* Change more-info string
2019-05-22 13:36:33 -04:00
farhatahmad 9638ebcbc5 GRN2-134: Added Color Input for lighten and darken (#529)
* Added Color Input for lighten and darken

* rspec
2019-05-22 13:34:37 -04:00
shawn-higgins1 0360c78219 Revert "Notify admins when a approval/invite user signs up"
This reverts commit 251d85d88a.
2019-05-21 14:37:27 -04:00
shawn-higgins1 251d85d88a Notify admins when a approval/invite user signs up 2019-05-21 14:25:28 -04:00
farhatahmad 720dac6012 GRN2-6: Added the ability for admins to specify registration method (#520)
* Added the ability to invite users

* Small bug fix

* Added the ability to approve/decline users

* Small bug fixes

* More bug fixes

* More minor changes

* Final changes
2019-05-17 16:26:49 -04:00
farhatahmad 75bde6a42d GRN2-xx: Email and admin fix (#515)
* Email and admin fix

* Redirected super_admins to the admins page

* Small fix

* Update rooms_controller.rb
2019-05-09 18:07:17 -04:00
farhatahmad 88776eaadb GRN-88: Fixed some things that Scrutinizer was complaining about (#433)
* Scrutinizer fixes

* Moved helper code to concern

* Another scrutinizer fix

* User controller conflict fix

* Another user controller fix

* Added include verifier
2019-04-11 10:25:49 -04:00
Josh 4037b6304e initial commit 2018-05-07 16:06:01 -04:00