clusterman

• 

  Yan Zhao 27 Jun 2018 fd0b08b0d9048f75af7670eb90410944ae2ea419

  merge

  • app/controllers/ApplicationController.scala (version fd0b08b0d9048f75af7670eb90410944ae2ea419) (diffs)
• 

  Yan Zhao 27 Jun 2018 639732d7ede0b570d1559ea86778e79ccf524559

  Merge remote-tracking branch 'origin/bdbox' into feature/list-files-from-box-folder
  # Conflicts:
  #        app/controllers/ApplicationController.scala
• 

  Yan Zhao 27 Jun 2018 2cee636c30b1a16856928b7f9e681afd037c3f7b m

  use Content Explorer for connect box

  • app/controllers/ApplicationController.scala (version 2cee636c30b1a16856928b7f9e681afd037c3f7b) (diffs)
  • app/views/connectToBox.scala.html (version 2cee636c30b1a16856928b7f9e681afd037c3f7b) (diffs)
  • app/views/main.scala.html (version 2cee636c30b1a16856928b7f9e681afd037c3f7b) (diffs)
  • conf/application.conf (version 2cee636c30b1a16856928b7f9e681afd037c3f7b) (diffs)
  • public/images/providers/box.png (version 2cee636c30b1a16856928b7f9e681afd037c3f7b) (diffs)
• 

  Yan Zhao 26 Jun 2018 27ad3f4ba6333a2e4e6a494142615f9c37d70554 m

  list files from box folder

  • app/controllers/ApplicationController.scala (version 27ad3f4ba6333a2e4e6a494142615f9c37d70554) (diffs)
  • app/views/connectToBox.scala.html (version 27ad3f4ba6333a2e4e6a494142615f9c37d70554) (diffs)