Commit Graph

231 Commits

Author SHA1 Message Date
Florian Weber ed7bec04b0
Fix "for" attribute for label elements (#1488)
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-05-06 15:59:29 -04:00
MrKeksi db518c3620
Adding translation (#1510)
* Update _account.html.erb

* Update en.yml
2020-05-06 15:48:12 -04:00
Ahmad Farhat 467947f1b5
GRN2-xx: Switch the relation between users and roles to make queries cleaner and faster (#1299)
* First steps

* Fixes in account creation flow

* Fixed most testcases

* more test fixes

* Fixed more test cases

* Passing tests and rubocop

* Added rake task to remove rooms
2020-05-06 15:23:28 -04:00
Ahmad Farhat 44bd2315b2
Merge branch 'master' into room-settings 2020-04-28 13:12:20 -04:00
Ahmad Farhat b08b1ff013
GRN2-xx: Fixed translation location for room status (#1378)
* Fixed translation location for room status

* Added more missing translations
2020-04-28 13:04:04 -04:00
farhatahmad 1d88f54b44 Added disabled styling to always enabled settings 2020-04-16 15:50:23 -04:00
farhatahmad 5c7062d7c9 Added room configuration tab to admin panel 2020-04-16 15:50:23 -04:00
Lars Kiesow 311806faa7
Color Configuration for Cookie Banner (#1302)
* Color Configuration for Cookie Banner

Right now, the colors of the cookie banner are hard-coded which can
easily clash with the configured site colors in site settings.

This patch switches to using the configured colors instead.

* Update application.scss

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 12:46:46 -04:00
Klaus e7e0c7624c
room block enhancements (#1203)
* highlight current room block

* fix duplicated ids

* remove inline js

* remove some trailing whitespaces

* Fixed Server Rooms room settings name

Co-authored-by: farhatahmad <ahmad.af.farhat@gmail.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 11:21:57 -04:00
Klaus 21cb768fc4
make help link configurable (#1161)
* make help link configurable

* change default help url

* use default help url in setups without env var

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 10:56:34 -04:00
Ahmad Farhat 509215ae8d
Added fallback message if image url is invalid (#1149)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-01 17:26:16 -04:00
Ahmad Farhat 03cdbd6b69
Fixed bugs in administrator panel (#1047) 2020-03-20 11:18:05 -04:00
Ahmad Farhat 2c1472daff
Admins can no longer delete a users home room (#965) 2020-02-25 09:53:08 -05:00
Ahmad Farhat 475374090a
Fixed issue with rooms not correctly ordering (#963) 2020-02-24 16:48:51 -05:00
etiennevvv 03266730e8
GRN2-233: Made account activation & password reset links based on tokens only (#959)
* GRN2-233: Hiding email in verification link and password reset link

* updating tests

* removing uid from email verificaiton link

* GRN2-233: modifying test cases

* GRN2-233: Removing uid from password reset link

* GRN2-233: Removed email_params and fixed "authenticated?" method

* GRN2-233: Fixed error when trying to sign in unverified

* GRN2-233: Changed how activation tokens are generated
2020-02-24 13:05:09 -05:00
Ahmad Farhat 4093a89b4a
Added dropdown for dynamically changing the log level (#962) 2020-02-24 12:51:27 -05:00
Ahmad Farhat 2cc1fdf281
Refactored code to reduce number of database queries (#960) 2020-02-24 12:31:30 -05:00
etiennevvv 92da1f6f87
GRN2-269: Pulling room settings using GET instead of data-attributes (#953)
* GRN2-269: Pulling room settings using GET instead of data-attributes

* GRN2-269: added test case and fixed documentation

* GRN2:269: rubocop fix

* GRN2-269: Fixed test case
2020-02-21 09:20:22 -05:00
Ahmad Farhat c75c624a1a
GRN2-xx: Made role priority unique scoped to provider (#942)
* Made role priority unique scoped to provider

* Fixed issues related to update_role after making role priority unique
2020-02-19 13:38:16 -05:00
Ahmad Farhat 005c738e4d
GRN2-260: Added the ability to merge user accounts (#938)
* Added the ability to merge user accounts

* Styling fixes
2020-02-14 10:24:06 -05:00
etiennevvv 3641f1b953
GRN2-270: Hiding delete button in room dropdown for Home Room (#956) 2020-02-14 09:47:17 -05:00
etiennevvv 9fa79bcc16
GRN2-271: Removing redirection to "#" in invite participants copy button (#957) 2020-02-14 09:47:02 -05:00
etiennevvv b67bee2638 GRN2-264: Allow users to change the room settings on Home Room (#951)
* GRN2-264: Allow users to change the room settings on Home Room

* fixing inconsistencies

* removing 'secondary_rooms' method and adjusting looping
2020-02-12 17:49:35 -05:00
Ahmad Farhat 967130e57c GRN2-253: Added the ability to share rooms across multiple users (#912)
* Added ability to share rooms with other users

* Fixed testcases
2020-02-12 17:49:35 -05:00
Ahmad Farhat df1705d9ea Join button now expands to fit text (#921) 2020-02-12 17:49:35 -05:00
Ahmad Farhat eb965e5c52 Added data-disable to all button_to to fix double click issue (#923) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 005ec84c73 GRN2-252: Change to how sign ins are processed (#869)
* Social to local

* Social/Local to Social

* Rubocop fixes

* Added test cases

* Added the ability to clear social uids

* Update admins_controller.rb

* Update admins_controller.rb
2020-02-12 17:49:35 -05:00
Ahmad Farhat 09de6b6739 GRN2-128: Added the ability to manage rooms (#848)
* Added the ability to manage rooms

* Small fixes

* Fixed travis complaints

* Fixed issues with role permissions

* Fixed issue with delete room

* Fixed rubocop and added testcases
2020-02-12 17:49:35 -05:00
Ahmad Farhat da80fb55c7 Errors with recordings no longer cause the page to 500 (#849) 2019-11-01 14:37:38 -04:00
Ahmad Farhat e61946a0f4 GRN2-132: Fixed visual issues with mobile (Fixed #325) (#844)
* Fixed visual issues with mobile

* Fixed spacing above room name
2019-11-01 11:51:22 -04:00
Ahmad Farhat 9c9867b4e7 GRN2-xx: Fixed scaling issue on mobile (#843)
* Disabled browser auto zoom

* Fixed spacing

* Removed unnecessary file
2019-10-18 14:53:13 -04:00
Ahmad Farhat 49def8f405 GRN2-247: Added Active Pending Banned Deleted tabs to manage users (#816)
* Added Active Pending Banned Deleted tabs to manage users

* Removed hard coded strings

* Fixed issues with sign in flow

* Fixed issues with rooms not deleting
2019-10-10 16:10:23 -04:00
Ahmad Farhat 3f5affd116 Only render 1 delete room modal (#819) 2019-10-10 15:45:42 -04:00
Ahmad Farhat e0a4d485bf Added Open Graph attributes to layout (#815) 2019-10-10 15:29:02 -04:00
Ahmad Farhat e13e762349 GRN2-243: Added a report issue button to the 500 error page (#796)
* Added a report issue button to the 500 error page

* Removed unused code

* Removed unused quotes
2019-09-19 10:03:44 -04:00
farhatahmad d3b669d552 GRN2-xx: Users, Room and Recordings are now no longer permanently deleted (#773)
* Bug fixes for 2.4

* Removed accidental code add

* Switched from deleting to tombstoning

* Fixed bug with login
2019-09-19 10:03:44 -04:00
shawn-higgins1 666231db6c Change permissions from columns to table entries (#762) 2019-09-19 10:03:44 -04:00
farhatahmad 01b8dbbd0e GRN2-196: Fixed issues that scrutinizer is complaining about (#765)
* Refactored code to improve scrutinizer score

* Bug fixes
2019-09-19 10:03:44 -04:00
farhatahmad fd6077696d GRN2-180: First stages of refactoring code for v2.4 (#748)
* Email rescues and authenticator concern

* Application controller and helper clean up

* Moved controller code out of helpers

* More helper and email clean up

* Cleaned up remaining helpers and create omniauth_options

* Controller code clean up

* restructured views structure

* Restructured role code

* Restructured profile and code clean up

* Master merge

* Added bbb server concern to deal with bbb calls

* Bug fixes and changes after changes

* rspec

* More rubocop fixes
2019-09-19 10:03:44 -04:00
Ahmad Farhat b590a5a264 GRN2-xx: Added fallback language to locales (#788)
* Added fallback language to locales

* Added comments
2019-09-06 14:28:47 -04:00
Ahmad Farhat 390ccf71c2 Localized js is now served as json (#784) 2019-09-06 10:56:53 -04:00
farhatahmad 9ddc057589 Added a Maintenance Window flash (#758) 2019-08-22 12:15:01 -04:00
farhatahmad 177bf4d595 Cached request to provider to increase application performance (#755) 2019-08-21 14:45:22 -04:00
shawn-higgins1 3d2a0a060b GRN2-225, GRN2-227: Images sent by Office365 Institutional accounts break the rooms (#753)
* Validate profile image url

* Add rake task to migrate old office365 accounts
2019-08-21 14:23:00 -04:00
farhatahmad 96ace3265e Added Google Analytics (#749) 2019-08-19 08:51:57 -04:00
farhatahmad 7e3c44575e Added the ability for admins to send a reset password email for users (#737) 2019-08-14 10:21:57 -04:00
farhatahmad 98405c7d86 GRN2-xx: General bug fixes and performance upgrades (#734)
* General bug fixes and performance upgrades

* Removed unused lines
2019-08-14 09:59:34 -04:00
Jesus Federico 4d69d06ba1
GRN2-ZZZ: Added messages for debugging actioncable (#731)
* GRN2-ZZZ: Added messages for debugging actioncable

* GRN2-ZZZ: Added data to the js message for debugging actioncable

* GRN2-ZZZ: Added data to the js message for debugging actioncable

* Log unsubscribe
2019-08-09 12:07:38 -04:00
shawn-higgins1 6d6ac3efdd Bug fixes for roles (#729) 2019-08-07 11:19:16 -04:00
shawn-higgins1 46e0595e3a Improve can't create room view (#723)
* Improve cant create room view

* Translate role names in the promoted/demoted emails
2019-08-02 16:07:15 -04:00