Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 2021-12-09 08:39:55 #3662

Merged
merged 75 commits into from
Dec 13, 2021
Merged

Release 2021-12-09 08:39:55 #3662

merged 75 commits into from
Dec 13, 2021

Commits on Nov 25, 2021

  1. アイコンが長方形画像のユーザーを追加

    @taka61
    taka61 committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    892b00e View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2021

  1. js-shortcut-post-commentをaに置き換えた 

    「command + enter」を実行した際、shortcut.jsを経由してjs-shortcut-post-commentが呼ばれている。
しかし、「コメントする」ボタンよりも前に「コメントをもっと見る」ボタンがjs-shortcut-post-commentを参照していた。
そのため過去のコメントが再投稿されたように表示されていた（実際には何も投稿されていない）。
    @yoshitaku-jp
    yoshitaku-jp committed Nov 27, 2021
    Configuration menu
    Copy the full SHA
    e4ec043 View commit details
    Browse the repository at this point in the history

  2. テストで指定する部分も修正

    @yoshitaku-jp
    yoshitaku-jp committed Nov 27, 2021
    Configuration menu
    Copy the full SHA
    e190095 View commit details
    Browse the repository at this point in the history

  3. シャープのIDが要らなかったので削除

    @yoshitaku-jp
    yoshitaku-jp committed Nov 27, 2021
    Configuration menu
    Copy the full SHA
    37fcea9 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2021

  1. 日報が0件の時の表示を変更

    @taka61
    taka61 committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    bf4180c View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2021

  1. Railsで直近の日報を表示する

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    4d87c84 View commit details
    Browse the repository at this point in the history

  2. showアクションメソッドの追加

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    eeb8a4c View commit details
    Browse the repository at this point in the history

  3. 不要なインスタンス変数を削除

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    a2ad218 View commit details
    Browse the repository at this point in the history

  4. ルーティングの追加

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    8c96298 View commit details
    Browse the repository at this point in the history

  5. モジュールの追加

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    52e5706 View commit details
    Browse the repository at this point in the history

  6. jbuilderを使ってJSON形式のデータの取得

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    00d7963 View commit details
    Browse the repository at this point in the history

  7. Vue.jsでその人の直近数個の日報を表示

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    40bd49d View commit details
    Browse the repository at this point in the history

  8. 👮

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    1b0abbd View commit details
    Browse the repository at this point in the history

  9. 日報横の直近の日報にデザイン

    @machida
    machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    e1209fb View commit details
    Browse the repository at this point in the history

  10. 不要な?を削除

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    5ad4a39 View commit details
    Browse the repository at this point in the history

  11. CurrentChangeの取り込み忘れを直した

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    c91c442 View commit details
    Browse the repository at this point in the history

  12. 日報詳細の表示のずれを少し修正

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    d065756 View commit details
    Browse the repository at this point in the history

  13. APIのURLの変更に伴う修正

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    3191764 View commit details
    Browse the repository at this point in the history

  14. rubocop適用

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    ea61c82 View commit details
    Browse the repository at this point in the history

  15. 提出物と同じような見た目にするために修正

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    108370d View commit details
    Browse the repository at this point in the history

  16. 日報個別ページを2カラムにした

    @machida
    machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    28655de View commit details
    Browse the repository at this point in the history

  17. 不要なコメントを削除

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    6899732 View commit details
    Browse the repository at this point in the history

  18. リファクタリング

    @harukus @machida
    harukus authored and machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    39e08de View commit details
    Browse the repository at this point in the history

  19. 2カラム画面のデザイン調整

    @machida
    machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    048d92d View commit details
    Browse the repository at this point in the history

  20. デザイン変更に伴うテスト変更

    @machida
    machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    e2d7a1d View commit details
    Browse the repository at this point in the history

  21. 日報一覧の操作アイコンのifがなかったのを入れた

    @machida
    machida committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    7478d95 View commit details
    Browse the repository at this point in the history

  22. long_nameに変更

    @yoshitaku-jp
    yoshitaku-jp committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    e2eff43 View commit details
    Browse the repository at this point in the history

  23. long_nameに変更

    @yoshitaku-jp
    yoshitaku-jp committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    248b263 View commit details
    Browse the repository at this point in the history

  24. APIの戻り値としてHTMLをエスケープしないように変更 

    文字列が短縮されるケースでは`truncate`の中で問答無用でエスケープされてしまっていたため。
`ActionView::Helpers::TextHelper#truncate`の`:escape`オプションを利用して、いかなる場合でもHTMLがエスケープされないようにする。
    @IkumaTadokoro
    IkumaTadokoro committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    b2b5fca View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2021

  1. 管理者ではないメンターのテストユーザーの追加

    @ShotaTsuru
    ShotaTsuru committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    839ba5c View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2021

  1. コンフリクトを解消しました

    @taka61
    taka61 committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    a8d0e85 View commit details
    Browse the repository at this point in the history

  2. お知らせメールのフッターの年が動的に今年の年になるように変更

    @naomichi-h
    naomichi-h committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    0708c2f View commit details
    Browse the repository at this point in the history

  3. 余計な改行を削除

    @naomichi-h
    naomichi-h committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    7dfd655 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2021

  1. HTMLメール内のemojiのデザイン崩れを修正

    @machida
    machida committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    c61dc9c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3661 from fjordllc/emoji-mail 

    HTMLメール内のemojiのデザイン崩れを修正
    @machida
    machida committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    7cdda48 View commit details
    Browse the repository at this point in the history

  3. 年の動的な取得をlメソッドを使用して実装するように変更

    @naomichi-h
    naomichi-h committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    25e2d05 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3635 from fjordllc/feature/change_display_of_repo… 

    …rts_when_no_reports

「日報の絞り込み」時、該当プラクティスの日報が0のときの表示を変更しました
    @komagata
    komagata committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    4bcca71 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3118 from fjordllc/feature/display-recent-reports 

    日報個別ページにその人の直近数個の日報を表示する（Vue.jsで）
    @komagata
    komagata committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    8913025 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3643 from fjordllc/bug/fix-report-title-escape 

    日報一覧と最新の日報一覧のHTML特殊文字をエスケープしないように変更
    @komagata
    komagata committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    d5d50f8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #3629 from fjordllc/bug/use-shortcuts-post-past-co… 

    …mments

日報のコメントにてcommand + enterで投稿できず、過去のコメントが増えてしまう問題の修正
    @komagata
    komagata committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    45e4b9e View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3644 from fjordllc/feature/display-username-on-qu… 

    …estion-listpage

Q&A一覧ページにユーザー名を表示する
    @komagata
    komagata committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    cac2eb5 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #3602 from fjordllc/feature/add_a_mentor_non-admin… 

    …istrative_user

管理者ではないメンターのテストユーザーを追加
    @komagata
    komagata committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    ddcf5bb View commit details
    Browse the repository at this point in the history

  10. Merge pull request #3645 from fjordllc/feature/display-username-on-qu… 

    …estion-showpage

Q&A個別ページに質問者のIDとユーザー名を表示する
    @komagata
    komagata committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    b859471 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2021

  1. 管理画面の企業一覧にあるDescriptionを削除

    @R-Tsukada
    R-Tsukada committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    dd745f9 View commit details
    Browse the repository at this point in the history

  2. 再びコンフリクトを解消

    @taka61
    taka61 committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    32f9942 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3622 from fjordllc/feature/add_user_with_rectangu… 

    …lar_icon_in_test_data

テストデータにアイコンが長方形のユーザーを追加
    @komagata
    komagata committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    c7bf732 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3656 from fjordllc/feature/change_display_year_in… 

    …_footer_of_notification_email

お知らせメールのフッターの年が動的に今年の年になるように変更 #3637
    @komagata
    komagata committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    d80cc9e View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2021

  1. テストデータにアイコンが小さい画像のユーザーを追加

    @nga20167304
    nga20167304 committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    bf5d3fe View commit details
    Browse the repository at this point in the history

  2. 添付の画像の名前を変更する

    @nga20167304
    nga20167304 committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    e8d170e View commit details
    Browse the repository at this point in the history

  3. 誤って削除した部分を再追加

    @nga20167304
    nga20167304 committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    f5f6d50 View commit details
    Browse the repository at this point in the history

  4. testを実行するとcassetteが更新される問題を修正

    @komagata
    komagata committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    d15096c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3669 from fjordllc/bug/wrong-cassettes 

    testを実行するとcassetteが更新される問題を修正
    @komagata
    komagata committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    53d3e27 View commit details
    Browse the repository at this point in the history

  6. サブスクステータスの表示を非同期化

    @komagata
    komagata committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    7663ffe View commit details
    Browse the repository at this point in the history

  7. サブスクのテスト追加

    @komagata
    komagata committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    a0c987e View commit details
    Browse the repository at this point in the history

  8. cassetteが更新される問題を修正

    @komagata
    komagata committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    90219ba View commit details
    Browse the repository at this point in the history

  9. Merge pull request #3444 from fjordllc/bug/subscription-status 

    サブスクステータスの表示を非同期化
    @komagata
    komagata committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    900ce60 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2021

  1. 自分の担当の数値を変更

    @taka61
    taka61 committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    8c562ee View commit details
    Browse the repository at this point in the history

  2. メンターダッシュボード、確認数の集計 へのリンクを削除

    @unstoppa61e
    unstoppa61e committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    20a4a40 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3660 from fjordllc/feature/add_user_small_icon_in… 

    …_test_data

テストデータにアイコンが小さい画像のユーザーを追加
    @komagata
    komagata committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    abcb59b View commit details
    Browse the repository at this point in the history

  4. アドバイザー、メンター、卒業生のタブを表示

    @yoshitaku-jp
    yoshitaku-jp committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    fc1f909 View commit details
    Browse the repository at this point in the history

  5. 大名エンジニアカレッジのデータに卒業生、メンター、アドバイザーを追加

    @yoshitaku-jp
    yoshitaku-jp committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    09c76c2 View commit details
    Browse the repository at this point in the history

  6. Bump bootsnap 

    Ruby 3.0 にアップデートするために bootsnap 1.9.3 にアップデートする

ref: `Shopify/bootsnap#378
    @ima1zumi
    ima1zumi committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    bb92737 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2021

  1. adminとメンターの権限を整理した

    @machida
    machida committed Dec 7, 2021
    Configuration menu
    Copy the full SHA
    2bb7d10 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2021

  1. Merge pull request #3683 from fjordllc/organize_authority 

    adminとメンターの権限を整理した
    @machida
    machida committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    01d2542 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3677 from fjordllc/bump-bootsnap 

    Bump bootsnap
    @komagata
    komagata committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    407f40b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3673 from fjordllc/feature/delete_links_in_mentor… 

    …_menu

メンターダッシュボード、確認数の集計 へのリンクを削除
    @komagata
    komagata committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    957717b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3672 from fjordllc/bug/fix_number_of_my_charge_on… 

    …_submissions

[メンター向け]提出物の「自分の担当」タブのカッコの中の数字では「確認済の提出物」は含めない
    @komagata
    komagata committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    7b732da View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3678 from fjordllc/feature/display-categories-in-… 

    …userslist-by-company

企業別のユーザー一覧で「卒業生」「アドバイザー」「メンター」のタブを表示
    @komagata
    komagata committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    47c86a6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3665 from fjordllc/hotfix/remove-company-description 

    管理画面の企業一覧にあるDescriptionを削除
    @komagata
    komagata committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    5b1ac04 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2021

  1. 折返し設定を追加

    @machida
    machida committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    028570c View commit details
    Browse the repository at this point in the history

  2. メールの中の絵文字の扱いを修正

    @machida
    machida committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    8ff9611 View commit details
    Browse the repository at this point in the history

  3. マメに保存の文字数を減らした

    @machida
    machida committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    69039be View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3718 from fjordllc/css-fix-mail 

    折返し設定を追加
    @machida
    machida committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    1e4ec92 View commit details
    Browse the repository at this point in the history

  5. HTMLの構造を修正

    @machida
    machida committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    5c5f5ad View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3725 from fjordllc/fix-notifications-dom 

    HTMLの構造を修正
    @machida
    machida committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    ec9b9d9 View commit details
    Browse the repository at this point in the history