Code

Authorを記述#46

Code

Merged

Highmt merged 123 commits intomastershortintern2020-A-labyrinth/TeamA:masterfrom developshortintern2020-A-labyrinth/TeamA:developCopy head branch name to clipboardAug 30, 2020

+2,564-382

Commits

Commits on Aug 24, 2020

• postgresqlの環境構築

  Highmt

  committed
  7a7b3e3

  Copy full SHA for 7a7b3e3

• Merge pull request #3 from shortintern2020-A-labyrinth/postgre_setting

  Show description for a94fe32
  Highmt

  authored
  a94fe32

  Copy full SHA for a94fe32

• ignore初期作成

  Highmt

  committed
  260157d

  Copy full SHA for 260157d

• ディレクトリ追加

  

  Masahito-I

  committed
  d41dab3

  Copy full SHA for d41dab3

• Merge pull request #8 from shortintern2020-A-labyrinth/masahito

  Show description for 63500a2
  Highmt

  authored
  63500a2

  Copy full SHA for 63500a2

• append twitter4j pom.xml

  nawta

  committed
  bcfac2c

  Copy full SHA for bcfac2c

• DDL作成

  Highmt

  committed
  0087791

  Copy full SHA for 0087791

• merge develop

  nawta

  committed
  4c89d12

  Copy full SHA for 4c89d12

• revise pom.xml

  nawta

  committed
  daa9366

  Copy full SHA for daa9366

• gitignore 修正

  Highmt

  committed
  ce25ab9

  Copy full SHA for ce25ab9

• create DB コンフリクト解消

  Highmt

  committed
  3e5fd22

  Copy full SHA for 3e5fd22

• Merge pull request #9 from shortintern2020-A-labyrinth/createTable

  Show description for aee0b17
  Highmt

  authored
  aee0b17

  Copy full SHA for aee0b17

• commit

  

  Masahito-I

  committed
  b4a3a7c

  Copy full SHA for b4a3a7c

• Merge branch 'develop' of https://github.com/shortintern2020-A-labyrinth/TeamA into masahito

  Show description for e89ec8a
  

  Masahito-I

  committed
  e89ec8a

  Copy full SHA for e89ec8a

• solved dependencies

  nawta

  committed
  43c1973

  Copy full SHA for 43c1973

• connection with twitter confirmed

  nawta

  committed
  9a43a68

  Copy full SHA for 9a43a68

• implemented search tweets of specific user

  nawta

  committed
  3fdaed8

  Copy full SHA for 3fdaed8

• updated gitignore

  nawta

  committed
  dd98e65

  Copy full SHA for dd98e65

• succeed

  

  Nakamura Tsukasa

  authored and

  Nakamura Tsukasa

  committed
  64c86b7

  Copy full SHA for 64c86b7

• merged develop branch

  nawta

  committed
  4fa65bb

  Copy full SHA for 4fa65bb

• Merge pull request #10 from shortintern2020-A-labyrinth/feature/request_twitter

  Show description for 92696d3
  nawta

  authored
  92696d3

  Copy full SHA for 92696d3

• append

  nawta

  committed
  691a417

  Copy full SHA for 691a417

• Merge pull request #12 from shortintern2020-A-labyrinth/feature/append_properties

  Show description for a492c44
  nawta

  authored
  a492c44

  Copy full SHA for a492c44

Commits on Aug 25, 2020

• resolved conflict

  

  Nakamura Tsukasa

  authored and

  Nakamura Tsukasa

  committed
  da8624d

  Copy full SHA for da8624d

• Merge branch 'develop' of https://github.com/shortintern2020-A-labyrinth/TeamA into tsukasa

  tsukasa2

  committed
  c7bb96f

  Copy full SHA for c7bb96f

• sorry

  nawta

  committed
  5a77b58

  Copy full SHA for 5a77b58

• watsonAPIを用いた自然言語カテゴリ抽出実装

  Show description for fcda51f
  Highmt

  committed
  fcda51f

  Copy full SHA for fcda51f

• Merge pull request #14 from shortintern2020-A-labyrinth/watsonNLU

  Show description for 2b18bcb
  Highmt

  authored
  2b18bcb

  Copy full SHA for 2b18bcb

• no message

  tsukasa2

  committed
  3900a29

  Copy full SHA for 3900a29

• Merge branch 'develop' of https://github.com/shortintern2020-A-labyrinth/TeamA into tsukasa

  tsukasa2

  committed
  460a559

  Copy full SHA for 460a559

• classify monozu

  tsukasa2

  committed
  7066f5d

  Copy full SHA for 7066f5d

• classify local image

  tsukasa2

  committed
  7edbd04

  Copy full SHA for 7edbd04

• select a class

  tsukasa2

  committed
  181748e

  Copy full SHA for 181748e

• delete unnecessary code

  tsukasa2

  committed
  2c60fed

  Copy full SHA for 2c60fed

• Controller forward

  nawta

  committed
  ebedaea

  Copy full SHA for ebedaea

• Merge pull request #18 from shortintern2020-A-labyrinth/tsukasa

  Show description for f0acae8
  Highmt

  authored
  f0acae8

  Copy full SHA for f0acae8

• made a draft of collect_NLU method

  nawta

  committed
  22a5293

  Copy full SHA for 22a5293

• merge develop

  nawta

  committed
  206d5f0

  Copy full SHA for 206d5f0

• created collect_NLU_keywords_from_tweets function

  nawta

  committed
  1a603ce

  Copy full SHA for 1a603ce

• rename function name to

  nawta

  committed
  18be1f4

  Copy full SHA for 18be1f4

• 必要ファイル作成

  Highmt

  committed
  6545688

  Copy full SHA for 6545688

• connected

  nawta

  committed
  e8af509

  Copy full SHA for e8af509

• Merge pull request #19 from shortintern2020-A-labyrinth/feature/connection_twitterAPI_NLPAPI

  Show description for ff262a5
  nawta

  authored
  ff262a5

  Copy full SHA for ff262a5

• img_url

  tsukasa2

  committed
  8cb4333

  Copy full SHA for 8cb4333

• Merge branch 'develop' of https://github.com/shortintern2020-A-labyrinth/TeamA into tsukasa

  tsukasa2

  committed
  1f0210c

  Copy full SHA for 1f0210c

• uraaa

  nawta

  committed
  af46817

  Copy full SHA for af46817

• 出力形式の記述

  nawta

  committed
  2d23f4a

  Copy full SHA for 2d23f4a

• Merge pull request #20 from shortintern2020-A-labyrinth/feature/Twitter_to_image

  Show description for c38de63
  nawta

  authored
  c38de63

  Copy full SHA for c38de63

• 画面デザインの修正、ごり押しのデータベースアクセスによるデータ取得とその表示

  

  Masahito-I

  committed
  0fa45bc

  Copy full SHA for 0fa45bc

Commits on Aug 26, 2020

• テンプレートを作成

  Highmt

  committed
  162a021

  Copy full SHA for 162a021

• Merge branch 'develop' into MVCtemplate

  Highmt

  authored
  7184f15

  Copy full SHA for 7184f15

• Merge pull request #25 from shortintern2020-A-labyrinth/MVCtemplate

  Show description for a51b513
  Highmt

  authored
  a51b513

  Copy full SHA for a51b513

• コンフリクト解消ミス修正

  Highmt

  committed
  9a2ae9f

  Copy full SHA for 9a2ae9f

• resolved conflict

  tsukasa2

  committed
  39e69e0

  Copy full SHA for 39e69e0

• Merge branch 'develop' of https://github.com/shortintern2020-A-labyrinth/TeamA into tsukasa

  tsukasa2

  committed
  f3eb656

  Copy full SHA for f3eb656

• add html

  nawta

  committed
  be15a79

  Copy full SHA for be15a79

• Merge pull request #27 from shortintern2020-A-labyrinth/feature/thymeleaf_request

  Show description for a43c8cc
  nawta

  authored
  a43c8cc

  Copy full SHA for a43c8cc

• add thymeleaf ref, few dependencies

  nawta

  committed
  18f4c5e

  Copy full SHA for 18f4c5e

• Merge pull request #28 from shortintern2020-A-labyrinth/feature/thymeleaf_request

  Show description for ccc056a
  nawta

  authored
  ccc056a

  Copy full SHA for ccc056a

• convert emoji

  tsukasa2

  committed
  ff1ccbd

  Copy full SHA for ff1ccbd

• emologlist バックエンド側処理完成

  Highmt

  committed
  95ce973

  Copy full SHA for 95ce973

• no message

  Highmt

  committed
  23c2cd9

  Copy full SHA for 23c2cd9

• Merge branch 'develop' into backend_model

  Highmt

  authored
  e51e756

  Copy full SHA for e51e756

• Merge pull request #29 from shortintern2020-A-labyrinth/backend_model

  Show description for d863e74
  Highmt

  authored
  d863e74

  Copy full SHA for d863e74

• add friendlist.html, modified dir path

  nawta

  committed
  6275522

  Copy full SHA for 6275522

• merged develop

  nawta

  committed
  40e519b

  Copy full SHA for 40e519b

• fix bugs on SQL query

  nawta

  committed
  e57e998

  Copy full SHA for e57e998

• wowowo

  nawta

  committed
  8b8eb91

  Copy full SHA for 8b8eb91

• #23

  Show description for 4f9a620
  Highmt

  committed
  4f9a620

  Copy full SHA for 4f9a620

• #23

  Show description for 6b3f67e
  Highmt

  committed
  6b3f67e

  Copy full SHA for 6b3f67e

• Merge pull request #30 from shortintern2020-A-labyrinth/feature/backend_friendlist

  Show description for fa3fdb6
  Highmt

  authored
  fa3fdb6

  Copy full SHA for fa3fdb6

• comprehensive plans on script

  nawta

  committed
  da79a7a

  Copy full SHA for da79a7a

• insertEmolog

  tsukasa2

  committed
  18abc6d

  Copy full SHA for 18abc6d

• 志半ばにて

  nawta

  committed
  dc5b600

  Copy full SHA for dc5b600

• merged develop

  nawta

  committed
  72e1bf8

  Copy full SHA for 72e1bf8

• add explanations

  nawta

  committed
  6344587

  Copy full SHA for 6344587

• Merge pull request #33 from shortintern2020-A-labyrinth/feature/thymeleaf_request

  Show description for d03f25d
  nawta

  authored
  d03f25d

  Copy full SHA for d03f25d

• insertEmolog

  tsukasa2

  committed
  668bc01

  Copy full SHA for 668bc01

• Merge branch 'develop' into masahito

  Show description for 11e325f
  

  Masahito-I

  committed
  11e325f

  Copy full SHA for 11e325f

• Merge branch 'develop' into masahito

  Show description for 579e58c
  

  Masahito-I

  committed
  579e58c

  Copy full SHA for 579e58c

• Merge branch 'develop' into tsukasa

  Show description for dc443b3
  Highmt

  committed
  dc443b3

  Copy full SHA for dc443b3

• no message

  Highmt

  committed
  fa9bb6d

  Copy full SHA for fa9bb6d

• Merge pull request #35 from shortintern2020-A-labyrinth/tsukasa

  Show description for d27f4d3
  Highmt

  authored
  d27f4d3

  Copy full SHA for d27f4d3

• Merge branch 'develop' of https://github.com/shortintern2020-A-labyrinth/TeamA into masahito

  Show description for cc7d758
  

  Masahito-I

  committed
  cc7d758

  Copy full SHA for cc7d758

• insert test data to each table

  tsukasa2

  committed
  fbdbef0

  Copy full SHA for fbdbef0

• Revert "insert test data to each table"

  Show description for bab6bdb
  tsukasa2

  committed
  bab6bdb

  Copy full SHA for bab6bdb

• Merge pull request #36 from shortintern2020-A-labyrinth/testcase

  Show description for 6379c64
  Highmt

  authored
  6379c64

  Copy full SHA for 6379c64

• Merge branch 'develop' of https://github.com/shortintern2020-A-labyrinth/TeamA into masahito

  

  Masahito-I

  committed
  d57c799

  Copy full SHA for d57c799

• 1-createTable

  tsukasa2

  committed
  1239d32

  Copy full SHA for 1239d32

• chat.html

  

  Masahito-I

  committed
  e1fe2ef

  Copy full SHA for e1fe2ef

• friend.html,emologlist.html,chat.htmlを表示させるている

  

  Masahito-I

  committed
  b344393

  Copy full SHA for b344393

• Merge branch 'develop' into testcase

  Highmt

  authored
  50fb24e

  Copy full SHA for 50fb24e

• Merge pull request #38 from shortintern2020-A-labyrinth/testcase

  Show description for 74f0e21
  Highmt

  authored
  74f0e21

  Copy full SHA for 74f0e21

• Merge branch 'develop' into masahito

  Highmt

  authored
  3253a92

  Copy full SHA for 3253a92

• Merge pull request #39 from shortintern2020-A-labyrinth/masahito

  Show description for 5b031d5
  Highmt

  authored
  5b031d5

  Copy full SHA for 5b031d5

• latestemolog > contents

  tsukasa2

  committed
  2056bf0

  Copy full SHA for 2056bf0

• no message

  Highmt

  committed
  d953abd

  Copy full SHA for d953abd

• Emologをinsertできるようにした

  Highmt

  committed
  8608fcb

  Copy full SHA for 8608fcb

• commonにツイッター情報からEmoLogを生成する関数群を持ったクラスを生成

  Highmt

  committed
  7118525

  Copy full SHA for 7118525

Commits on Aug 27, 2020

• twitter系の関数まとめファイル

  Highmt

  committed
  f0045cf

  Copy full SHA for f0045cf

• twitter.propertiesを修正

  Highmt

  committed
  c07b109

  Copy full SHA for c07b109

• チャット画面のバックエンド実装

  Highmt

  committed
  92b261c

  Copy full SHA for 92b261c

• chat.html とemologlist.htmlを動くようにしているはずです

  

  Masahito-I

  committed
  222fecf

  Copy full SHA for 222fecf

• Merge pull request #40 from shortintern2020-A-labyrinth/chat_func

  Show description for a818529
  Masahito-I

  authored
  a818529

  Copy full SHA for a818529

• バッチ処理に部分を実装

  Show description for f279c99
  Highmt

  committed
  f279c99

  Copy full SHA for f279c99

• EmologListにフレンドの名前を渡す処理実装

  Show description for 2029cf7
  Highmt

  committed
  2029cf7

  Copy full SHA for 2029cf7

• Merge branch 'develop' into feature/backend/emolog_add

  Highmt

  authored
  1f27d6c

  Copy full SHA for 1f27d6c

• Merge pull request #42 from shortintern2020-A-labyrinth/feature/backend/emolog_add

  Show description for c3286ce
  Highmt

  authored
  c3286ce

  Copy full SHA for c3286ce

• serviceのコミット漏れをプッシュ

  Highmt

  committed
  eb4e714

  Copy full SHA for eb4e714

• created enter method

  nawta

  committed
  6b24052

  Copy full SHA for 6b24052

• テーブルスキーマ変更前

  nawta

  committed
  0629c83

  Copy full SHA for 0629c83

• batch non existence problem

  nawta

  committed
  a6b601e

  Copy full SHA for a6b601e

Commits on Aug 28, 2020

• append author comments

  nawta

  committed
  2cf63ea

  Copy full SHA for 2cf63ea

• author/nakamura_part

  tsukasa2

  committed
  96749ca

  Copy full SHA for 96749ca

• author/nakamura_part

  tsukasa2

  committed
  1437222

  Copy full SHA for 1437222

• Merge pull request #43 from shortintern2020-A-labyrinth/author/nakamura_part

  Show description for 777b246
  tsukasa2

  authored
  777b246

  Copy full SHA for 777b246

• append author comment, corrected sensitive words, append previous implementation on crawling method

  nawta

  committed
  d6f6133

  Copy full SHA for d6f6133

• add comments

  nawta

  committed
  c4ff5dc

  Copy full SHA for c4ff5dc

• Merge pull request #44 from shortintern2020-A-labyrinth/author/nishidanaoto_part

  Show description for 472588f
  nawta

  authored
  472588f

  Copy full SHA for 472588f

• 最後一応プッシュ

  Highmt

  committed
  2841e3a

  Copy full SHA for 2841e3a

• Merge branch 'develop' of github.com:shortintern2020-A-labyrinth/TeamA into develop

  Show description for 1521bbe
  Highmt

  committed
  1521bbe

  Copy full SHA for 1521bbe

Commits on Aug 29, 2020

• 高山のAuthorを記述

  Highmt

  committed
  307dae2

  Copy full SHA for 307dae2

• Merge pull request #45 from shortintern2020-A-labyrinth/author/takayama_part

  Show description for 531b725
  Highmt

  authored
  531b725

  Copy full SHA for 531b725