Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Wmwragg/mention state menu #369

Merged
merged 40 commits into from
Aug 3, 2016
Merged

Wmwragg/mention state menu #369

merged 40 commits into from
Aug 3, 2016

Commits on Jul 21, 2016

  1. Configuration menu
    Copy the full SHA
    775fc97 View commit details
    Browse the repository at this point in the history
  2. Testing out the context menu

    wmwragg committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    4013ea7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7628733 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    922bb0f View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2016

  1. Tooltip positioning tweaked

    wmwragg committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    3dd8392 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5d4b03c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ca75d93 View commit details
    Browse the repository at this point in the history
  4. The tooltip now appears even when not collapsed when hover over the a…

    …vater, to allow the full name to be shown
    wmwragg committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    6984a55 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e4dd6c8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9b318e8 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c89904b View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2016

  1. Configuration menu
    Copy the full SHA
    a69107f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8b8486a View commit details
    Browse the repository at this point in the history
  3. Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/m…

    …ention-state-menu
    
    # resolved Conflicts:
    #	src/components/views/rooms/RoomTile.js
    wmwragg committed Jul 25, 2016
    Configuration menu
    Copy the full SHA
    a218b4e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9c9c5ec View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8f3e932 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2016

  1. Removed debug statement

    wmwragg committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    477a17b View commit details
    Browse the repository at this point in the history
  2. some code tidyup

    wmwragg committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    0eb1508 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2016

  1. Fixed a bug where the contextual menu was being incorrectly positione…

    …d when zoom in on the webpage
    wmwragg committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    dca4702 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4b26ac5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6d141d1 View commit details
    Browse the repository at this point in the history
  4. Revert merge up from develop

    wmwragg committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    3df746e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3cb3dd9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0660b9f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6e7e091 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8246d91 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    46a643a View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    867b14d View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2016

  1. Configuration menu
    Copy the full SHA
    bc902a9 View commit details
    Browse the repository at this point in the history
  2. Fixed spelling mistake

    wmwragg committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    94350bc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5889bea View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2016

  1. Configuration menu
    Copy the full SHA
    38f504b View commit details
    Browse the repository at this point in the history
  2. first pass on css re-write

    wmwragg committed Jul 29, 2016
    Configuration menu
    Copy the full SHA
    229664a View commit details
    Browse the repository at this point in the history
  3. Revert so that the

    wmwragg committed Jul 29, 2016
    Configuration menu
    Copy the full SHA
    1487c60 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2016

  1. Merge up from develop

    wmwragg committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    cf22a5f View commit details
    Browse the repository at this point in the history
  2. Fixed bug where the long hover tooltip for a room name show an object…

    … rather than the name
    wmwragg committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    398e56c View commit details
    Browse the repository at this point in the history
  3. Positional tweaks for the name, badge and context menu, to better mat…

    …ch design in both normal and collapsed states
    wmwragg committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    d16aa27 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2016

  1. New design for long names

    wmwragg committed Aug 2, 2016
    Configuration menu
    Copy the full SHA
    2c2f689 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2016

  1. Configuration menu
    Copy the full SHA
    8e19532 View commit details
    Browse the repository at this point in the history
  2. Corrected comment typo

    wmwragg committed Aug 3, 2016
    Configuration menu
    Copy the full SHA
    c1cfbd6 View commit details
    Browse the repository at this point in the history