Code

Feature/chat locker 6#9

Code

Merged

douglasrapp merged 10 commits intomastersscpac/chat-locker:masterfrom feature/chat-locker-6sscpac/chat-locker:feature/chat-locker-6Copy head branch name to clipboardJul 17, 2015

+290-5

Commits

Commits on Jul 16, 2015

• Modified 'room' template to display a banner

  Show description for e3fda68
  

  Douglas Rapp

  committed
  e3fda68

  Copy full SHA for e3fda68

• Merge branch 'master' into feature/chat-locker-6

  

  Douglas Rapp

  committed
  41397d6

  Copy full SHA for 41397d6

• Converted js to coffeescript

  

  Douglas Rapp

  committed
  e347465

  Copy full SHA for e347465

• Fixed obtaining system country code setting

  

  Douglas Rapp

  committed
  da1a639

  Copy full SHA for da1a639

• Removed default permission. Now return empty list if none found.

  

  Douglas Rapp

  committed
  a71aa08

  Copy full SHA for a71aa08

Commits on Jul 17, 2015

• Merge branch 'master' into feature/chat-locker-6

  

  Douglas Rapp

  committed
  e12566e

  Copy full SHA for e12566e

• Alternate css for security-banner

  rwakida

  committed
  67364fd

  Copy full SHA for 67364fd

• Use jquery to get actual height instead of hard 26

  

  Douglas Rapp

  committed
  4b6e17a

  Copy full SHA for 4b6e17a

• Merge pull request #10 from sscpac/feature/chat-locker-6.1

  Show description for 24fdb81
  

  Douglas Rapp

  committed
  24fdb81

  Copy full SHA for 24fdb81

• Variables for classification colors

  

  Douglas Rapp

  committed
  14ab971

  Copy full SHA for 14ab971