Skip to content

Commit

Permalink
Another hotfix for "external link" issue (#944)
Browse files Browse the repository at this point in the history
* test css - testing the build

* Fixed #818

* Fixed #825 remove unused code.

* Add Github signin link

* Add github signin link

* Update "sign in with Slack" explanation

* use another dockerfile

* Issue 824 remove duplicated code (#834)

* refactor (hangout) hangout schedule button

* solving issue: #837 overflow problem of bigger links in discussion thread (#839)

* solving issue: #837 

to solve the overflow problem of long URLs on discussion threads

* Update _discussion.scss

* Migration 1.6 (#842)

* chore (migration) migrat to meteor 1.6

* test (test driver) add  meteortesting:mocha (#845)

* add commit hook using prettier, husky and lint-staged (#841)

* add commit hook using prettier, husky and lint-staged

* prettier test commit

* docs(README): add prettier badge

* Update Dockerfile (#846)

* Issue 784 opt out learning tweet (#838)

* Issue 784. Add checkbox to opt out sending tweets.

* check for false to tweet out message

* Replace @ with a single space

* HTMl link to twitter account

* add prettierignore (#853)

* Release 1.0 (#817)

* Issue 715 group leaders page (#772)

* Add basic template for Study Group Tips

* Style Study Group Tips page

* Link Study Group Tips and Study Groups Page together

Style action buttons for `.section-header`. A bit hacky for now, but should
eventually get cleaned up when stylesheets get audited and refactored.

* add screenshots and change bullet points into checkboxes

* Rename Study Group Tips to Study Group Owners Guide

For clarity and semantics, rename template and routes to Study Group Owner's
Guide.

* Rework `.tips-lists` SCSS

Add margins to lists for better readability.
Remove bullet points for check off tips, but keep numbers for tips for making
study groups successful.

* Feat  discussion (#765)

* inbetweener

* feat (discussion) insert, update, remove

* merge conflict resolve

* feat (discussion) - upvote & downvote

* feat (discussion) - add discussion filter

* fix string truncate

* feat (discussion) single discussion view

* feat (discussion) subscribe, unsubscribe

*  some style

* minor stylistic edits

* feat (discussion) add description preview

* feat (discussion) - add response

* style (discussion) preview pane

* style (discussion) discussion-card

* feat (discussion) add response author to participant and subscribtion list

* feat (discussion) edit responcse

* feat (discussion) response - add upvote, downvote, remove

* feat (discussion) - add sidebar topics

* refactor (discussion) compartmentalize stuff

* inbetweener

* feat (discussion) single page

* inbetweener

* feat (discussion) add tags to discussion

* feat (discussion) slack alert

* style (discussion) minor style improvement

* feat (discussions) - add search functionality

* refactor (navbar) add discussions tab

* feat (discussions) add report functionality

* feat (discussion) add actions for moderators

* refactor (discussion) add default tag and slack channel list

* feat (discussion) send slack alert to specifi channel

* mend

* restore deleted file

* Manage email preference (#776)

* feat (notification) manage email preference

* feat (notification) manage email preference

* fix errors from merge conflicts

* Replace codebuddiesdotorg to codebuddies (#785)

* Small CSS change to test the build.

* Add files via upload

* added more icons

* Welcome page template, copy, route (#778)

* Issue 742 - updated email templates (#786)

* upgraded email tempalte for cancellation email

* revove duplicate study group owners' guide

* update email templates

* updated email templates - new icon image links

* add icons

* Issue 750 new hangout slack channel announcements (#782)

* Ignore change ownership if id of new ownership is not available.

* save selected slack channels in mongodb

* display selected slack channels

* Send new hangout alert to designated slack channels

* Update methods.js

* slight wording change

* Temporary removal of links (#788)

* test css - testing the build

* temporarily hide discussion links

* Add forgotten slack channels (#792)

* test css - testing the build

* add #python and #machine-learning to list

* Removing force-ssl, adding Dockerfile (#795)

* Edit typo at Line 35 (#797)

Forgot the space between ## and the start of the heading.

* Issue 581 add Join/Leave study group in study group pages (#796)

* join and leave study group

* Use different  classname to avoid calling join/leave study group twice

* User can leave group in My Study Group page directly

* Change background color of leave study group to red when hover

* Sort study group name by title

* Fix Issue #790: _select2.css changes (#798)

* Fix overflow text in popover (#804)

* Only obtain hangout channels when hangout group is not Codebuddies Default (#803)

* Encode google calendar topic/description (#805)

* Release 0.0.95 (#789)

Release 0.9.95

* Add forgotten slack channels to prod (#793)

* Issue 715 group leaders page (#772)

* Add basic template for Study Group Tips

* Style Study Group Tips page

* Link Study Group Tips and Study Groups Page together

Style action buttons for `.section-header`. A bit hacky for now, but should
eventually get cleaned up when stylesheets get audited and refactored.

* add screenshots and change bullet points into checkboxes

* Rename Study Group Tips to Study Group Owners Guide

For clarity and semantics, rename template and routes to Study Group Owner's
Guide.

* Rework `.tips-lists` SCSS

Add margins to lists for better readability.
Remove bullet points for check off tips, but keep numbers for tips for making
study groups successful.

* Feat  discussion (#765)

* inbetweener

* feat (discussion) insert, update, remove

* merge conflict resolve

* feat (discussion) - upvote & downvote

* feat (discussion) - add discussion filter

* fix string truncate

* feat (discussion) single discussion view

* feat (discussion) subscribe, unsubscribe

*  some style

* minor stylistic edits

* feat (discussion) add description preview

* feat (discussion) - add response

* style (discussion) preview pane

* style (discussion) discussion-card

* feat (discussion) add response author to participant and subscribtion list

* feat (discussion) edit responcse

* feat (discussion) response - add upvote, downvote, remove

* feat (discussion) - add sidebar topics

* refactor (discussion) compartmentalize stuff

* inbetweener

* feat (discussion) single page

* inbetweener

* feat (discussion) add tags to discussion

* feat (discussion) slack alert

* style (discussion) minor style improvement

* feat (discussions) - add search functionality

* refactor (navbar) add discussions tab

* feat (discussions) add report functionality

* feat (discussion) add actions for moderators

* refactor (discussion) add default tag and slack channel list

* feat (discussion) send slack alert to specifi channel

* mend

* restore deleted file

* Manage email preference (#776)

* feat (notification) manage email preference

* feat (notification) manage email preference

* fix errors from merge conflicts

* Replace codebuddiesdotorg to codebuddies (#785)

* test css - testing the build

* Small CSS change to test the build.

* Add files via upload

* added more icons

* Welcome page template, copy, route (#778)

* Issue 742 - updated email templates (#786)

* upgraded email tempalte for cancellation email

* revove duplicate study group owners' guide

* update email templates

* updated email templates - new icon image links

* add icons

* Issue 750 new hangout slack channel announcements (#782)

* Ignore change ownership if id of new ownership is not available.

* save selected slack channels in mongodb

* display selected slack channels

* Send new hangout alert to designated slack channels

* Update methods.js

* slight wording change

* Temporary removal of links (#788)

* test css - testing the build

* temporarily hide discussion links

* add #python and #machine-learning to list

* Encode description and topic

* Email notifications (#801)

* feat (email notification) add notification flag

* feat (email notification) initial email notifications for hangout, discussion, studygroup

* proofread email templates

* we do not need a greeting in the 'new responses' template

* fix in 'new discussion'

* refactor (email notification) send emails to individuals

* fix (discussion) missing id err

* style (base) cursor pointer

* feat (discussion) clear tag selection

* small proofreading tweaks

* style (cb_mailer) manage whitespace

* fix (discussion) fix missing groupId err

* Resolves issue 809: solve formatting issues and link up usernames (#810)

* Updated contributors' section on the About page (and added a proper "contributors" section to the Github README.md) (#808)

* feat (email notification) add notification flag

* feat (email notification) initial email notifications for hangout, discussion, studygroup

* proofread email templates

* we do not need a greeting in the 'new responses' template

* fix in 'new discussion'

* Add @doc as a contributor

* Update @doc as a contributor

* Add @distalx as a contributor

* Add @code as a contributor

* Add @lpatmo as a contributor

* Add @nalbina as a contributor

* Add @distalx as a contributor

* Add @railsstudent as a contributor

* Add @adachiu as a contributor

* Add @anbuselvan as a contributor

* Add @sergeant-q as a contributor

* Add @William-R-Wilson as a contributor

* Add @BethanyG as a contributor

* Add @wuworkshop as a contributor

* Add @oliikit as a contributor

* Add @abdulhannanali as a contributor

* Add @camilleriluke as a contributor

* Add @abhiramr as a contributor

* Add @sharynneazhar as a contributor

* Add @ISPOL as a contributor

* Add @leewaygroups as a contributor

* Add @Luxisapex as a contributor

* Add @mduca as a contributor

* Add @PandaWhisperer as a contributor

* Add @pdotsani as a contributor

* Add @sheldonbarnes as a contributor

* Add @sujilnt as a contributor

* Add @techgeek503 as a contributor

* Add @osanseviero as a contributor

* Add @angelocordon as a contributor

* Add @stain88 as a contributor

* contributors -- first pass

* package-lock.json

* Add @Oliver84 as a contributor

* Add @anonRegions as a contributor

* Add @daisukeokaoss as a contributor

* Add @howdoicomputer as a contributor

* Add @nestevez7 as a contributor

* Add @grfraser as a contributor

* Add @aewens as a contributor

* Add @xXSupernaturalBuilderXx as a contributor

* Add @jmabry111 as a contributor

* Add @ricjon as a contributor

* Add @morrme as a contributor

* Add @dantesolis as a contributor

* Add @akosasante as a contributor

* Add @Briix as a contributor

* Add @garri-ribeiro as a contributor

* Add @ajparise as a contributor

* Update @ISPOL as a contributor

* Add @BratCat as a contributor

* Update @wuworkshop as a contributor

* Add @jasonly as a contributor

* Add @raj-maurya as a contributor

* Add @lungyiin as a contributor

* Add @rmorabia as a contributor

* Add @gytdau as a contributor

* Add @madan96 as a contributor

* Add @morris-jason as a contributor

* Add @kindlingscript as a contributor

* Add @kevincoleman as a contributor

* Add @techtolentino as a contributor

* Add @newswim as a contributor

* Add @arturolei as a contributor

* Add @julianjohannesen as a contributor

* Add @agatac as a contributor

* Add @kristinakarnitskaya as a contributor

* Add @kennyhuynh125 as a contributor

* Add @DennyScott as a contributor

* Add @batraman as a contributor

* Add @ganes1410 as a contributor

* Add @Axieum as a contributor

* Add @josephkmh as a contributor

* Add @schoettkr as a contributor

* Add @w01fw00d as a contributor

* Add @alesfer001 as a contributor

* Add @jlee124 as a contributor

* Add @valishah as a contributor

* Add @elimisteve as a contributor

* Add @dmost1 as a contributor

* Add @colleenboodleman as a contributor

* Add @anish-shekhawat as a contributor

* Add @grimmaldi as a contributor

* Add @RichardTran as a contributor

* Add @AnnaDodson as a contributor

* Add @mckpm as a contributor

* Add @nerdneha as a contributor

* Add @stratosgear as a contributor

* Add @freakomonk as a contributor

* Add @aaronkim5 as a contributor

* Add @vharsh as a contributor

* Add @ericathedev as a contributor

* Add @pvskarthikeya as a contributor

* Add @adnrs96 as a contributor

* Add @hi15 as a contributor

* Add @JelaniThompson as a contributor

* Add @vishnubhagwan as a contributor

* Add @mankinchi as a contributor

* Add @svpersteve as a contributor

* Add @spetastian as a contributor

* Add @russeby as a contributor

* Add @bryantt23 as a contributor

* Add @albertfougy as a contributor

* Add @4imble as a contributor

* Add @dangillet as a contributor

* Add @yipnm123 as a contributor

* updated contirbutors' list

* remove old plaintext list

* updated the contributors' section on the about page

* moar updates

* Update @rmorabia as a contributor

* Add @cs-cordero as a contributor

* Add @kvie as a contributor

* Add @codeluggage as a contributor

* updated contributors' list

* contributor update

* Small `contributors` fix (#812)

* feat (email notification) add notification flag

* feat (email notification) initial email notifications for hangout, discussion, studygroup

* proofread email templates

* we do not need a greeting in the 'new responses' template

* fix in 'new discussion'

* Add @doc as a contributor

* Update @doc as a contributor

* Add @distalx as a contributor

* Add @code as a contributor

* Add @lpatmo as a contributor

* Add @nalbina as a contributor

* Add @distalx as a contributor

* Add @railsstudent as a contributor

* Add @adachiu as a contributor

* Add @anbuselvan as a contributor

* Add @sergeant-q as a contributor

* Add @William-R-Wilson as a contributor

* Add @BethanyG as a contributor

* Add @wuworkshop as a contributor

* Add @oliikit as a contributor

* Add @abdulhannanali as a contributor

* Add @camilleriluke as a contributor

* Add @abhiramr as a contributor

* Add @sharynneazhar as a contributor

* Add @ISPOL as a contributor

* Add @leewaygroups as a contributor

* Add @Luxisapex as a contributor

* Add @mduca as a contributor

* Add @PandaWhisperer as a contributor

* Add @pdotsani as a contributor

* Add @sheldonbarnes as a contributor

* Add @sujilnt as a contributor

* Add @techgeek503 as a contributor

* Add @osanseviero as a contributor

* Add @angelocordon as a contributor

* Add @stain88 as a contributor

* contributors -- first pass

* package-lock.json

* Add @Oliver84 as a contributor

* Add @anonRegions as a contributor

* Add @daisukeokaoss as a contributor

* Add @howdoicomputer as a contributor

* Add @nestevez7 as a contributor

* Add @grfraser as a contributor

* Add @aewens as a contributor

* Add @xXSupernaturalBuilderXx as a contributor

* Add @jmabry111 as a contributor

* Add @ricjon as a contributor

* Add @morrme as a contributor

* Add @dantesolis as a contributor

* Add @akosasante as a contributor

* Add @Briix as a contributor

* Add @garri-ribeiro as a contributor

* Add @ajparise as a contributor

* Update @ISPOL as a contributor

* Add @BratCat as a contributor

* Update @wuworkshop as a contributor

* Add @jasonly as a contributor

* Add @raj-maurya as a contributor

* Add @lungyiin as a contributor

* Add @rmorabia as a contributor

* Add @gytdau as a contributor

* Add @madan96 as a contributor

* Add @morris-jason as a contributor

* Add @kindlingscript as a contributor

* Add @kevincoleman as a contributor

* Add @techtolentino as a contributor

* Add @newswim as a contributor

* Add @arturolei as a contributor

* Add @julianjohannesen as a contributor

* Add @agatac as a contributor

* Add @kristinakarnitskaya as a contributor

* Add @kennyhuynh125 as a contributor

* Add @DennyScott as a contributor

* Add @batraman as a contributor

* Add @ganes1410 as a contributor

* Add @Axieum as a contributor

* Add @josephkmh as a contributor

* Add @schoettkr as a contributor

* Add @w01fw00d as a contributor

* Add @alesfer001 as a contributor

* Add @jlee124 as a contributor

* Add @valishah as a contributor

* Add @elimisteve as a contributor

* Add @dmost1 as a contributor

* Add @colleenboodleman as a contributor

* Add @anish-shekhawat as a contributor

* Add @grimmaldi as a contributor

* Add @RichardTran as a contributor

* Add @AnnaDodson as a contributor

* Add @mckpm as a contributor

* Add @nerdneha as a contributor

* Add @stratosgear as a contributor

* Add @freakomonk as a contributor

* Add @aaronkim5 as a contributor

* Add @vharsh as a contributor

* Add @ericathedev as a contributor

* Add @pvskarthikeya as a contributor

* Add @adnrs96 as a contributor

* Add @hi15 as a contributor

* Add @JelaniThompson as a contributor

* Add @vishnubhagwan as a contributor

* Add @mankinchi as a contributor

* Add @svpersteve as a contributor

* Add @spetastian as a contributor

* Add @russeby as a contributor

* Add @bryantt23 as a contributor

* Add @albertfougy as a contributor

* Add @4imble as a contributor

* Add @dangillet as a contributor

* Add @yipnm123 as a contributor

* updated contirbutors' list

* remove old plaintext list

* updated the contributors' section on the about page

* moar updates

* Update @rmorabia as a contributor

* Add @cs-cordero as a contributor

* Add @kvie as a contributor

* Add @codeluggage as a contributor

* updated contributors' list

* contributor update

* fix one of the contributor profile image urls

* Edit discussion tags (#813)

* modifications to discussion tags list

* proofread

* Merge wip-signin-system branch into staging (#811)

* Release 0.0.95 (#789)

Release 0.9.95

* Add forgotten slack channels to prod (#793)

* Issue 715 group leaders page (#772)

* Add basic template for Study Group Tips

* Style Study Group Tips page

* Link Study Group Tips and Study Groups Page together

Style action buttons for `.section-header`. A bit hacky for now, but should
eventually get cleaned up when stylesheets get audited and refactored.

* add screenshots and change bullet points into checkboxes

* Rename Study Group Tips to Study Group Owners Guide

For clarity and semantics, rename template and routes to Study Group Owner's
Guide.

* Rework `.tips-lists` SCSS

Add margins to lists for better readability.
Remove bullet points for check off tips, but keep numbers for tips for making
study groups successful.

* Feat  discussion (#765)

* inbetweener

* feat (discussion) insert, update, remove

* merge conflict resolve

* feat (discussion) - upvote & downvote

* feat (discussion) - add discussion filter

* fix string truncate

* feat (discussion) single discussion view

* feat (discussion) subscribe, unsubscribe

*  some style

* minor stylistic edits

* feat (discussion) add description preview

* feat (discussion) - add response

* style (discussion) preview pane

* style (discussion) discussion-card

* feat (discussion) add response author to participant and subscribtion list

* feat (discussion) edit responcse

* feat (discussion) response - add upvote, downvote, remove

* feat (discussion) - add sidebar topics

* refactor (discussion) compartmentalize stuff

* inbetweener

* feat (discussion) single page

* inbetweener

* feat (discussion) add tags to discussion

* feat (discussion) slack alert

* style (discussion) minor style improvement

* feat (discussions) - add search functionality

* refactor (navbar) add discussions tab

* feat (discussions) add report functionality

* feat (discussion) add actions for moderators

* refactor (discussion) add default tag and slack channel list

* feat (discussion) send slack alert to specifi channel

* mend

* restore deleted file

* Manage email preference (#776)

* feat (notification) manage email preference

* feat (notification) manage email preference

* fix errors from merge conflicts

* Replace codebuddiesdotorg to codebuddies (#785)

* test css - testing the build

* Small CSS change to test the build.

* Add files via upload

* added more icons

* Welcome page template, copy, route (#778)

* Issue 742 - updated email templates (#786)

* upgraded email tempalte for cancellation email

* revove duplicate study group owners' guide

* update email templates

* updated email templates - new icon image links

* add icons

* Issue 750 new hangout slack channel announcements (#782)

* Ignore change ownership if id of new ownership is not available.

* save selected slack channels in mongodb

* display selected slack channels

* Send new hangout alert to designated slack channels

* Update methods.js

* slight wording change

* Temporary removal of links (#788)

* test css - testing the build

* temporarily hide discussion links

* add #python and #machine-learning to list

* initial setup for sign in with github (#802)

* Add SignIn menu with slack and github buttons

* feat (signin github) add github signin

* pref (sign in) manage duplicate username use case, a welcome screen for new users

* Signin workflow improvement (#806)

* Release 0.0.95 (#789)

Release 0.9.95

* Add forgotten slack channels to prod (#793)

* Issue 715 group leaders page (#772)

* Add basic template for Study Group Tips

* Style Study Group Tips page

* Link Study Group Tips and Study Groups Page together

Style action buttons for `.section-header`. A bit hacky for now, but should
eventually get cleaned up when stylesheets get audited and refactored.

* add screenshots and change bullet points into checkboxes

* Rename Study Group Tips to Study Group Owners Guide

For clarity and semantics, rename template and routes to Study Group Owner's
Guide.

* Rework `.tips-lists` SCSS

Add margins to lists for better readability.
Remove bullet points for check off tips, but keep numbers for tips for making
study groups successful.

* Feat  discussion (#765)

* inbetweener

* feat (discussion) insert, update, remove

* merge conflict resolve

* feat (discussion) - upvote & downvote

* feat (discussion) - add discussion filter

* fix string truncate

* feat (discussion) single discussion view

* feat (discussion) subscribe, unsubscribe

*  some style

* minor stylistic edits

* feat (discussion) add description preview

* feat (discussion) - add response

* style (discussion) preview pane

* style (discussion) discussion-card

* feat (discussion) add response author to participant and subscribtion list

* feat (discussion) edit responcse

* feat (discussion) response - add upvote, downvote, remove

* feat (discussion) - add sidebar topics

* refactor (discussion) compartmentalize stuff

* inbetweener

* feat (discussion) single page

* inbetweener

* feat (discussion) add tags to discussion

* feat (discussion) slack alert

* style (discussion) minor style improvement

* feat (discussions) - add search functionality

* refactor (navbar) add discussions tab

* feat (discussions) add report functionality

* feat (discussion) add actions for moderators

* refactor (discussion) add default tag and slack channel list

* feat (discussion) send slack alert to specifi channel

* mend

* restore deleted file

* Manage email preference (#776)

* feat (notification) manage email preference

* feat (notification) manage email preference

* fix errors from merge conflicts

* Replace codebuddiesdotorg to codebuddies (#785)

* test css - testing the build

* Small CSS change to test the build.

* Add files via upload

* added more icons

* Welcome page template, copy, route (#778)

* Issue 742 - updated email templates (#786)

* upgraded email tempalte for cancellation email

* revove duplicate study group owners' guide

* update email templates

* updated email templates - new icon image links

* add icons

* Issue 750 new hangout slack channel announcements (#782)

* Ignore change ownership if id of new ownership is not available.

* save selected slack channels in mongodb

* display selected slack channels

* Send new hangout alert to designated slack channels

* Update methods.js

* slight wording change

* Temporary removal of links (#788)

* test css - testing the build

* temporarily hide discussion links

* add #python and #machine-learning to list

* pref (sign in) manage duplicate username use case, a welcome screen for new users

* Update basic_user_information.js

* Change slack signin permissions (#814)

* update slack app permission

* remove dead code

* Refactor settings (#815)

* Release 0.0.95 (#789)

Release 0.9.95

* Add forgotten slack channels to prod (#793)

* Issue 715 group leaders page (#772)

* Add basic template for Study Group Tips

* Style Study Group Tips page

* Link Study Group Tips and Study Groups Page together

Style action buttons for `.section-header`. A bit hacky for now, but should
eventually get cleaned up when stylesheets get audited and refactored.

* add screenshots and change bullet points into checkboxes

* Rename Study Group Tips to Study Group Owners Guide

For clarity and semantics, rename template and routes to Study Group Owner's
Guide.

* Rework `.tips-lists` SCSS

Add margins to lists for better readability.
Remove bullet points for check off tips, but keep numbers for tips for making
study groups successful.

* Feat  discussion (#765)

* inbetweener

* feat (discussion) insert, update, remove

* merge conflict resolve

* feat (discussion) - upvote & downvote

* feat (discussion) - add discussion filter

* fix string truncate

* feat (discussion) single discussion view

* feat (discussion) subscribe, unsubscribe

*  some style

* minor stylistic edits

* feat (discussion) add description preview

* feat (discussion) - add response

* style (discussion) preview pane

* style (discussion) discussion-card

* feat (discussion) add response author to participant and subscribtion list

* feat (discussion) edit responcse

* feat (discussion) response - add upvote, downvote, remove

* feat (discussion) - add sidebar topics

* refactor (discussion) compartmentalize stuff

* inbetweener

* feat (discussion) single page

* inbetweener

* feat (discussion) add tags to discussion

* feat (discussion) slack alert

* style (discussion) minor style improvement

* feat (discussions) - add search functionality

* refactor (navbar) add discussions tab

* feat (discussions) add report functionality

* feat (discussion) add actions for moderators

* refactor (discussion) add default tag and slack channel list

* feat (discussion) send slack alert to specifi channel

* mend

* restore deleted file

* Manage email preference (#776)

* feat (notification) manage email preference

* feat (notification) manage email preference

* fix errors from merge conflicts

* Replace codebuddiesdotorg to codebuddies (#785)

* test css - testing the build

* Small CSS change to test the build.

* Add files via upload

* added more icons

* Welcome page template, copy, route (#778)

* Issue 742 - updated email templates (#786)

* upgraded email tempalte for cancellation email

* revove duplicate study group owners' guide

* update email templates

* updated email templates - new icon image links

* add icons

* Issue 750 new hangout slack channel announcements (#782)

* Ignore change ownership if id of new ownership is not available.

* save selected slack channels in mongodb

* display selected slack channels

* Send new hangout alert to designated slack channels

* Update methods.js

* slight wording change

* Temporary removal of links (#788)

* test css - testing the build

* temporarily hide discussion links

* add #python and #machine-learning to list

* initial setup for sign in with github (#802)

* Add SignIn menu with slack and github buttons

* feat (signin github) add github signin

* pref (sign in) manage duplicate username use case, a welcome screen for new users

* Signin workflow improvement (#806)

* Release 0.0.95 (#789)

Release 0.9.95

* Add forgotten slack channels to prod (#793)

* Issue 715 group leaders page (#772)

* Add basic template for Study Group Tips

* Style Study Group Tips page

* Link Study Group Tips and Study Groups Page together

Style action buttons for `.section-header`. A bit hacky for now, but should
eventually get cleaned up when stylesheets get audited and refactored.

* add screenshots and change bullet points into checkboxes

* Rename Study Group Tips to Study Group Owners Guide

For clarity and semantics, rename template and routes to Study Group Owner's
Guide.

* Rework `.tips-lists` SCSS

Add margins to lists for better readability.
Remove bullet points for check off tips, but keep numbers for tips for making
study groups successful.

* Feat  discussion (#765)

* inbetweener

* feat (discussion) insert, update, remove

* merge conflict resolve

* feat (discussion) - upvote & downvote

* feat (discussion) - add discussion filter

* fix string truncate

* feat (discussion) single discussion view

* feat (discussion) subscribe, unsubscribe

*  some style

* minor stylistic edits

* feat (discussion) add description preview

* feat (discussion) - add response

* style (discussion) preview pane

* style (discussion) discussion-card

* feat (discussion) add response author to participant and subscribtion list

* feat (discussion) edit responcse

* feat (discussion) response - add upvote, downvote, remove

* feat (discussion) - add sidebar topics

* refactor (discussion) compartmentalize stuff

* inbetweener

* feat (discussion) single page

* inbetweener

* feat (discussion) add tags to discussion

* feat (discussion) slack alert

* style (discussion) minor style improvement

* feat (discussions) - add search functionality

* refactor (navbar) add discussions tab

* feat (discussions) add report functionality

* feat (discussion) add actions for moderators

* refactor (discussion) add default tag and slack channel list

* feat (discussion) send slack alert to specifi channel

* mend

* restore deleted file

* Manage email preference (#776)

* feat (notification) manage email preference

* feat (notification) manage email preference

* fix errors from merge conflicts

* Replace codebuddiesdotorg to codebuddies (#785)

* test css - testing the build

* Small CSS change to test the build.

* Add files via upload

* added more icons

* Welcome page template, copy, route (#778)

* Issue 742 - updated email templates (#786)

* upgraded email tempalte for cancellation email

* revove duplicate study group owners' guide

* update email templates

* updated email templates - new icon image links

* add icons

* Issue 750 new hangout slack channel announcements (#782)

* Ignore change ownership if id of new ownership is not available.

* save selected slack channels in mongodb

* display selected slack channels

* Send new hangout alert to designated slack channels

* Update methods.js

* slight wording change

* Temporary removal of links (#788)

* test css - testing the build

* temporarily hide discussion links

* add #python and #machine-learning to list

* pref (sign in) manage duplicate username use case, a welcome screen for new users

* Update basic_user_information.js

* Change slack signin permissions (#814)

* update slack app permission

* remove dead code

* refactor (settings.json) rearrange settings.json file

* Mini release (#843)

* Fixed #818

* Fixed #825 remove unused code.

* Add Github signin link

* Add github signin link

* Update "sign in with Slack" explanation

* use another dockerfile

* Issue 824 remove duplicated code (#834)

* refactor (hangout) hangout schedule button

* solving issue: #837 overflow problem of bigger links in discussion thread (#839)

* solving issue: #837 

to solve the overflow problem of long URLs on discussion threads

* Update _discussion.scss

* Migration 1.6 (#842)

* chore (migration) migrat to meteor 1.6

* chore(prettier): add prettierignore

* chore(prettierignore): test prettierignore

* chore(prettier): update prettierignore file

* fix(package): add missing package

a package was removed during merge conflits

* hide google calendar button if hangout has ended (#857)

Signed-off-by: Connie Leung <cleung334@gmail.com>

* fix(Slack notifications): Remove mention of "username" in Slack notifications for reasons specified (#855)

Now that we allow folks to log in using Github, the Github username probably won't match up with a
corresponding Slack username on CodeBuddies every time. So it makes sense to remove the username
message from the announcement notification.

854

* owner of completed hangout should able to create hangout (#858)

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Fix Mixed Content Error (#866)

* #830 Add global activity feed on home logged out page (#856)

* feat (email notification) add notification flag

* Add global activity feed on home logged out page

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Add global activity feed on home logged out page

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Add translations

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Create server method to return global activity count

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Store reactive variables in instance.data. Variables can show in html without helper functions

Signed-off-by: Connie Leung <cleung334@gmail.com>

* perf(registerHelper): add `instance` registerHelper

* fix Dockerfile. create dummy test.yml for docker (#870)

* Prompt login modal when unauthenticated user tries to join study group (#864)

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Fixed issue #861 (#869)

* Fixed issue 861

* https

* created post_test hook and placeholder for tests (#872)

* Adding contributor (#873)

* Adding contributor

* Adding contributor

* Feat montiapm (#874)

* feat (email notification) add notification flag

* feat(montiapm): add support for montiapm for production

* Issue 852: created a global silent hangout page (#862)

* first commit: global silent coworking page

* first iteration: global silent hangout

* cleanup and new screenshot

* add /silent route

* add global message nav

* new style for /coworking page

* use existing hangoutFrame code

* remove errors that pop up if guest (non-logged-in-user) is trying out the global silent hangout

* Format labels and buttons in profile Hangouts Completed (#877)

Override boostrap properties that created overflow in labels and buttons by adding white-space:normal properties.
Allows buttons and labels to sit nicely in their designated columns.

Resolves: #851

Format changes to spaces

* Remove spinner

* update global silent hangout page design (#882)

* Issue 881: PR test (#883)

* update global silent hangout page design

* remove h3.slanted rule

* Issue 881: add coworking image to /coworking page (#884)

* update global silent hangout page design

* remove h3.slanted rule

* redesign /coworking: add coworking image to header

* tagline edit

* Issue 799: GDPR (#885)

* update terms of service and privacy policy

* add export link that downloads user profile data into a CSV

* Update _coworking.scss

* Issue 871 (#886)

* Send notification to facebook and slack channels when start time of hangout is changed.

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Send notification to facebook and slack channels when start time of hangout is changed.

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Tweak `time has changed` alert text 

Say 'Update: ... has changed"

* Issue 799: Add an opt-in checkbox to the nav for privacy policy (#887)

* update terms of service and privacy policy

* add export link that downloads user profile data into a CSV

* add privacy agreement checkbox that shows for all users until they check to agree

* add privacy agremeent templateset

* proofreading

* This PR supports unsubscribe links for the following email notifications (#888)

* feat(unsub-link): add unsubscribe link to email templates

unsubscribe link for new_discussion, discussion_thread, new_member & new_hangout email notification.

* merge conflict resolve

* fix(typo): set default value to false

* update text

* PR test: update homepage text (#889)

* PR test: update homepage text

* fix build error (missing practicalmeteor:chai package)

* Issue 892: CSS on mobile fixes (#893)

* PR test: update homepage text

* fix build error (missing practicalmeteor:chai package)

* fix problem with  appearing as the default username on /coworking hangout even if user is logged in

* Resolves issue 892: css fixes for mobile on /coworking

* Issue 890: fix problem with logged-in users having default `guest` username on /coworking hangout (#891)

* PR test: update homepage text

* fix build error (missing practicalmeteor:chai package)

* fix problem with  appearing as the default username on /coworking hangout even if user is logged in

* Remove second instance of montiapm:agent

* fix(Hangout Frame): fix missing username (#900)

* update location for Ada (#896)

* update location for Ada

* add missing practicalmeteor:chai package

* perf(learnings): display total number of learnings (#899)

* perf(learnings): display total number of learnings

* chore(packages): add packages, which were accidentally removed.

* Solves issue 903: make sure video is always muted by default, even for first participants. The fix was that  was outdated and we needed . Also, one can set a meet.jit.si link to default true by appending #config.startWithVideoMuted=true to the URL. (#904)

Hotfixing.

* fix for participant count (#906)

* Release 1.12 Hotfixes (#901)

* Hotfix: `startWithVideoMuted` (#905)

* fix(hangout frame): update  participants count for guest users.

* add support for `buy me a coffee` and other links. (#908)

* Release 1.12 Hotfixes (#901)

* Hotfix: `startWithVideoMuted` (#905)

* feat(user profile): allow user to add following links to their profile  `buymeacoffee`, `patreon` or

* feat(hangout page): display support links on hangout page, if organizer has any.

* small wording tweaks

* style(users): remove console.log

* Initial Testimonial feature added

* style tweaks to testimonials

* update link to medium.com survey results

* Issue 868 archive data (#915)

* Delete discussions, discussion responses and study groups

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Remove access token of both github and slack if account logs in by both authentications

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Fix: Unable to start app on osx (#918)

Updated the fourseven package version to 4.9.0

* Issue 907 fontawesome upgrade (#917)

* feat (email notification) add notification flag

* Upgrade fontawesome icons to v5

Signed-off-by: Connie Leung <cleung334@gmail.com>

* Patch fontawesome v4 icons to v5

Signed-off-by: Connie Leung <cleung334@gmail.com>

* add percolate:migrations to handle migrations

* fontawesome cleanup: use fas instead of far (pro) icons (#925)

* Meteor 1.7 Upgrade (#923)

* feat (email notification) add notification flag

* Upgrade to Meteor 1.7
  - Prep work for major project refactor
  - removed duplicate jquery installation (kept npm version)
  - downgraded to twbs:bootstrap@3.3.5 for compatibility

* chore(update): @babel/runtime and meteor-node-stubs to their latest versions.

* Update all_notifications.html

* Updated /slack etiquette section, _slack.scss, and head.html (#929)

* Updated /slack etiquette section and _slack.scss. Also updated fontawesome cdn version to 5.2.0

* Update fontawesome emoji to fas. Deleted the section 'Who can create new channels on Slack?'

* add forum link in nav bar (#928)

* add forum link in nav bar

fix #919
add https://forum.codebuddies.org link in nav bar, so new user, can
easily find code buddies forum link

* add discourse icon in forum icon

* Fix hangout link issue (#933)

* Fix hangout link issue

* Update versions

* Update versions

* test

* remove empty submodule (#936)

* Solves bug 930 (#935)

* Solves bug 930

* Update versions

* Update versions

* Update versions

* Give users the ability to set an alternate hangout platform (and not default to Jitsi) (#940)

* added HTML elements

* move external checkbox over to hangout modal instead of displaying on post itself

* added HTML elements

* move external checkbox over to hangout modal instead of displaying on post itself

* support external hangout links on hangout create/edit/clone modals

* Hotfixes to "external hangout link" issue (#942)

* added HTML elements

* move external checkbox over to hangout modal instead of displaying on post itself

* added HTML elements

* move external checkbox over to hangout modal instead of displaying on post itself

* support external hangout links on hangout create/edit/clone modals

* Fix bug re: if user edits or duplicates hangout from the hangout action bar (external link gets overridden). Also make sure external link shows without RSVP if one exists.

* Update versions
  • Loading branch information
lpatmo committed Aug 18, 2018
1 parent ee2e630 commit d8b29cf
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 41 deletions.
2 changes: 2 additions & 0 deletions .meteor/versions
Expand Up @@ -151,3 +151,5 @@ url@1.2.0
webapp@1.6.2
webapp-hashing@1.0.9
zimme:active-route@2.3.2
mizzao:timesync@0.5.0
mizzao:user-status@0.6.7
6 changes: 5 additions & 1 deletion client/templates/hangout/hangout.html
Expand Up @@ -97,7 +97,11 @@ <h3>Participants</h3>
{{/if}}

{{ else }}
<a class="{{#if currentUser}}{{# unless isHangoutCompleted end}} join-hangout {{/unless }} {{else}} continue-popup {{/if}}"><img src="/images/logo-circle-cropped.png" width="65%" class="load-hangout-screenshot display-block centered margin-top-1"/></a>
{{# if externalCheckbox }}
<a href="{{externalURL}}" class="btn btn-cb2 margin-top-1" rel="noopener" target="_blank">Join us on {{externalButtonText}} <i class="fas fa-external-link-alt fa-fw" aria-hidden="true"></i></a>
{{ else }}
<a class="{{#if currentUser}}{{# unless isHangoutCompleted end}} join-hangout {{/unless }} {{else}} continue-popup {{/if}}"><img src="/images/logo-circle-cropped.png" width="65%" class="load-hangout-screenshot display-block centered margin-top-1"/></a>
{{/if}}
{{/if}}

{{> supportHangoutOrganizer organizerId=host.id}}
Expand Down
105 changes: 65 additions & 40 deletions client/templates/hangout/hangout_action_bar.js
@@ -1,38 +1,47 @@
import QuillEditor from '../../libs/QuillEditor';
import QuillEditor from "../../libs/QuillEditor";

Template.hangoutActionBar.events({
'click .report-hangout': function(e, hangout) {

"click .report-hangout": function(e, hangout) {
if (Meteor.userId()) {
const hangoutId = hangout.data._id;
Session.set('hangoutId', hangoutId);
Session.set("hangoutId", hangoutId);

Modal.show('reportHangoutModal');
Modal.show("reportHangoutModal");
}

},
'click .clone-hangout': function(e, hangout) {

"click .clone-hangout": function(e, hangout) {
if (Meteor.userId()) {
// console.log(hangout.data._id + ' this is a cloned hangout id');
Session.set('hangoutId', hangout.data._id);
Modal.show('cloneHangoutModal', {hangout});
$('#clone-hangout-modal #topic').val(hangout.data.topic);
$('#clone-hangout-modal input[value=' + hangout.data.type + ']').prop("checked", true);
Session.set("hangoutId", hangout.data._id);
Modal.show("cloneHangoutModal", { hangout });
$("#clone-hangout-modal input#external-checkbox").prop(
"checked",
hangout.data.externalCheckbox
);
$("#clone-hangout-modal #externalButtonText").val(
hangout.data.externalButtonText
);
$("#clone-hangout-modal #externalURL").val(hangout.data.externalURL);
$("#clone-hangout-modal #topic").val(hangout.data.topic);
$("#clone-hangout-modal input[value=" + hangout.data.type + "]").prop(
"checked",
true
);
}

},
'click .edit-hangout': function(e, hangout) {
"click .edit-hangout": function(e, hangout) {
//console.log(hangout.data.topic);
//pass in the right times like 03/09/2016 2:03 AM
var start_time_reverted = moment(hangout.data.start).format('MM/DD/YYYY h:mm A');
var hangoutDuration = hangout.data.duration
var start_time_reverted = moment(hangout.data.start).format(
"MM/DD/YYYY h:mm A"
);
var hangoutDuration = hangout.data.duration;

//var end_time_reverted = moment(hangout.data.end).format('MM/DD/YYYY h:mm A');

console.log(hangout.data._id + ' this is an edited hangout id');
console.log(hangout.data._id + " this is an edited hangout id");

Session.set('hangoutId', hangout.data._id);
Session.set("hangoutId", hangout.data._id);
// Session.set('hostId', hangout.data.user_id);
// Session.set('hostUsername', hangout.data.creator);

Expand All @@ -44,51 +53,67 @@ Template.hangoutActionBar.events({
// console.log(content);
//console.log(editor_content.html());

Modal.show('editHangoutModal', {hangout});
$('#edit-hangout-modal #topic').val(hangout.data.topic);
Modal.show("editHangoutModal", { hangout });
$("#edit-hangout-modal input#external-checkbox").prop(
"checked",
hangout.data.externalCheckbox
);
$("#edit-hangout-modal #externalButtonText").val(
hangout.data.externalButtonText
);
$("#edit-hangout-modal #externalURL").val(hangout.data.externalURL);
$("#edit-hangout-modal #topic").val(hangout.data.topic);
// $('#edit-hangout-modal #description').val(hangout.data.description);
// templateInstance.editor.setContents(hangout.data.description);
$('#edit-hangout-modal input[value=' + hangout.data.type + ']').prop("checked", true);
$('#edit-hangout-modal #start-date-time').val(start_time_reverted);
$('#edit-hangout-modal #end-date-time').val(hangoutDuration);
$('#edit-hangout-modal #group').val(hangout.data.group.title);
$("#edit-hangout-modal input[value=" + hangout.data.type + "]").prop(
"checked",
true
);
$("#edit-hangout-modal #start-date-time").val(start_time_reverted);
$("#edit-hangout-modal #end-date-time").val(hangoutDuration);
$("#edit-hangout-modal #group").val(hangout.data.group.title);
//console.log(start_time_reverted);
//console.log(end_time_reverted);

},
'click .delete-hangout': function(e, hangout) {

"click .delete-hangout": function(e, hangout) {
const data = {
hangoutId: this._id,
hostId: this.host.id,
hostUsername: this.host.name,
}

hostUsername: this.host.name
};

sweetAlert({
type: 'warning',
sweetAlert(
{
type: "warning",
title: TAPi18n.__("delete_hangout_confirm"),
text: TAPi18n.__("delete_hangout_text"),
cancelButtonText: TAPi18n.__("no_delete_hangout"),
confirmButtonText: TAPi18n.__("yes_delete_hangout"),
confirmButtonColor: "#d9534f",
showCancelButton: true,
closeOnConfirm: false,
closeOnConfirm: false
},
function() {
// disable confirm button to avoid double (or quick) clicking on confirm event
swal.disableButtons();
// if user confirmed/selected yes, let's call the delete hangout method on the server

Meteor.call('deleteHangout', data, function(error, result) {
Meteor.call("deleteHangout", data, function(error, result) {
if (result) {
swal("Poof!", "Your hangout has been successfully deleted!", "success");
swal(
"Poof!",
"Your hangout has been successfully deleted!",
"success"
);
} else {
swal("Oops something went wrong!", error.error + "\n Try again", "error");
swal(
"Oops something went wrong!",
error.error + "\n Try again",
"error"
);
}
});
}); //sweetAlert
},


}
); //sweetAlert
}
});

0 comments on commit d8b29cf

Please sign in to comment.