This repository has been archived by the owner on Dec 1, 2021. It is now read-only.

CHANGELOG

[v1.1]

b13494f Merge pull request #139 from gabceb/master (James Gifford)
18df9fc Removing all references of cloudfuji profile icon from js templates (Gabriel Cebrian)
ff10fba Update CONTRIBUTING.md (Tony Guntharp)
7e441b0 Merge pull request #130 from jrgifford/updating-rails-for-security-patchs (Gabriel Cebrian)
f68abe1 Updated rails to fix security holes. (James Gifford)
5690a56 Merge pull request #129 from gabceb/kandan_128 (Tony Guntharp)
9d94081 Added check to make sure the # of rooms is respected when adding more rooms (Gabriel Cebrian)
b0c0669 Update CONTRIBUTING.md (Tony Guntharp)
d6ea111 Update CONTRIBUTING.md (Tony Guntharp)
e1cb85f Update CONTRIBUTING.md (Tony Guntharp)
6d0ae10 Update CONTRIBUTING.md (Tony Guntharp)
0da443c Merge pull request #116 from gabceb/kandan_113 (Don Thorp)
b367ccf Removed first and last name. Using full_name_or_username instead of full_name everywhere now (Gabriel Cebrian)
e03e9d9 Merge pull request #125 from donthorp/issue-119 (Tony Guntharp)
d6a3291 Merge branch 'master' into issue-119 (donthorp)
25cb0f7 Fixes #119. emoji with number underscore dash or plus ignored. (donthorp)
bf59ed7 Merge pull request #117 from gabceb/kandan_114 (Tony Guntharp)
10f87f6 Merge pull request #124 from fusion94/master-123 (Gabriel Cebrian)
b3fd34d Making Ruby happy (Gabriel Cebrian)
92f3ab1 Admin controller now uses suspend and activate methods (Gabriel Cebrian)
7adc29e Added more code to bootstrap task to deal with upgrade cases. (Gabriel Cebrian)
2b81b1c moved version string to git_revision Fixes #123 (Tony Guntharp)
bcf746c Merge pull request #121 from fusion94/master-120 (Gabriel Cebrian)
f490117 Adding Contributors to About page. Fixed #120 (Tony Guntharp)
f8b1a39 Status is now registration_status all over the app (Gabriel Cebrian)
138409d Merge pull request #118 from donthorp/rake-git-tasks (Tony Guntharp)
802d93e Add add_team_repos and prune_team_repos tasks to assist in PR handling (donthorp)
17a3a19 Merge pull request #115 from talltroym/fix-emoticon-typo (Tony Guntharp)
c5b055a Fix trigger text for happy fave graphic with equal sign and right parenthesis (Troy Murray)
6c1a1b0 Fixed typo on admin.'s location for recompilation (Gabriel Cebrian)
7896ffe Added default status for users. Closes #113 (Gabriel Cebrian)
d5fe480 Fix a typo that displayed a sad face graphic when a happy face emoticon was used (Troy Murray)
1009b71 don't ask... (Tony Guntharp)
bf322fe Merge pull request #112 from fusion94/master-110 (Don Thorp)
6c91ecc correcting a typo for xhtml compliance (Tony Guntharp)
c8a83ec Removed features from about messaging (Tony Guntharp)
90cb909 Adding Git SHA to about page as well as some new messaging. (Tony Guntharp)
7b57f80 Merge pull request #108 from gabceb/CanCanAdmin (Tony Guntharp)
4963b69 Small fixes from the code review (Gabriel Cebrian)
4c15ac8 Make sure approved users have an admin checkbox when they are approved (Gabriel Cebrian)
e0ed0fb Added ability to have add admins (Gabriel Cebrian)
9ac14de Small fixes (Gabriel Cebrian)
53339a7 Javascript to handle users finished. Added check to make sure approved users are not stuck on the approval page. Same for suspended (Gabriel Cebrian)
7b11928 Added a couple more messages to the bootstrap rake task (Gabriel Cebrian)
d33aed7 Added bootstrap to project. (Gabriel Cebrian)
00a1620 Keep bots away from the sites. (Gabriel Cebrian)
ad65897 Merge pull request #107 from donthorp/issue-106 (Tony Guntharp)
1d3f3e5 Fixes #106. =) shows wrong graphic (donthorp)
f875d9e Merge pull request #104 from donthorp/kandan-15 (Gabriel Cebrian)
ff66804 Extended emoticon plugin to support emoji for #15. Thanks to https://github.com/arvida/emoji-cheat-sheet.com for making this easy. (donthorp)
834fef9 Added some js and actions to update a user status (Gabriel Cebrian)
7e5c285 Moved default values of kandan settings to kandan config yaml file (Gabriel Cebrian)
101df98 Added simple approval and suspended pages. Added filters to redirect users depending on the status. Moved about page to the pages controller (Gabriel Cebrian)
ebb5f3f Initial implementation of admin console and site settings (Gabriel Cebrian)
fd01af1 Merge pull request #99 from gabceb/master (Tony Guntharp)
fe1124f Added all to mentions (Gabriel Cebrian)
4a1fa47 Merge pull request #97 from gabceb/master (Tony Guntharp)
ac22801 Trying to fix notification buttons AGAIN! (Gabriel Cebrian)
b961af3 Merge pull request #96 from gabceb/master (Tony Guntharp)
5fcd900 Addedd username to factory girl (Gabriel Cebrian)
1b1ec67 Merge pull request #95 from gabceb/master-70 (Tony Guntharp)
6c0ece5 Added uniqueness and presence for user's username (Gabriel Cebrian)
459acb9 Room names added as unique. An error is now showed if an error occurred while creating a room. Updated backbone and underscore to latest versions (Gabriel Cebrian)
9c07e55 Merge pull request #92 from gabceb/master (Tony Guntharp)
a7eb71e Moved css from layout to application.css.sass (Gabriel Cebrian)
99365b6 Merge pull request #91 from gabceb/master (Tony Guntharp)
fa1af63 Merge branch 'master' of https://github.com/kandanapp/kandan (Gabriel Cebrian)
0d7eb34 Added mentions and at who plugin (Gabriel Cebrian)
52b233c Merge pull request #90 from gabceb/kanda-24 (Tony Guntharp)
a986430 Added notifications pane. (Gabriel Cebrian)
f52250d Merge pull request #89 from SpencerCooley/master (Tony Guntharp)
97baf5a Merge branch 'master' of https://github.com/kandanapp/kandan (Spencer)
623ff1b auto scroll is working on initial load and tab switch (Spencer)
8a0c6f6 Merge pull request #88 from skypanther/master (Tony Guntharp)
025dca9 Added AppFog installation instructions (Tim Poulsen)
026807e Merge pull request #84 from gabceb/master (Tony Guntharp)
08cdef3 Merge pull request #83 from gabceb/kandan-82 (Tony Guntharp)
bf0f81d Added logger to development env for Thin server (Gabriel Cebrian)
35e30a3 Added dummy deleted user to be used when a message associated with a user that has been deleted is shown (Gabriel Cebrian)
b2053b7 Merge pull request #80 from gabceb/master (Tony Guntharp)
1e6a668 Fixed references to some emoticons. Added GTFO emoticon image (Gabriel Cebrian)
7cf6f98 Merge pull request #74 from gabceb/master (Tony Guntharp)
a8b1392 Updated file drop to latest version work with latest jquery where live is deprecated (Gabriel Cebrian)
e23bb66 Merge pull request #73 from gabceb/master (Tony Guntharp)
5eb73d9 Removed unnecessary dummy thumb url (Gabriel Cebrian)
a351bdd Added vimeo plugin (Gabriel Cebrian)
b194115 Merge pull request #71 from gabceb/master (Tony Guntharp)
ed48045 Merge branch 'master' of https://github.com/kandanapp/kandan (Gabriel Cebrian)
61dc435 Added real emoticons to emoticons plugin. (Gabriel Cebrian)
3019dd2 Merge pull request #68 from sergii/cleanup_actions (James Gifford)
5f81fb8 Updated rails so we don't get bitten by the JSON bug. CVE-2013-0276 CVE-2013-0277 (James Gifford)
9231078 Updated rails so we don't get bitten by the JSON bug. (James Gifford)
aa2ffdd Clean up actions (Sergii Ponomarov)
688b52a Merge pull request #67 from SpencerCooley/master (Tony Guntharp)
30d8fd3 took out rb-readline, fixed autoscroll for client. Still needs autscroll on push event. (Spencer)
95bc6ee Merge branch 'master' of https://github.com/kandanapp/kandan (Spencer)
8738ad9 fixed the autoscroll problem (Spencer)
a0b07b5 Merge pull request #66 from SpencerCooley/master (James Gifford)
949d504 fixed all the weird spacing issues. (Spencer)
bd3dcd6 one more line (Spencer)
bf1c359 added one more line (Spencer)
0e486c2 added space at bottom of sass file to see if the \no new line thing would go away (Spencer)
0035d13 fixed that weird gap that shows when the chat area is scrolled all the way to the top (Spencer)
1269429 Merge branch 'master' of https://github.com/kandanapp/kandan (Spencer)
47ac582 fixed the global scroll (Spencer)
9ef4b26 Create gen-changelog.sh (Tony Guntharp)
a8d8212 Merge pull request #65 from mguinada/fix-pastie (Tony Guntharp)
e5c584b Fix message sender pastie link (Miguel Guinada)
d555a07 Update CONTRIBUTING.md (Tony Guntharp)
5790912 Merge pull request #63 from gabceb/add_contributors_link_to_readme (James Gifford)
f900bee Added link to contributors of the Readme file (Gabriel Cebrian)
8eaf7a8 Merge pull request #62 from gabceb/add_left_margin_avatar (Tony Guntharp)
e484567 Added left margin to the avatar (Gabriel Cebrian)
ad4f8c5 Merge pull request #61 from gabceb/added_rgb_and_hex_color_plugin (James Gifford)
555f7e9 Added ability to have more than one hex or rgb on a message (Gabriel Cebrian)
e91e0cd Merge pull request #52 from gabceb/add_kandan_favicon (Tony Guntharp)
fe683a8 Renamed variables on hex plugin (Gabriel Cebrian)
6c0271f Merge pull request #60 from gabceb/add_DS_Store_to_git_ignore (Tony Guntharp)
606df32 Merge pull request #59 from magicmarkker/master (Tony Guntharp)
bcc6829 Added plugins to show hex and rgb colors when they are used on messages (Gabriel Cebrian)
4006ad2 better scrolling in chat rooms (Mark)
7d29af8 Added DS_Store to the .gitignore file (Gabriel Cebrian)
8f7f0f4 CSS fix for Password errors do strange things to the layout (Mark)
26da0df Merge pull request #58 from scotje/patch-1 (Tony Guntharp)
f0be264 Clarified self-hosted section of DEPLOY.md (Jesse Scott)
e963183 Added kandan favicon (Gabriel Cebrian)
0fe77ee Merge pull request #51 from Norrit/patch-1 (James Gifford)
2285ee0 Update DEPLOY.md (Norbert Schneider)
3ae40df Create CHANGELOG.md (Tony Guntharp)

[v1.0]

38f4875 Create CONTRIBUTING.md (Tony Guntharp)
605c237 Update README.md (Tony Guntharp)
c42c82b Update README.md (Tony Guntharp)
6c025a8 Update README.md (Tony Guntharp)
f5be2b4 Update README.md (Tony Guntharp)
fadff2d Merge pull request #43 from fusion94/master (James Gifford)
0646509 Correctly set channel and user in bootstrapped messages thanks to @madx Fixes #32 (Tony Guntharp)
46207f4 Merge pull request #41 from fusion94/master (James Gifford)
809cf7b biggish commit on style. Fixes #13 #34 #36 #37 (Tony Guntharp)
22a0816 Merge pull request #33 from kandanapp/update-paperclip (Tony Guntharp)
75c4666 Updating paperclip, stage uno (James Gifford)
8d4a9dd Merge pull request #30 from fusion94/master (James Gifford)
a39ddbc Moving from displaying email to displaying usernames, username is now required to register. Fixes #2 (Tony Guntharp)
ae3f5a3 Merge pull request #28 from amanelis/coverage (Tony Guntharp)
40d3df8 Added simplecov to spec helper (Alex Manelis)
c74d2ed Added coverage/ dir to gitignore (Alex Manelis)
dcb131f Added simplecov to Gemfile (Alex Manelis)
c6b9651 Update README.md (Tony Guntharp)
9bf68fa Merge pull request #27 from jrgifford/upgrade-sass (Tony Guntharp)
626cc2e updated to sass 3.2.5 (James Gifford)
f762ba4 Merge pull request #14 from jrgifford/local-installs (Tony Guntharp)
69bed6a Fixes #8 (James Gifford)
0c3e253 added not pushing public/system/* to .gitignore. also set default channel to be named lobby. fixed #9 (Tony Guntharp)
d112c8b Modified two things: - travis.yml - gemfile.lock to remove the dependency on git-based jasmine (James Gifford)
4d770f5 Merge pull request #5 from amanelis/spec-updates (James Gifford)
253a030 Fixes issue #6 (Tony Guntharp)
350dde9 Merge remote branch kandan/master (Alex Manelis)
7965928 ci-skip added build status to readme (James Gifford)
50e0e38 Added travis.yml. (James Gifford)
bf80a5e correcting typo on a URL in README (Tony Guntharp)
b453b72 adding links to UPDATE section of README (Tony Guntharp)
f529046 added an UPDATE section of the README (Tony Guntharp)
291884a updating links in README (Tony Guntharp)
3c47fcb oops a typo (Tony Guntharp)
dcb016e potential width fix (Tony Guntharp)
840525f width issues (Tony Guntharp)
d3131dd resolving file attachment issues (Tony Guntharp)
628138f Removed rails default images, all tests pass 💚 (Alex Manelis)
2ad13e5 Changed up when not authenticated (Alex Manelis)
5409535 Re wrote a few expects in model specs (Alex Manelis)
827cde1 Changed up the before blocks, calling methods to many times (Alex Manelis)
6c790fa Added faker gem for a few testing purposes (Alex Manelis)
c712a4f Line for intialize on precompile found twice (Alex Manelis)
6e6ec3b Don't need to require factory_girl (Alex Manelis)
89a59fa Added db cleaner to spec config (Alex Manelis)
987a39a Added db cleaner and a few other handy development gems (Alex Manelis)
452962e Whitespace (Alex Manelis)
a8a9442 Slight modification to how the api controller spec is structured (Alex Manelis)
4d81157 Removed rack-mini-profiler, decided wasn't worthy right now (Alex Manelis)
46fa134 More factory girl updates to deprication (Alex Manelis)
c572837 Updated factory deprication for next (Alex Manelis)
c94a8ee Added some better gems for development (Alex Manelis)
bc8e10d Was already using sqlite locally (Alex Manelis)
84ea429 Added rvmrc to the gitignore file (Alex Manelis)
000ea1f Merge pull request #36 from bielefeldt/master (Sean Grove)
dead52c README change with Heroku S3 integrations (response)
baa502c Update Readme (Kev Zettler)
ba2c630 Removed Cloudfuji references from readme (Kev Zettler)
5b8bb9b Merge pull request #34 from jrgifford/master (Kev Zettler)
5606ea4 ❤️ Guard, fixed specs to work with latest factory girl. (James Gifford)
6978925 Merge pull request #33 from jrgifford/master (Kev Zettler)
a1fd6f9 Updated rails to avoid ActionPack vuls. (James Gifford)

[v0.9]

9227519 correct SASS nesting for avatars (Kev Zettler)
2d6391d Merge pull request #26 from ndbroadbent/css_fixes (Kev Zettler)
5a135a1 Use max-width and max-height to contstrain images, instead of height and width attributes. Also increased size slightly. (Nathan Broadbent)
314a477 Updated .posted_at bg color to match .current_user bg. Also properly nested CSS classes. (Nathan Broadbent)
e84c1c2 Merge pull request #25 from MichaelEvans/master (Sean Grove)
ee1359c Updating the README (Sean Grove)
be27340 Merge branch 'master' of github.com:MichaelEvans/kandan (Michael Evans)
144aee5 posted messages now get the current_user class (Michael Evans)
dad5070 posted messages now get the current_user class (Michael Evans)
8ee8194 Update the README with links to the Hubot app (Sean Grove)
0056412 Updated the README to encourage local hacking (Sean Grove)
57eeced Bumps the faye disconnect to 30 seconds to prevent errant drops (Sean Grove)
0cccf3a Merge branch 'master' of github.com:cloudfuji/kandan (Sean Grove)
baf0fc7 Big update to enable Cloudfuji help (Sean Grove)
9e97c9e Merge pull request #18 from MichaelEvans/af47b5e22b386f5094813c16770d7bbdb4e1ea9f (Sean Grove)
8cee08f added style for a users own messages (Michael Evans)
af47b5e fixed logout link issue (Michael Evans)
b43bfe7 Add in default database.yml.sample, closes #15 (Sean Grove)
c259500 Merge pull request #16 from adrnai/master (Sean Grove)
3e1172f small typo (Adrián)
1d74a87 Constrain the height of file uploads widget and add overflow scrolling (Kev Zettler)
91ac5d5 Merge branch 'master' of github.com:cloudfuji/kandan (Sean Grove)
4df3dfa Use this instead of webrick to start rails on your own VPS (Sean Grove)
0621312 Adds Errbit integration (Sean Grove)
f9242f0 Merge pull request #13 from willrax/logout_fix (Kev Zettler)
dfce969 added in missing comma (Will)
605d12d changed logout link (Will)
d398089 proper mailing list link in readme (Kev Zettler)
3f2ae90 updated readme added link to kandan home (Kev Zettler)
c12d67e Use cloudfuji_paperclip with STS awareness (Sean Grove)
7577714 Notify user when dragging file over upload target (Sean Grove)
dc69109 Revert back to standard paperclip until bug is fixed in cloudfuji_paperclip (Sean Grove)
7c38556 Use 'cloudfuji-paperclip' for the STS support (Sean Grove)
72a3929 Pass activityAttributes to Kandan.Helpers.Utils.notifyInTitleIfRequired() (Sean Grove)
60d410b Log the message to the console before notifying (Sean Grove)
f2d1b16 Nicer bootstrap for rake cloudfuji:install, but at the cost of copy/paste (Sean Grove)
3d12bca Great renaming (Sean Grove)
cd2ff77 Touchup to the Cloud Foundry deploy instructions (Sean Grove)
f70e14e Link to Cloudfuji in the README (Sean Grove)
d48fbf1 Typo (Sean Grove)
870f013 Updates with Cloud Foundry install instructions (Sean Grove)
846661e Update the sqlite gem (Sean Grove)
5de9cc2 Merge pull request #12 from trisberg/master (Sean Grove)
1f01b9b Downgrading pg gem to 0.12.2 (Thomas Risberg)
fea4686 More updates to README (Sean Grove)
e8f88e7 Updates to the README (Sean Grove)
e88c0e4 Merge pull request #11 from Bushido/emoticon_polish (Kev Zettler)
49ac70c Merge branch 'master' into emoticon_polish (Sean Grove)
55f8ecd Merge branch 'master' of https://github.com/Bushido/kandan (Kev Zettler)
bc69ef5 Emoticons should be rendered with message template (Akash Manohar J)
6290306 Adds title to emoticons (Akash Manohar J)
9880f8f merged master (Kev Zettler)
f8f3f2f Merge pull request #9 from Bushido/prerelease-fixes (Kev Zettler)
2d4d784 Fixes the extra-line bug when a message is posted (Akash Manohar J)
1ef504f Checks for empty message by trim()ing the input (Akash Manohar J)
74285fd Fixes condition for adding message to channel (Akash Manohar J)
2f9ea7e Fixes local activity times (Akash Manohar J)
33e3fc0 Fakes faster messaging by clearing the textbox before saving the message (Akash Manohar J)
7110c83 Audio refactoring (Sean Grove)
880fc6d Only notify in the title or make a sound when a message happens in the channel we're in (Sean Grove)
cef9e87 Less console logging (Sean Grove)
979a1b9 Renamed cheer.mp3 => cheers.mp3 (Sean Grove)
ec0a297 Adds a few local sounds (Sean Grove)
c3c467d Polished audio (Sean Grove)
be19af7 Cleanup befor epushing for Akash (Sean Grove)
5545290 Prevent blank messages from being submitted (Sean Grove)
b4d40ef Handy-dandy super-dangerous unescape method in Kandan.Helpers.Utils (Sean Grove)
c886229 Skeleton of audio player in place (Sean Grove)
d7dac42 Fixes an emoticon and adds audio tags (Sean Grove)
eb68a15 Plays a ding for new messages when not focused (Sean Grove)
60af992 Adds emoticons (Sean Grove)
017af93 Merge pull request #4 from Bushido/emoticons (Kev Zettler)
5e2369d Slightly bigger emoticons (Sean Grove)
a9cf480 truestory is a png, not jpg (Sean Grove)
26440cc Added emoticons and logic (Sean Grove)
3584aba Fixing emoticon regex (Sean Grove)
6915765 Initial implementation of emoticons (Sean Grove)
13520aa Merge pull request #3 from Bushido/style_fix (Sean Grove)
c185893 Fixes link embed regex (Akash Manohar J)
8c3b7d4 Fixes youtube regex (Akash Manohar J)
b101d1e Fixes image regex (Akash Manohar J)
1a50dcc Fixes embed templates; escapes message content before passing it to plugins (Akash Manohar J)
a5ef905 Merge branch 'master' of github.com:Bushido/kandan into style_fix (Akash Manohar J)
868b4fb Tweaks to the Heroku install section (Sean Grove)
1025777 Merge branch 'master' of github.com:Bushido/kandan (Sean Grove)
c2cb394 Adds initial instructions for deploying (in development mode) to a vps (Sean Grove)
63fc1fa Merge branch 'master' of github.com:Bushido/kandan into style_fix (Akash Manohar J)
a373e32 Merge branch 'master' of github.com:Bushido/kandan (Kev Zettler)
a73b605 Updates to the Heroku section of the README to explain you need the gem and a pre-existing account (Sean Grove)
f53c6a8 fixes to grey header mask (Kev Zettler)
c2afda3 Removes the time_to_string helper method (Akash Manohar J)
0ed1646 Merges master and solves conflicts (Akash Manohar J)
e868f93 Minor refactor; Centralizes the options in js and adds relative times (Akash Manohar J)
58a8728 Fixed the random name method (Sean Grove)
ddfc5d2 Character doesn't come free (Sean Grove)
5bc4e02 Adding a bit of character (Sean Grove)
5f92e0b README updates to get Heroku deploy straight copy/paste (Sean Grove)
70a03ae Comment out the sqlite3 gem for Heroku compatibility by default (Sean Grove)
437b8e5 Tiny tweak to the link regex (Sean Grove)
e023eb8 Updated the README (Sean Grove)
e449b81 Merge branch 'master' of github.com:Bushido/kandan (Sean Grove)
36d5f77 Added preview image (Sean Grove)
d534fa5 postgres -> postgresql (Sean Grove)
887bc98 Added initial dotcloud.yml (Sean Grove)
5af582c Updated README (Sean Grove)
8d461a9 Added sqlite3 gem for local use (Sean Grove)
775b900 Added LICENSE (Sean Grove)
7f40649 Added a rake kandan:bootstrap task (Sean Grove)
0689f02 Merge branch 'master' of github.com:Bushido/Kandan (Kev Zettler)
2d2ca54 dom additions for proper scroll rendering (Kev Zettler)
e1c574a proper rendering for message scroll amazing amazing hacks (Kev Zettler)
cb14e84 Enhancements to the youtube embedder (Sean Grove)
6b0da89 Fix the youtube regex to be more flexible (Sean Grove)
7a9a93c Fall back to email when first name isn't present in the /me command (Sean Grove)
05c0fbe Use the escaped regex as a stopgap solution (Sean Grove)
70dd9e3 Use the extracted url for image embedding (Sean Grove)
32f05ec Updates the image embedding plugin (Sean Grove)
3c61952 Avoid double-escaping strings (Sean Grove)
ecb69f4 Merge branch 'master' of github.com:Bushido/Kandan (Sean Grove)
df9783e Escape incoming messages before any processes to avoid any malicious hijinks (Sean Grove)
75990f8 Restrict faye broadcast messages to only the necessary fields (Sean Grove)
43bb7aa Add user email to the initial load (Sean Grove)
d217418 Adds a bit of logging (Sean Grove)
89dc69c Merge pull request #2 from Bushido/heroku (Kev Zettler)
c98a63b Merge branch 'heroku' of github.com:Bushido/Kandan into heroku (Kev Zettler)
bd01552 Merge branch 'heroku' of github.com:Bushido/Kandan into heroku (Sean Grove)
c21ed2b Keep track of the unread activities for display in the browser tab (Sean Grove)
43365db Include current_user.email in the initial page render (Sean Grove)
f6661b1 Fallback to email for current user in upper-right-hand corner if first name is null (Sean Grove)
52efcc5 Simpler logic for first_name vs email in activity history (Sean Grove)
5886f62 Use email address in place of names when first name isn't present for activity listing (Sean Grove)
99e84b9 Defaults to user.email for the userlist plugin if user.first_name is not present (Sean Grove)
e42416c added min height for activity content (Kev Zettler)
5233691 Adds token_authenticatable back in as a standard devise module (Sean Grove)
ede5d03 Updates the standard Devise modules (off of Bushido) to match the database migrations (Sean Grove)
40d8add Require the configuration lib in application.rb since it's necessary for asset precompilation and we've disabled initialization for asset precompilation for Heroku compatibility (Sean Grove)
b324222 fixed delete channel on new channel bug (Kev Zettler)
30364e6 Disable rails initialization on asset precompilation for Heroku compatibility (Sean Grove)
e479f5a Use thin as websever via Procfile (Sean Grove)
f990b54 Merge pull request #1 from Bushido/fixes (Kev Zettler)
96c096d Data attribute channel_id is now channel-id (Akash Manohar J)
38b7377 Data attribute names should be dasherized (Akash Manohar J)
f468170 Fixes typos (Akash Manohar J)
28b660f Changes the casing in the Channels helper (Akash Manohar J)
295e1ee More casing changes (Akash Manohar J)
c0d0fab Fixes pastie (Akash Manohar J)
42e95cb Refactors code to follow github styleguide for javascript (Akash Manohar J)
3714ad2 Fixes the icon regex; Now displays the correct icons for audio and video extensions (Akash Manohar J)
76241e6 Indents the file item template (Akash Manohar J)
e6214f1 Minor refactor (Akash Manohar J)
2e05bd9 Sets max file size to 1000mb (Akash Manohar J)
eec8272 Removes logging (Akash Manohar J)
2fd9647 Fixes text casing (Akash Manohar J)
e16657c Adds attachment#upload event to faye and some minor refactor (Akash Manohar J)
b8c3e00 Adds events for attachments (Akash Manohar J)
41b5042 File dropzone should only be inited once. Uses the monkey patch to filedrop jquery plugin (Akash Manohar J)
d8d0d5e Monkey patches the jquery filedrop plugin to use url() as a function instead of a string (Akash Manohar J)
3ef00e0 Seperates publishing for messages and uploads (Akash Manohar J)
7b88b88 Fixes file size by setting it to 100mb. Adds messages for errors (Akash Manohar J)
c4baac9 Fixes active users (Akash Manohar J)
1de14a0 proper padding on message bottom (Kev Zettler)
07ae0c2 new tab styles (Kev Zettler)
44a8e7f ui tweaks to header (Kev Zettler)
a2a5ebc "fixing create and delete functionality again... " (Kev Zettler)
579a559 Removes the 'concerns' section from the readme. It's not relevant anymore (Akash Manohar J)
41670e7 Force a user active when added via a hook (Akash Manohar J)
360f6c3 Destroy the activities and attachments if the channel is destroyed (Akash Manohar J)
96f7d77 Fixes to update user on the fly (Akash Manohar J)
4d5cfa7 Enables user observer (Akash Manohar J)
b7be7d6 Merge branch 'master' of github.com:Bushido/Kandan (Akash Manohar J)
3cda94b Adds Bushido initializer (Akash Manohar J)
12cd906 fixes create tab. fixes logout menu scrolling bug (Kev Zettler)
6343d95 Adds notification in the windoe title if the window/tab is inactive (Akash Manohar J)
0cc5d17 Displays links in file upload notifications (Akash Manohar J)
d3f89ba Saves locale on bushido login (Akash Manohar J)
a74e794 Fixes pagination; Works again; Also respects pagination setting in the kandan settings file (Akash Manohar J)
285d2f2 Fixes typo in Gemfile (Akash Manohar J)
109eda1 Fixes, Fixes and Fixes. And then merges 'master' into 'tweaks' (Akash Manohar J)
7fc3f7a logout positioning (Kev Zettler)
3bdc720 live events for delete and create channel (Kev Zettler)
b6c3098 scroll fix wiht a mask (Kev Zettler)
241a1b0 proper border on right (Kev Zettler)
876fad7 create tabs work now (Kev Zettler)
2ee81a5 adde channels seems ok, need fix for the button (Kev Zettler)
3726429 deletes appear to be restored (Kev Zettler)
f2f81e2 partial delete (Kev Zettler)
d6da3f0 proper event attachment for close and create channels (Kev Zettler)
bf78300 scrolling back in action (Kev Zettler)
8f2e6cc duplicate template sync (Kev Zettler)
b53f704 chatbox styles and tabs and scrolling (Kev Zettler)
c5de3c7 Fixes channel creation and deletion (Akash Manohar J)
e99d32b Merge branch 'master' of github.com:Bushido/Kandan into tweaks (Akash Manohar J)
4491468 Fixes channel deletion (Akash Manohar J)
8f68065 moved tabs in to actual header markup as they should be. working on scrolling form browser window and not inner divs (Kev Zettler)
81a6faf Minor fixes and also removes some logging (Akash Manohar J)
7d77d15 disable user instead of deleting (Akash Manohar J)
ff36e73 Adds Bushido bootstrap and hooks. Readies the app for non-Bushido platforms. (Akash Manohar J)
a6ed5c7 Event fixes (Akash Manohar J)
6a23273 logout menu (Kev Zettler)
c54db0f upload message tab position (Kev Zettler)
e03ba33 more header detail finagling (Kev Zettler)
601e4e8 highlight details on header (Kev Zettler)
a94ce20 tabs and header padding (Kev Zettler)
3130e21 base header padding (Kev Zettler)
a530c6a icons for widgets more rendering bugs (Kev Zettler)
e55ca68 tab fix (Kev Zettler)
3f92f32 Merge branch 'master' of github.com:Bushido/Kandan (Kev Zettler)
ed2bbb2 tab styling (Kev Zettler)
2d34402 Adds and uses page background image (Akash Manohar J)
d55b1f4 Merge branch 'master' of github.com:Bushido/Kandan into tweaks (Akash Manohar J)
76bfa9e Adds search icon; fixes file list icon height; fixes header html; fixes attachments regex (Akash Manohar J)
ab4e6de removed tane for production (Kev Zettler)
60150e2 Specs for API and channels (Akash Manohar J)
789bbe7 Merge branch 'ui_work' into tweaks (Akash Manohar J)
23a4e82 Merge branch 'master' into ui_refactor (Kev Zettler)
322f6ec Merge branch 'master' into ui_work (Akash Manohar J)
ce28aef Sets gravatar hash and sets current user (Akash Manohar J)
6d5d379 Bump _bushido-faye (Sean Grove)
85dc626 ui sclaing refactoring (vagrant)
d479cda Use new _bushido-faye gem as possible fix for http 1.1 protocol spec compliance (Sean Grove)
cb46ef6 converted to sass, cleaned up some avatar extra markup (Kev Zettler)
d511cab Merge branch 'master' of github.com:Bushido/Kandan (Sean Grove)
f945c2f Merge branch 'ui_work' of github.com:Bushido/Kandan into ui_work (Kev Zettler)
41b02b8 Adds logo (Akash Manohar J)
6001c75 Merge branch 'ui_work' (Akash Manohar J)
3ef9119 Icons for attachments (Akash Manohar J)
231daf1 Merge branch 'ui_work' (Akash Manohar J)
e20fa90 Changes to style to suit new layout (Akash Manohar J)
7c4ceb8 Merge branch 'ui_work' (Akash Manohar J)
4fd18f9 Styles the chatarea with the new layout (Akash Manohar J)
6137b77 Adds per-channel chatbox (Akash Manohar J)
f981ecb Splits styles into different files (Akash Manohar J)
0b7d6be Merge branch 'ui_work' (Akash Manohar J)
2927623 Aligns chatbox with chatarea (Akash Manohar J)
cdb8154 Adds bushido-faye (Akash Manohar J)
cd38a08 Sets color for search input text (Akash Manohar J)
658b867 Comments out tane in Gemfile (Akash Manohar J)
d7a941b Search form works; Basic style for search results page (Akash Manohar J)
552f761 Styles the file list. WIP (Akash Manohar J)
81310a9 File widget update to style dropzone (Akash Manohar J)
e13cd8b Fixes drag-drop uploads and changes the width of the activity (Akash Manohar J)
82a9542 Adds bushido gravatar as default (Akash Manohar J)
b8fd30e Refactors kandan.js; Turns the huge function into bits (Akash Manohar J)
19cd88b Kandan.js refactor (Akash Manohar J)
ccce02a Some refactor (Akash Manohar J)
1af4e97 changes create_channel_area to camelcase (Akash Manohar J)
5720648 Delete create channel view (Akash Manohar J)
addd3bf Syncs channel deletion (Akash Manohar J)
cbb5873 Merges master and solves conflicts (Akash Manohar J)
84ed0d6 Removes the added logging and switches some js to camelcase (Akash Manohar J)
ef209f7 Logs all incoming messages in the extension (Akash Manohar J)
db8ba43 Logs every faye message (Akash Manohar J)
bb9ec49 Merges master and solves conflicts (Akash Manohar J)
a8a657c Adds .bushido to gitignore (Akash Manohar J)
3c918bb Deletes .bushido from master branch (Akash Manohar J)
9352108 Logs all faye incoming messages (Akash Manohar J)
c050cc8 Adds activity flushing and tane (Akash Manohar J)
9f41521 Adds .bushido to gitignore (Akash Manohar J)
e938f54 Some formatting (Akash Manohar J)
cdef471 Comments out all test gems (Akash Manohar J)
49384cd comments out sqlite3 (Akash Manohar J)
e250767 initialize on precompile set to false (Akash Manohar J)
3382ebc Adds pg (Akash Manohar J)
d7f906c uses database authenticatable (Akash Manohar J)
04e30ec Adds public/assets to gitignore (Akash Manohar J)
e354f7e Uncomments the STS token option (Akash Manohar J)
cfdc916 Adds position relative to tabs (Akash Manohar J)
6b2528b Adds logging statement for incoming faye messages (Akash Manohar J)
81a35d3 Merge branch 'ui_work' (Akash Manohar J)
8753ea3 Adds channel deletion; TODO: generate activity to publish deletion (Akash Manohar J)
bfe38f6 Merge branch 'master' of github.com:Bushido/Kandan (Akash Manohar J)
615f75d Sets default template for tabs for a better kandan (Akash Manohar J)
b756870 Deletes default template setting for tabs. Lets jquery assume tab template (Akash Manohar J)
31df912 Uses jquery icon for close. Callback for delete now being called; Channel deletion WIP (Akash Manohar J)
ff3d1c4 Adds scrolling, channel add button; Channel deletion WIP (Akash Manohar J)
ab401f1 Updates the Gemfile to be more readable and removes therubyracer (Sean Grove)
1e9d8d8 Merge branch 'master' into ui_work2 (Akash Manohar J)
f7c579d Rewrite of ActiveUsers, Message styling and some refactor of plugins (Akash Manohar J)
7032a01 Removes jasmine git dependency. All hopes about a better world is now lost. (Akash Manohar J)
e0f0de6 Some border tricks to emulate the divider (Akash Manohar J)
fa7e9a1 Changes border radius for widgets (Akash Manohar J)
b408902 Adds gravatar_hash on user creation and specs (Akash Manohar J)
06fffb4 Adds .sass-cache to gitignore (Akash Manohar J)
9af7613 Adds bourbon, basic style and fixes to widgets (Akash Manohar J)
d14f9eb Channel creation and minor fixes (Akash Manohar J)
d5e2f4d Adds search; Faye callbacks for transport down and up; Some minor refactor to support search (Akash Manohar J)
7144978 Fixes Channels API: the way it sets active channel id (Akash Manohar J)
d5bed59 Changes chatbox to a textarea and adds the pastie plugin (Akash Manohar J)
1068a2b Specs for models and channels controller (Akash Manohar J)
99ca945 uncomments STS token option (Akash Manohar J)
bd32246 Adds a per-channel file list (Akash Manohar J)
91af3b6 Adds channel data API, upload notifications and some fixes (Akash Manohar J)
d835083 adds basic file upload widget, dependencies and resources for attachments (Akash Manohar J)
6f7ad84 deletes views,templates that are not used (Akash Manohar J)
6ebd6cd Adds pagination; after a lot of 'vada poche' moments (Akash Manohar J)
6ab6f30 Merges link, youtube and image modifiers into one plugin (Akash Manohar J)
7848019 Fixes embed plugins and history formatting (Akash Manohar J)
1c64ec5 Adds a few plugins and fixes (Akash Manohar J)
75afafb Adds improvements and plugins (Akash Manohar J)
cbb4f4f Changes APIs to fix active users. Listen to unsubscribe instead of disconnect event. Changes user list to new APIs (Akash Manohar J)
a68466e Fixes channel message rendering (Akash Manohar J)
42c1b9b Adds basic+buggy user list (Akash Manohar J)
93e89e2 Removes a console.log line (Akash Manohar J)
9d521c3 Adds perfectly working 007-style user spying (Akash Manohar J)
ec9b415 Adds user notifications, basic Kandan.Data APIs and some other re-organization (Akash Manohar J)
4472358 Moves fetching current user to a helper (Akash Manohar J)
8b48262 Adds helper methods and appends new activities to the chat area (Akash Manohar J)
1b9fc13 Simplifies identifying current channel (Akash Manohar J)
2ed6093 Working chat app with jQuery tabs and Backbone. Adds a small chat posting box (Akash Manohar J)
6d0f370 Switches the whole app to backbone. Oolaa (Akash Manohar J)
f87789a Adds working views (Akash Manohar J)
3698cc0 Lists channels and activities on the index page (Akash Manohar J)
4125ff0 Basic app to list created channels (Akash Manohar J)
9a2a2e7 Organises the app with libraries and settings (Akash Manohar J)
064341d Adds thin and sets up Faye in config.ru (Akash Manohar J)
0c7890d Adds ember tree; Main controller with index action; Sets main#index as root (Akash Manohar J)
4ecb0e4 Adds ember tree; Main controller with index action; ember-rails as dependency from git source (Akash Manohar J)
5b3bb04 Adds a README.md (Akash Manohar J)
7f51891 Removes ember-rails (Akash Manohar J)
8e26912 Jasmine install; Devise initializer; Models and model specs (Akash Manohar J)
f7265e9 Initial commit with dependencies and dev tools setup along with a devise User model (Akash Manohar J)