merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
699 Commits 2 Branches 0 Tags 12 MiB
Commit Graph

699 Commits

Author SHA1 Message Date
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 feccee7d62
GRN2-164: Switched the default database to Postgres (#952) 
* Switched the default database to Postgres

* Uncomment DB variables in sample.env
 2020-02-18 15:22:51 -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 3f8ffa61d7 Fixed issue with links (#934) 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 42e6e4f235 GRN2-241: Moved assets precompile to start script (#927) 
* Moved assets precompile to start script

* Added curl to image for postgres database
 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
transifex-integration[bot] 445800d382 Translate /config/locales/en.yml in ru (#925) 
translation completed for the source file '/config/locales/en.yml'
on the 'ru' language.
 2020-01-22 16:22:15 -05:00
Jesus Federico 6bc43d8e52
Revert "Bump rack from 2.0.7 to 2.0.8 (#914)" (#915) 
This reverts commit 315a83957e.
 2020-01-09 11:11:39 -05:00
dependabot[bot] 315a83957e Bump rack from 2.0.7 to 2.0.8 (#914) 
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-01-09 11:06:10 -05:00
transifex-integration[bot] 1e5f4da905 Translate /config/locales/en.yml in sk_SK (#913) 
translation completed for the source file '/config/locales/en.yml'
on the 'sk_SK' language.

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-01-09 10:54:33 -05:00
transifex-integration[bot] 0ad2ac9eab Translate /config/locales/en.yml in hu_HU (#908) 
translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language.

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-01-09 10:39:01 -05:00
transifex-integration[bot] 0eeda259d1 Translate /config/locales/en.yml in de_DE (#898) 
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-01-09 10:32:32 -05:00
transifex-integration[bot] acd5825622 Translate /config/locales/en.yml in nl (#901) 
translation completed for the source file '/config/locales/en.yml'
on the 'nl' language.

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-01-09 10:24:49 -05:00
transifex-integration[bot] 8d245e656a Translate '/config/locales/en.yml' in 'es' (#910) 
* Translate /config/locales/en.yml in es

translation completed for the source file '/config/locales/en.yml'
on the 'es' language.

* Translate /config/locales/en.yml in es

translation completed for the source file '/config/locales/en.yml'
on the 'es' language.

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-01-09 10:20:31 -05:00
transifex-integration[bot] bcf6ff2245 Translate '/config/locales/en.yml' in 'es_MX' (#911) 
* Translate /config/locales/en.yml in es_MX

translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language.

* Translate /config/locales/en.yml in es_MX

translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language.

* Translate /config/locales/en.yml in es_MX

translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language.

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-01-08 11:12:25 -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
transifex-integration[bot] 4476245f29 Translate /config/locales/en.yml in zh_CN (#900) 
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language.
 2020-01-08 10:19:10 -05:00
transifex-integration[bot] 1ea8ca5411 Translate /config/locales/en.yml in pt_BR (#909) 
translation completed for the source file '/config/locales/en.yml'
on the 'pt_BR' language.
 2020-01-08 10:04:48 -05:00
Ahmad Farhat b291b0e409 Fixed statistics spelling mistake (#874) 2019-12-20 11:31:37 -05:00
transifex-integration[bot] 07a1860f21 Translate /config/locales/en.yml in sk_SK (#894) 
translation completed for the source file '/config/locales/en.yml'
on the 'sk_SK' language.

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2019-12-20 10:19:21 -05:00
Ahmad Farhat 9a8e661fb1 Removed unnecessary log lines (#896) 2019-12-20 09:59:40 -05:00
dependabot[bot] ce281d8b87 Bump puma from 3.12.1 to 3.12.2 (#887) 
Bumps [puma](https://github.com/puma/puma) from 3.12.1 to 3.12.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.12.1...v3.12.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-13 11:46:17 -05:00
transifex-integration[bot] 546b816e4e Translate /config/locales/en.yml in nb (#885) 
translation completed for the source file '/config/locales/en.yml'
on the 'nb' language
 2019-12-04 12:52:35 -05:00
jfederico c708f19f10 Patch on start script for validating the existentce of the database 2019-12-03 14:11:30 -05:00
transifex-integration[bot] 81107e8492 Translate /config/locales/en.yml in es_MX (#883) 
translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language
 2019-12-03 11:24:31 -05:00
transifex-integration[bot] f48bb3c0b2 Translate /config/locales/en.yml in es (#884) 
translation completed for the source file '/config/locales/en.yml'
on the 'es' language
 2019-12-03 11:19:37 -05:00
Jesus Federico 5a18da1a2f
Update start 2019-11-28 16:43:17 -05:00
transifex-integration[bot] a08a8be24e Translate /config/locales/en.yml in nl (#860) 
translation completed for the source file '/config/locales/en.yml'
on the 'nl' language
 2019-11-28 18:08:11 +01:00
transifex-integration[bot] c955f8b766 Translate /config/locales/en.yml in hu_HU (#863) 
translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language
 2019-11-28 18:00:12 +01:00