Skip to content
Commits on Apr 5, 2012
  1. @HashNuke

    Fixes, Fixes and Fixes. And then merges 'master' into 'tweaks'

    * Changes jQuery events to backbone events
    * Fixes channel deletion
    * Fixes channels helper and deletes unnecessary methods
    * Renames chatarea template to channel_tabs
    * Fixes channel notification processing
    * Uses a backbone view instead of directly appending channel tabs html
    
    Conflicts:
    	app/assets/javascripts/backbone/helpers/channels.js.coffee
    	app/assets/javascripts/backbone/views/chatarea.js.coffee
    
    Signed-off-by: Akash Manohar J <akash@akash.im>
    HashNuke committed Apr 5, 2012
  2. @kevzettler

    logout positioning

    kevzettler committed Apr 4, 2012
  3. @kevzettler
  4. @kevzettler

    scroll fix wiht a mask

    kevzettler committed Apr 4, 2012
  5. @kevzettler

    proper border on right

    kevzettler committed Apr 4, 2012
  6. @kevzettler

    create tabs work now

    kevzettler committed Apr 4, 2012
  7. @kevzettler
  8. @kevzettler
  9. @kevzettler

    partial delete

    kevzettler committed Apr 4, 2012
  10. @kevzettler
  11. @kevzettler

    scrolling back in action

    kevzettler committed Apr 4, 2012
Commits on Apr 4, 2012
  1. @kevzettler

    duplicate template sync

    kevzettler committed Apr 4, 2012
  2. @kevzettler
  3. @HashNuke

    Fixes channel creation and deletion

    Signed-off-by: Akash Manohar J <akash@akash.im>
    HashNuke committed Apr 5, 2012
  4. @HashNuke
  5. @HashNuke

    Fixes channel deletion

    Signed-off-by: Akash Manohar J <akash@akash.im>
    HashNuke committed Apr 5, 2012
  6. @kevzettler

    moved tabs in to actual header markup as they should be. working on s…

    …crolling form browser window and not inner divs
    kevzettler committed Apr 4, 2012
  7. @HashNuke

    Minor fixes and also removes some logging

    Signed-off-by: Akash Manohar J <akash@akash.im>
    HashNuke committed Apr 4, 2012
  8. @HashNuke

    disable user instead of deleting

    Signed-off-by: Akash Manohar J <akash@akash.im>
    HashNuke committed Apr 4, 2012
  9. @HashNuke

    Adds Bushido bootstrap and hooks. Readies the app for non-Bushido pla…

    …tforms.
    
    Signed-off-by: Akash Manohar J <akash@akash.im>
    HashNuke committed Apr 4, 2012
  10. @HashNuke

    Event fixes

    * Standardizes event publishing format for non-channel activities
    * Adds user observer to observer changes in user's names and announce
    * Refactors Faye broadcaster
    * Uses a unified channel for non-channel events
    
    Manual testing of user name changes TODO
    
    Signed-off-by: Akash Manohar J <akash@akash.im>
    HashNuke committed Apr 4, 2012
  11. @kevzettler

    logout menu

    kevzettler committed Apr 3, 2012
Commits on Apr 3, 2012
  1. @kevzettler

    upload message tab position

    kevzettler committed Apr 3, 2012
  2. @kevzettler
  3. @kevzettler

    highlight details on header

    kevzettler committed Apr 3, 2012
  4. @kevzettler

    tabs and header padding

    kevzettler committed Apr 3, 2012
Commits on Apr 2, 2012
  1. @kevzettler

    base header padding

    kevzettler committed Apr 2, 2012
  2. @kevzettler
  3. @kevzettler

    tab fix

    kevzettler committed Apr 2, 2012
  4. @kevzettler
  5. @kevzettler

    tab styling

    kevzettler committed Apr 2, 2012
  6. @HashNuke

    Adds and uses page background image

    Signed-off-by: Akash Manohar J <akash@akash.im>
    HashNuke committed Apr 3, 2012
  7. @HashNuke
  8. @HashNuke

    Adds search icon; fixes file list icon height; fixes header html; fix…

    …es attachments regex
    
    Signed-off-by: Akash Manohar J <akash@akash.im>
    HashNuke committed Apr 3, 2012
  9. @kevzettler

    removed tane for production

    kevzettler committed Apr 2, 2012
Something went wrong with that request. Please try again.