Code

Upstream merge#582

Code

Closed

rwakida wants to merge 172 commits intoRocketChat:masterRocketChat/Rocket.Chat:masterfrom sscpac:upstream-mergesscpac/chat-locker:upstream-mergeCopy head branch name to clipboard

+5,843-381

Commits

Commits on Jul 15, 2015

• Copy old code that authenticates/loads user data from LDAP into Meteor.

  Show description for 1b2fcbe
  

  Reid Wakida

  authored and

  Reid Wakida

  committed
  1b2fcbe

  Copy full SHA for 1b2fcbe

Commits on Jul 16, 2015

• Add users to GENERAL channel by default.

  Show description for 3e2bc39
  rwakida

  committed
  3e2bc39

  Copy full SHA for 3e2bc39

• Fix bug where user information overwritten by ldap values on restart and

  Show description for d40385b
  rwakida

  committed
  d40385b

  Copy full SHA for d40385b

• Merge pull request #2 from sscpac/feature/JEDIS-598

  Show description for 3ddb8d0
  rwakida

  committed
  3ddb8d0

  Copy full SHA for 3ddb8d0

• 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

• Updates made for using chat-locker name.

  bbrockman

  committed
  6a20b5a

  Copy full SHA for 6a20b5a

• initial update for chat-locker name.

  bbrockman

  committed
  276126e

  Copy full SHA for 276126e

• Fixed type on about urls.

  bbrockman

  committed
  ae7e1a7

  Copy full SHA for ae7e1a7

• Added update for coverage status.

  bbrockman

  committed
  54218bc

  Copy full SHA for 54218bc

• Added code climate.

  bbrockman

  committed
  7023d74

  Copy full SHA for 7023d74

• Updating travis to use their new platform.

  bbrockman

  committed
  f39516c

  Copy full SHA for f39516c

• installing istanbul code coverage for travis.

  bbrockman

  committed
  d0a51cc

  Copy full SHA for d0a51cc

• Fixed type for missing single quote in before_script

  bbrockman

  committed
  778c67a

  Copy full SHA for 778c67a

• Added coveralls for nodejs

  bbrockman

  committed
  6e632e7

  Copy full SHA for 6e632e7

• debugging build

  bbrockman

  committed
  c1ef223

  Copy full SHA for c1ef223

• debugging travis.

  bbrockman

  committed
  3b92bf1

  Copy full SHA for 3b92bf1

• going back to default travis. Couldn't get the extra travis coverage tools to work.

  bbrockman

  committed
  5e096db

  Copy full SHA for 5e096db

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

  

  Douglas Rapp

  committed
  e12566e

  Copy full SHA for e12566e

• correct url for code climate.

  bbrockman

  committed
  270ad71

  Copy full SHA for 270ad71

• update to use code climate platform

  bbrockman

  committed
  9dcbb55

  Copy full SHA for 9dcbb55

• moved code climate settings into correct file and deleted one that was added with improper name.

  bbrockman

  committed
  af4fa19

  Copy full SHA for af4fa19

• 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

• Merge pull request #9 from sscpac/feature/chat-locker-6

  Show description for 8dd5d1f
  

  Douglas Rapp

  committed
  8dd5d1f

  Copy full SHA for 8dd5d1f

• Test commit to get git to use my email address for commit tracking

  

  Douglas Rapp

  committed
  9f3b45f

  Copy full SHA for 9f3b45f

Commits on Jul 21, 2015

• Merge remote-tracking branch 'upstream/master'

  rwakida

  committed
  7b5e7c3

  Copy full SHA for 7b5e7c3

• - Added 'getAllowedConversationPermissions' method

  Show description for a961c64
  

  Douglas Rapp

  committed
  a961c64

  Copy full SHA for a961c64

• Putting in logic to display the label selector. Still in need of debugging getting an unknown error

  berkich

  committed
  ed87b91

  Copy full SHA for ed87b91

Commits on Jul 22, 2015

• Integrated labeling in the createChannelFlex. Initial functionality working

  berkich

  committed
  94352fa

  Copy full SHA for 94352fa

Commits on Jul 23, 2015

• Fix #4. Integrate MAC restrictions (backend) into

  Show description for d167985
  rwakida

  committed
  d167985

  Copy full SHA for d167985

• Got the chosen drop downs to work.

  Show description for bfda80d
  berkich

  committed
  bfda80d

  Copy full SHA for bfda80d

• Passed the permissions to the create direct message and private group server funtions

  berkich

  committed
  3a74231

  Copy full SHA for 3a74231

Commits on Jul 25, 2015

• Fix #14. user search not returning users.

  Show description for c2d17ba
  rwakida

  committed
  c2d17ba

  Copy full SHA for c2d17ba

Commits on Jul 28, 2015

• Fix ssscpac/chat-locker#14. Update ldap import to set name field using

  Show description for ae3df35
  rwakida

  committed
  ae3df35

  Copy full SHA for ae3df35

• Partial implementation of relabeling. Still needs work

  berkich

  committed
  9129666

  Copy full SHA for 9129666

• Forgot to add changes to chatRoomItem to the previous commit

  berkich

  committed
  d2e65ff

  Copy full SHA for d2e65ff

• Modified SideNav to always recreate/rerender the template when opened

  Show description for 29b727f
  

  Douglas Rapp

  committed
  29b727f

  Copy full SHA for 29b727f

• Relabeling updates

  Show description for 09f0100
  berkich

  committed
  09f0100

  Copy full SHA for 09f0100

• Adjusted the private group display

  berkich

  committed
  cf09e77

  Copy full SHA for cf09e77

• A few minor display updates

  berkich

  committed
  caa957b

  Copy full SHA for caa957b

Commits on Jul 29, 2015

• Fix #4. Add relabelRoom Meteor method.

  rwakida

  committed
  e78cdba

  Copy full SHA for e78cdba

• Merge pull request #16 from sscpac/bugfix/chat-locker-14

  Show description for 8f87101
  rwakida

  committed
  8f87101

  Copy full SHA for 8f87101

• A few minor display updates

  Show description for 5159aea
  berkich

  committed
  5159aea

  Copy full SHA for 5159aea

• Removed use of "Relabel_room" session variable in favor of setting data context when flex template set

  

  Douglas Rapp

  committed
  56b0b1a

  Copy full SHA for 56b0b1a

• Update README.md

  Show description for 17638f1
  bbrockman

  committed
  17638f1

  Copy full SHA for 17638f1

• Update README.md

  bbrockman

  committed
  6ec611a

  Copy full SHA for 6ec611a

• Added roomUpdate method

  Show description for a250345
  berkich

  committed
  a250345

  Copy full SHA for a250345

• Fixed issue where subscription data not immediately available to populate room fields on relabel

  

  Douglas Rapp

  committed
  41c5160

  Copy full SHA for 41c5160

• Merge branch 'chat-locker-3' of https://github.com/sscpac/chat-locker into chat-locker-3

  

  Douglas Rapp

  committed
  1e95f02

  Copy full SHA for 1e95f02

• Fixed updateRoom bug

  berkich

  committed
  8d9cfb0

  Copy full SHA for 8d9cfb0

• Merge remote-tracking branch 'origin/chat-locker-3' into chat-locker-3

  berkich

  committed
  7374c87

  Copy full SHA for 7374c87

• Fix #4 Add MAC check when adding user to private group.

  rwakida

  committed
  33054f4

  Copy full SHA for 33054f4

• Applied subscription data fix to direct messages.

  Show description for 13b7b48
  

  Douglas Rapp

  committed
  13b7b48

  Copy full SHA for 13b7b48

• Remove default accessPermissions used for testing.

  rwakida

  committed
  7b81ca6

  Copy full SHA for 7b81ca6

• Merge branch 'chat-locker-3' of https://github.com/sscpac/chat-locker into chat-locker-3

  

  Douglas Rapp

  committed
  27171f2

  Copy full SHA for 27171f2

• Merge pull request #12 from sscpac/feature/chat-locker-4

  Show description for 6deba1c
  rwakida

  committed
  6deba1c

  Copy full SHA for 6deba1c

Commits on Jul 30, 2015

• Merge branch 'master' into chat-locker-3

  rwakida

  committed
  11bc06a

  Copy full SHA for 11bc06a

• #3. Throw duplicate name error if the user attempts to

  Show description for 49c907c
  rwakida

  committed
  49c907c

  Copy full SHA for 49c907c

• Add div around security labels so that it doesn't cover any error

  Show description for feb5ac6
  rwakida

  committed
  feb5ac6

  Copy full SHA for feb5ac6

• Remove autorun code that subscribed and retrieved room based on passed in

  Show description for 78e7df1
  rwakida

  committed
  78e7df1

  Copy full SHA for 78e7df1

• Updated added member to display username instead of fullname for

  Show description for c1e2927
  rwakida

  committed
  c1e2927

  Copy full SHA for c1e2927

• Update error message from create to participate to be more specific

  rwakida

  committed
  bfbb6dd

  Copy full SHA for bfbb6dd

• Publish AccessPermissions to client

  rwakida

  committed
  516f71a

  Copy full SHA for 516f71a

• Validate parameters, and:

  Show description for 135e453
  rwakida

  committed
  135e453

  Copy full SHA for 135e453

• Modify available access permission logic. The current user can select any permissions assigned to

  Show description for 107170a
  rwakida

  committed
  107170a

  Copy full SHA for 107170a

• Re-applied subscription updates to private groups to make sure can pull label data even if user hasn't 'entered' room yet

  

  Douglas Rapp

  committed
  27543be

  Copy full SHA for 27543be

• Fixed direct message update problems

  berkich

  committed
  aae1bf8

  Copy full SHA for aae1bf8

• Fixed bug where SCI/SAP/RELTO labels couldn't be added unless classification also changed

  

  Douglas Rapp

  committed
  c81a455

  Copy full SHA for c81a455

• Applied logic from labeling/relabeling in private groups to direct messages

  Show description for 85faae5
  

  Douglas Rapp

  committed
  85faae5

  Copy full SHA for 85faae5

Commits on Jul 31, 2015

• Modify right flex tab to open left side nav when starting a direct message

  Show description for bac7228
  rwakida

  committed
  bac7228

  Copy full SHA for bac7228

• Update security label error message to match logic. Update css class to

  Show description for 83cb754
  rwakida

  committed
  83cb754

  Copy full SHA for 83cb754

Commits on Aug 1, 2015

• Add div around security label template so error messages aren't hidden

  rwakida

  committed
  10b9a17

  Copy full SHA for 10b9a17

• Modify to display pop-out error when adding user to a room returns an

  Show description for abc0e4c
  rwakida

  committed
  abc0e4c

  Copy full SHA for abc0e4c

• Remove label room icon from sidenav for channels.

  rwakida

  committed
  ebb43c0

  Copy full SHA for ebb43c0

• Modify room label options logic for create/update direct message and

  Show description for 4f0aa8f
  rwakida

  committed
  4f0aa8f

  Copy full SHA for 4f0aa8f

Commits on Aug 2, 2015

• Merge pull request #18 from sscpac/chat-locker-3

  Show description for 65c42db
  rwakida

  committed
  65c42db

  Copy full SHA for 65c42db

Commits on Aug 3, 2015

• Fixed click event for the banner and added the cursor pointer to the banner

  berkich

  committed
  a9ab735

  Copy full SHA for a9ab735

• Update README.md

  bbrockman

  committed
  50eb95a

  Copy full SHA for 50eb95a

Commits on Aug 4, 2015

• Removed home page after you log in to not include social app and pictures.

  bbrockman

  committed
  11862ed

  Copy full SHA for 11862ed

• Merge remote-tracking branch 'upstream/master' into upstream-merge

  Show description for 25bc07a
  rwakida

  committed
  25bc07a

  Copy full SHA for 25bc07a

• Updated the ChatSubscription query so that it does not check the favorites field

  berkich

  committed
  61e0d16

  Copy full SHA for 61e0d16

• Merge remote-tracking branch 'upstream/master' into upstream-merge

  Show description for 607f19a
  rwakida

  committed
  607f19a

  Copy full SHA for 607f19a

• Fixed thrown no method error for resize method due to incorrect method

  Show description for 8611abb
  rwakida

  committed
  8611abb

  Copy full SHA for 8611abb

• Removed debug statement

  rwakida

  committed
  1b253a8

  Copy full SHA for 1b253a8

• Merge pull request #37 from sscpac/feature/chat-locker-36

  Show description for af20ddc
  bbrockman

  committed
  af20ddc

  Copy full SHA for af20ddc

• Channels are no longer removed from original list when added to favorites

  berkich

  committed
  55967ed

  Copy full SHA for 55967ed

• Merge pull request #35 from sscpac/chat-locker-19

  Show description for 4972eae
  berkich

  committed
  4972eae

  Copy full SHA for 4972eae

Commits on Aug 5, 2015

• Added Kadira Debug

  Show description for f0b4cae
  bbrockman

  committed
  f0b4cae

  Copy full SHA for f0b4cae

• Initial commit

  berkich

  committed
  aab2a70

  Copy full SHA for aab2a70

• Modified "AccessPermission" class to also return ids causing access failure

  Show description for b1afa75
  

  Douglas Rapp

  committed
  b1afa75

  Copy full SHA for b1afa75

• Whitespace

  

  Douglas Rapp

  committed
  860a7b2

  Copy full SHA for 860a7b2

Commits on Aug 6, 2015

• Merge remote-tracking branch 'upstream/master' into upstream-merge

  Show description for 7417c9e
  rwakida

  committed
  7417c9e

  Copy full SHA for 7417c9e

• Added status-{{status}} to paragraph that displayed username in Member List.

  Show description for febf5da
  bbrockman

  committed
  febf5da

  Copy full SHA for febf5da

• Modify privateGroupFlex and directMessageFlex to listen for changes to

  Show description for 829b946
  rwakida

  committed
  829b946

  Copy full SHA for 829b946

• Merge branch 'upstream-merge-fix-security-labels' into upstream-merge

  rwakida

  committed
  b937ac2

  Copy full SHA for b937ac2

• Merge remote-tracking branch 'upstream/master' into upstream-merge

  Show description for 0d18b54
  rwakida

  committed
  0d18b54

  Copy full SHA for 0d18b54

• Getting functionality to work. Needs UI work and debugging

  berkich

  committed
  acec994

  Copy full SHA for acec994

Commits on Aug 7, 2015

• Merge branch 'upstream-merge'

  Show description for f39bde1
  rwakida

  committed
  f39bde1

  Copy full SHA for f39bde1

Commits on Aug 8, 2015

• Fixed #13. Error thrown for unncessary reason.

  Show description for 8b4ca30
  rwakida

  committed
  8b4ca30

  Copy full SHA for 8b4ca30

Commits on Aug 10, 2015

• Initial version. Creates Channel for all locations and sets 'testadmin'

  Show description for 62e3ddb
  rwakida

  committed
  62e3ddb

  Copy full SHA for 62e3ddb

• Updated to reflect Reid's suggestions on the pull request: /pull/40.

  Show description for b3258f6
  bbrockman

  committed
  b3258f6

  Copy full SHA for b3258f6

Commits on Aug 11, 2015

• Fixed issue where not including RELTO labels in an access check always resulted in failure.

  Show description for ea45e08
  

  Douglas Rapp

  committed
  ea45e08

  Copy full SHA for ea45e08

• Removed unneeded code

  Show description for a5572ab
  

  Douglas Rapp

  committed
  a5572ab

  Copy full SHA for a5572ab

• Added simple style for warning of permission clashes

  

  Douglas Rapp

  committed
  98fb2a7

  Copy full SHA for 98fb2a7

• Added functionality to detect specific permission conflicts when labeling a room

  Show description for 9d149cc
  

  Douglas Rapp

  committed
  9d149cc

  Copy full SHA for 9d149cc

• Add deafult access permissions upon Channel creation.

  Show description for a7a4403
  rwakida

  committed
  a7a4403

  Copy full SHA for a7a4403

• Merge remote-tracking branch 'origin/master' into feature/chat-locker-30

  

  Douglas Rapp

  committed
  53973ab

  Copy full SHA for 53973ab

• Removed unnecessary logging code

  Show description for 2a6ec52
  

  Douglas Rapp

  committed
  2a6ec52

  Copy full SHA for 2a6ec52

• Fixed current user being added to selected users

  Show description for 64942c8
  

  Douglas Rapp

  committed
  64942c8

  Copy full SHA for 64942c8

• Modify location Channel to be open by default for the newly added user.

  rwakida

  committed
  6b0cbb7

  Copy full SHA for 6b0cbb7

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

  Show description for a8f7f5b
  bbrockman

  committed
  a8f7f5b

  Copy full SHA for a8f7f5b

Commits on Aug 12, 2015

• Banner fixes and update to channel default permissions

  Show description for ce6f356
  rwakida

  committed
  ce6f356

  Copy full SHA for ce6f356

• Modify how association between user and location channel is made.

  Show description for 1abef4a
  rwakida

  committed
  1abef4a

  Copy full SHA for 1abef4a

• Updated onlineUsers to allUsers for rooms because we want to see everyone in the room

  Show description for 07e70e9
  bbrockman

  committed
  07e70e9

  Copy full SHA for 07e70e9

• Ready for testing

  berkich

  committed
  ac63f35

  Copy full SHA for ac63f35

• Removed logging

  bbrockman

  committed
  c0dafee

  Copy full SHA for c0dafee

• Added comment to not add additional fields to be returned with the publication because it now returns all users.

  bbrockman

  committed
  32c5bdb

  Copy full SHA for 32c5bdb

• Fixed Indenting error! Thanks Coffee!

  bbrockman

  committed
  e30749b

  Copy full SHA for e30749b

• Put status text in header title

  Show description for 89b6a69
  berkich

  committed
  89b6a69

  Copy full SHA for 89b6a69

• Show status and custome message in the user details

  berkich

  committed
  d888c7c

  Copy full SHA for d888c7c

Commits on Aug 13, 2015

• Merge branch 'bugfix/chat-locker-13'

  rwakida

  committed
  642daca

  Copy full SHA for 642daca

• Merge branch 'feature/chat-locker-24'

  rwakida

  committed
  1011e46

  Copy full SHA for 1011e46

• Wait for General room to exist before adding users to it. The general

  Show description for bafbbdb
  rwakida

  committed
  bafbbdb

  Copy full SHA for bafbbdb

• Merge branch 'feature/chat-locker-24'

  rwakida

  committed
  ca1b7a1

  Copy full SHA for ca1b7a1

• Add default access permissions when creating location channel.

  rwakida

  committed
  ee682d2

  Copy full SHA for ee682d2

• Add status and statusConnection fields to imported LDAP user.

  Show description for d68a9aa
  rwakida

  committed
  d68a9aa

  Copy full SHA for d68a9aa

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

  Show description for f034000
  javawebdeveloper

  committed
  f034000

  Copy full SHA for f034000

• Merge pull request #42 from sscpac/feature/chat-locker-15

  Show description for 27389c4
  bbrockman

  committed
  27389c4

  Copy full SHA for 27389c4

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

  Show description for 10ef911
  javawebdeveloper

  committed
  10ef911

  Copy full SHA for 10ef911

• Added status and custom message to the user detail right panel

  berkich

  committed
  1e18bbf

  Copy full SHA for 1e18bbf

• Merge remote-tracking branch 'origin/master' into feature/chat-locker-32

  Show description for 8b6ac9a
  bbrockman

  committed
  8b6ac9a

  Copy full SHA for 8b6ac9a

• Fixed issue where flex template sometimes didn't get created/rendered

  

  Douglas Rapp

  committed
  1580ca8

  Copy full SHA for 1580ca8

• Updated to latest versions.

  bbrockman

  committed
  836b51c

  Copy full SHA for 836b51c

• Streamlined the logic for determining if entry needs styling

  Show description for 502a139
  

  Douglas Rapp

  committed
  502a139

  Copy full SHA for 502a139

• Updated logic for creating/relabeling

  Show description for ffcfb45
  

  Douglas Rapp

  committed
  ffcfb45

  Copy full SHA for ffcfb45

• Fixed missing semicolon

  bbrockman

  committed
  43fbf71

  Copy full SHA for 43fbf71

• Removed 'warnLabelIds' and 'warnUserIds' session variables in favor of ReactiveVars

  Show description for 9301191
  

  Douglas Rapp

  committed
  9301191

  Copy full SHA for 9301191

• Merge pull request #40 from sscpac/feature/chat-locker-32

  Show description for 2f106fb
  bbrockman

  committed
  2f106fb

  Copy full SHA for 2f106fb

• Merge remote-tracking branch 'origin/master' into feature/chat-locker-30

  

  Douglas Rapp

  committed
  984ade0

  Copy full SHA for 984ade0

• Fixed typo in error message

  Show description for fe563a6
  

  Douglas Rapp

  committed
  fe563a6

  Copy full SHA for fe563a6

Commits on Aug 14, 2015

• Merge branch 'chat-locker-31'

  Show description for e0d52e8
  rwakida

  committed
  e0d52e8

  Copy full SHA for e0d52e8

• Merge pull request #50 from sscpac/bugfix/chat-locker-48

  Show description for 3316838
  rwakida

  committed
  3316838

  Copy full SHA for 3316838

• Change wherever username is displayed to use name field instead.

  rwakida

  committed
  9f5f1d1

  Copy full SHA for 9f5f1d1

• All users should belong to the "general" channel and their location

  Show description for 9472846
  rwakida

  committed
  9472846

  Copy full SHA for 9472846

• Fixed problem with setStatusMessage updating the profile

  berkich

  committed
  e768a95

  Copy full SHA for e768a95

• Merge pull request #58 from sscpac/bugfix/chat-locker-57

  Show description for b6ea2d0
  bbrockman

  committed
  b6ea2d0

  Copy full SHA for b6ea2d0

• Fixed grammar errors

  

  Douglas Rapp

  committed
  cd7f559

  Copy full SHA for cd7f559

• Merged master

  Show description for 8573036
  berkich

  committed
  8573036

  Copy full SHA for 8573036

• Included custom messages for "busy" status

  berkich

  committed
  795625e

  Copy full SHA for 795625e

• Merge pull request #55 from sscpac/feature/chat-locker-30

  Show description for 6232f5e
  bbrockman

  committed
  6232f5e

  Copy full SHA for 6232f5e

• Adds comment to clarify what selectedUserName helper method returns.

  rwakida

  committed
  5160c7a

  Copy full SHA for 5160c7a

• Merge branch 'master' into bugfix/chat-locker-17

  Show description for d4594e2
  rwakida

  committed
  d4594e2

  Copy full SHA for d4594e2

Commits on Aug 15, 2015

• Replaces username with name for system messages, user status (top of

  Show description for d292f19
  rwakida

  committed
  d292f19

  Copy full SHA for d292f19

Commits on Aug 17, 2015

• Merge remote-tracking branch 'origin/master'

  berkich

  committed
  3b1238b

  Copy full SHA for 3b1238b

Commits on Aug 18, 2015

• Update comment

  rwakida

  committed
  d676e08

  Copy full SHA for d676e08

• Makes security banner unclickable when viewing channel.

  Show description for bec7371
  rwakida

  committed
  bec7371

  Copy full SHA for bec7371

• Merge branch 'master' into bugfix/chat-locker-17

  Show description for d46cd90
  rwakida

  committed
  d46cd90

  Copy full SHA for d46cd90

• Merge branch 'bugfix/chat-locker-17'

  rwakida

  committed
  93f60c0

  Copy full SHA for 93f60c0

Commits on Aug 20, 2015

• Updated privateGroupsFlex and userSearch templates

  Show description for 4e00ed0
  

  Douglas Rapp

  committed
  4e00ed0

  Copy full SHA for 4e00ed0

Commits on Aug 22, 2015

• Upstream merge

  rwakida

  committed
  1a19b6f

  Copy full SHA for 1a19b6f

Commits on Aug 24, 2015

• Merge pull request #66 from sscpac/bugfix/chat-locker-62

  Show description for 7bfeb68
  

  Douglas Rapp

  committed
  7bfeb68

  Copy full SHA for 7bfeb68

• Remove debug statement.

  rwakida

  committed
  93d5448

  Copy full SHA for 93d5448

Commits on Aug 25, 2015

• Merge remote-tracking branch 'upstream/master' into upstream-merge

  Show description for 2cd4de8
  rwakida

  committed
  2cd4de8

  Copy full SHA for 2cd4de8

• Merge branch 'master' into upstream-merge

  rwakida

  committed
  0f2fadb

  Copy full SHA for 0f2fadb

• Upstream removed style.css. Our modifications where unused.

  rwakida

  committed
  e23cfac

  Copy full SHA for e23cfac

• Handle case where statistic is undefined. Same as RocketChat RocketChat#581.

  rwakida

  committed
  5efb55a

  Copy full SHA for 5efb55a