Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						50f4d5e4f8 
					 
					
						
						
							
							Small fixes to shared access ( #966 )  
						
						 
						
						
						
						
					 
					
						2020-02-28 10:13:51 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						2c1472daff 
					 
					
						
						
							
							Admins can no longer delete a users home room ( #965 )  
						
						 
						
						
						
						
					 
					
						2020-02-25 09:53:08 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						54234ef54b 
					 
					
						
						
							
							Admins that are not signed in are redirected to the signin page when doing admin actions ( #964 )  
						
						 
						
						
						
						
					 
					
						2020-02-24 17:30:39 -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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								etiennevvv 
							
						 
					 
					
						
						
							
						
						b7aa5406ea 
					 
					
						
						
							
							GRN2-273: Fixed bug where incorrect recording length returned when "Notes" format was included ( #961 )  
						
						 
						
						... 
						
						
						
						* GRN2-273: Fixed bug where incorrect recording length returned
* GRN2-273: Changing iteration variable name   in recording_length method 
						
						
					 
					
						2020-02-24 12:58:28 -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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						31258272c2 
					 
					
						
						
							
							GRN2-265: No longer throws 500 if provider not included ( #944 )  
						
						 
						
						... 
						
						
						
						* No longer throws 500 if provider not included
* Rubocop fix 
						
						
					 
					
						2020-02-14 10:03:16 -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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								etiennevvv 
							
						 
					 
					
						
						
							
						
						01c93b1f67 
					 
					
						
						
							
							GRN2-268: Redirecting user back to page they came from in Manage Users ( #950 )  
						
						 
						
						... 
						
						
						
						* GRN2-268: Redirecting user back to page they come from in Manage Users
* re-factoring 
						
						
					 
					
						2020-02-12 17:49:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								etiennevvv 
							
						 
					 
					
						
						
							
						
						68b231dbdb 
					 
					
						
						
							
							GRN2-266: Autofocus room name when create room modal appears ( #945 )  
						
						 
						
						... 
						
						
						
						* added autofocus to the Room Name field
* added autofocus to Room Name text field
* added autofocus to Room Name text field
* GRN2-266 Fixing autofocus for Room name when creating room
* removing whitespace
* fixing whitespace
* fixing whitespace 
						
						
					 
					
						2020-02-12 17:49:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								etiennevvv 
							
						 
					 
					
						
						
							
						
						eb8cc9b17f 
					 
					
						
						
							
							GRN2-267 Redirect admin link when approving a new user to the  "pending" tab ( #947 )  
						
						 
						
						... 
						
						
						
						* GRN2-267 redirect admin to 'pending' tab when approving a new user
* changes after robocop failed
* robocop changes 
						
						
					 
					
						2020-02-12 17:49:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						d6b7e975b0 
					 
					
						
						
							
							Final fix for vendor assets ( #940 )  
						
						 
						
						
						
						
					 
					
						2020-02-12 17:49:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						e15e119d5d 
					 
					
						
						
							
							Included missing assets and fixed room delete 404 ( #939 )  
						
						 
						
						
						
						
					 
					
						2020-02-12 17:49:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						5949a6e243 
					 
					
						
						
							
							GRN2-xx: Removed unnecessary log lines ( #930 )  
						
						 
						
						... 
						
						
						
						* Removed unnecessary log lines
* Removed empty function 
						
						
					 
					
						2020-02-12 17:49:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						397b4b742f 
					 
					
						
						
							
							GRN2-128: Fixed issue with manage rooms permissions ( #929 )  
						
						 
						
						... 
						
						
						
						* Fixed issue with manage rooms permissions
* Improved server rooms efficiency 
						
						
					 
					
						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 
							
						 
					 
					
						
						
							
						
						8cbfc3f730 
					 
					
						
						
							
							GRN2-xx: Users can no longer join a room whose owner is banned or pending ( Fixed   #902 ) ( #922 )  
						
						 
						
						... 
						
						
						
						* Users can no longer join a room whose owner is banned or pending
* Changed flash message
* rubocop fix 
						
						
					 
					
						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 
							
						 
					 
					
						
						
							
						
						8a8eee52fe 
					 
					
						
						
							
							Fixed issue with ldap images ( #926 )  
						
						 
						
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
							
						
						734f7a757e 
					 
					
						
						
							
							GRN2-241: Switched Docker base image to Alpine ( #853 )  
						
						 
						
						... 
						
						
						
						* Switched to alpine image
* Switch Docker base image to alpine
* Removed uneeded code
* Slimmed it down even further 
						
						
					 
					
						2020-02-12 17:49:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						c13a83a3f3 
					 
					
						
						
							
							Fixed issues with rubocop ( #916 )  
						
						 
						
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
							
						
						984e5cc085 
					 
					
						
						
							
							Fixed 500 caused by 1 provider ( #937 )  
						
						 
						
						
						
						
					 
					
						2020-01-28 11:34:46 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						079d64795b 
					 
					
						
						
							
							Redirect authenticated users to main room when accessing ldap signin ( #856 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: Jesus Federico <jesus@123it.ca > 
						
						
					 
					
						2020-01-22 16:32:26 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						ebff9d3625 
					 
					
						
						
							
							GRN2-xx: Fixed issue with rooms not being ordered correctly ( #897 )  
						
						 
						
						... 
						
						
						
						* Fixed issue with rooms not being ordered correctly
* removed home room from list
Co-authored-by: Jesus Federico <jesus@123it.ca > 
						
						
					 
					
						2020-01-08 10:34:01 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						8a4118a9c1 
					 
					
						
						
							
							Added back cache clear function ( #867 )  
						
						 
						
						
						
						
					 
					
						2019-11-28 17:36:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						d35a554199 
					 
					
						
						
							
							Fixed small issue with sign in to prevent error pages from appearing ( #868 )  
						
						 
						
						
						
						
					 
					
						2019-11-15 10:49:52 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								farhatahmad 
							
						 
					 
					
						
						
							
						
						2b9ab05e1e 
					 
					
						
						
							
							Fixed signin bug  
						
						 
						
						
						
						
					 
					
						2019-11-14 11:59:37 -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 
							
						 
					 
					
						
						
							
						
						933408f68b 
					 
					
						
						
							
							GRN2-xx: Removed Health Check Gem ( #840 )  
						
						 
						
						... 
						
						
						
						* Initial work on removing health check gem
* Added health checks
* Fixed gemfile 
						
						
					 
					
						2019-10-21 12:09:31 -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 
							
						 
					 
					
						
						
							
						
						628790733e 
					 
					
						
						
							
							GRN2-xx: Replaced language files with the updated versions ( Fixed   #813 ) ( #814 )  
						
						 
						
						... 
						
						
						
						* Updated language files
* Added fix for javascript languages 
						
						
					 
					
						2019-10-11 08:53:40 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						c1de7f8f70 
					 
					
						
						
							
							GRN2-xx: Replaced google fonts api call with local font load ( Fixed   #830 ) ( #831 )  
						
						 
						
						... 
						
						
						
						* Replaced google fonts api call with local font load
* Removed references to Roboto 
						
						
					 
					
						2019-10-10 16:28:46 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						b9dcaa1b18 
					 
					
						
						
							
							Fixed issue with return to cookie ( #828 )  
						
						 
						
						
						
						
					 
					
						2019-10-10 16:24:35 -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 
							
						 
					 
					
						
						
							
						
						c14f4dc31c 
					 
					
						
						
							
							Fixed issue with migration running on empty db ( #812 )  
						
						 
						
						
						
						
					 
					
						2019-10-10 15:17:52 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						4a791ae0b5 
					 
					
						
						
							
							Email recording now translates correctly ( #809 )  
						
						 
						
						
						
						
					 
					
						2019-10-10 15:08:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ahmad Farhat 
							
						 
					 
					
						
						
							
						
						091b548e90 
					 
					
						
						
							
							Fixed issue with Room Settings ( #807 )  
						
						 
						
						
						
						
					 
					
						2019-09-20 15:33:08 -04:00