Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 024_release with master #222

Merged
merged 11 commits into from Mar 11, 2013
Merged

Merge 024_release with master #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
60453ba
Update backbone and underscore
thedjpetersen Dec 27, 2012
d2f4073
Syntax cleanup
thedjpetersen Jan 7, 2013
fba2825
Use mainline node-irc
thedjpetersen Jan 11, 2013
8c6751a
Autocomplete on nicks (tabbing) does not break, loops on first nick
eirikb Jan 20, 2013
8a18a6e
Minus console.log
eirikb Jan 20, 2013
ef37ec6
Merge pull request #202 from eirikb/024_release
thedjpetersen Jan 21, 2013
29c846d
Don't show unread-label on open (active) channel/chat
eirikb Jan 21, 2013
419b6ee
fixes #151 Updated ICanHaz.js with mustache version 0.3.0 to ICanHaz.…
eirikb Jan 21, 2013
67c1d75
Merge pull request #204 from eirikb/issue-151
thedjpetersen Jan 21, 2013
9d5aaba
Merge pull request #203 from eirikb/unread-suggestion
thedjpetersen Feb 4, 2013
8de7881
Merged master with 024_release
eirikb Mar 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion assets/js/client.js
View file
Open in desktop
Expand Up @@ -285,7 +285,9 @@ $(function() {
});

irc.socket.on('netError', function(data) {
irc.appView.showError('Invalid server');
if(!$('.alert-error').length) {
irc.appView.showError('Invalid server');
}
});

irc.socket.on('login_error', function(data) {
Expand Down
20 changes: 11 additions & 9 deletions assets/js/libs/ICanHaz.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.