search

sscpac / chat-locker

Have your own Slack like online chat, built with Meteor and enhanced security.
MIT License
8 stars 2 forks source link

Upstream merge #72

Closed rwakida closed 9 years ago

bbrockman commented 9 years ago

I'm concerned about this commit 'Always set oldest user as admin when no admins are found.', but I can't find where in the code they do this.

rwakida commented 9 years ago

https://github.com/RocketChat/Rocket.Chat/search?utf8=%E2%9C%93&q=set+oldest

rwakida commented 9 years ago

good catch. That would be....bad

bbrockman commented 9 years ago

Why does this not come across in the diff files? initialData.coffee isn't in the upstream-merge diff.

rwakida commented 9 years ago

I removed the set oldest user as admin code.

bbrockman commented 9 years ago

That still bothers me that it didn't show up in the diff. Do you know why?

rwakida commented 9 years ago

not sure. I can't see the initialData, but can see the v12 changes.

how are you viewing the diff? The github ui says there are too many diffs to show and initialData doesn't appear.

bbrockman commented 9 years ago

Am I crazy. I don't see the v12.coffee file in the "Files Changed" tab. Also searched for oldest (after reading through the files manually).

bbrockman commented 9 years ago

Oh damn. I missed "Sorry, we could not display the entire diff because too many files (562) changed." at the top of the page. Even missed it when I read your message. I have selective reading!

rwakida commented 9 years ago

:smile: me too

rwakida commented 9 years ago

Maybe it's something I did when merging upstream. Git still confuses me at times.

douglasrapp commented 9 years ago

I've noticed 2 things:

1) The left side nav no longer "slides" in. Rather, it just suddenly appears. This isn't our issue, though - I took a look at the actual Rocket Chat demo page, and the same thing happens there. Unfortunate that the animation is broken. I can't speak to what broke it.

2) When I first started the app and opened the page, when I tried to create a new direct message or private group, nothing happened, but the left nav area kind of 'froze'. I had to refresh the page, and then I could successfully bring up the dialog to create the new conversation. I can only seem to replicate the error if I log out and log in as a different user that I haven't used before. Also, when it happens, I get the following in the console:

Exception from Tracker recompute function: Error: $in needs an array

berkich commented 9 years ago

I noticed that if you click on My Account then change Avatar the right panel shows the avatar selections. Then click the up arrow next to My Account the left panel shows the channels, direct messages, private groups... etc. Click on any of the plus signs (such as create a direct message) and the left panel goes back to 'My Account' This happens with the profile selection also.

douglasrapp commented 9 years ago

I think this is ready. :+1:

rwakida commented 9 years ago

Fixes #71