Skip to content
This repository has been archived by the owner on Nov 14, 2018. It is now read-only.

Activity app design #1769

Merged
merged 29 commits into from May 14, 2014
Merged

Activity app design #1769

merged 29 commits into from May 14, 2014

Commits on May 14, 2014

  1. move from block layout to list layout, first step

    @jancborchardt @nickvergessen
    jancborchardt authored and nickvergessen committed May 14, 2014
    Copy the full SHA
    9532734 View commit details
    Browse the repository at this point in the history

  2. Activity: hide appname, move date to right

    @jancborchardt @nickvergessen
    jancborchardt authored and nickvergessen committed May 14, 2014
    Copy the full SHA
    1e433ec View commit details
    Browse the repository at this point in the history

  3. Activity app: margin and position fixes

    @jancborchardt @nickvergessen
    jancborchardt authored and nickvergessen committed May 14, 2014
    Copy the full SHA
    90056fb View commit details
    Browse the repository at this point in the history

  4. Activity: simplify icon

    @jancborchardt @nickvergessen
    jancborchardt authored and nickvergessen committed May 14, 2014
    Copy the full SHA
    d8b6574 View commit details
    Browse the repository at this point in the history

  5. Activity: add colored icons for add, change, delete

    @jancborchardt @nickvergessen
    jancborchardt authored and nickvergessen committed May 14, 2014
    Copy the full SHA
    e76d4bf View commit details
    Browse the repository at this point in the history

  6. Activity: remove header with username and avatar

    @jancborchardt @nickvergessen
    jancborchardt authored and nickvergessen committed May 14, 2014
    Copy the full SHA
    adb873d View commit details
    Browse the repository at this point in the history

  7. Activity: more layout, align message, icon, header, preview

    @jancborchardt @nickvergessen
    jancborchardt authored and nickvergessen committed May 14, 2014
    Copy the full SHA
    af45b89 View commit details
    Browse the repository at this point in the history

  8. Activity: more layout, align message, icon, header, preview

    @jancborchardt @nickvergessen
    jancborchardt authored and nickvergessen committed May 14, 2014
    Copy the full SHA
    e6960ba View commit details
    Browse the repository at this point in the history

  9. Fix icons for delete and add

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    e378060 View commit details
    Browse the repository at this point in the history

  10. Fix new lines

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    edf7669 View commit details
    Browse the repository at this point in the history

  11. Make a short and long version of subjects and use the short one in th… 

    …e UI

The long one is displayed on hover
    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    13153b2 View commit details
    Browse the repository at this point in the history

  12. Add icon for grouped activities

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    106e0eb View commit details
    Browse the repository at this point in the history

  13. Remove duplicated css

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    8c336ce View commit details
    Browse the repository at this point in the history

  14. Always add div.activity-icon so the messages are aligned

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    17c0b06 View commit details
    Browse the repository at this point in the history

  15. Use else instead of !condition for easier readability

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    08778d2 View commit details
    Browse the repository at this point in the history

  16. Add icon for share activities

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    5d27ef0 View commit details
    Browse the repository at this point in the history

  17. change colored change icon to black/grey for less distraction

    @jancborchardt
    jancborchardt committed May 14, 2014
    Copy the full SHA
    f746da6 View commit details
    Browse the repository at this point in the history

  18. align icons to top in activity groups

    @jancborchardt
    jancborchardt committed May 14, 2014
    Copy the full SHA
    15b908b View commit details
    Browse the repository at this point in the history

  19. Highlight usernames, files and other params in subjects

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    714e57d View commit details
    Browse the repository at this point in the history

  20. Merge branch 'activity-design' of https://github.com/owncloud/apps in… 

    …to activity-design

# By Jan-Christoph Borchardt
# Via Jan-Christoph Borchardt
* 'activity-design' of https://github.com/owncloud/apps:
  align icons to top in activity groups
  change colored change icon to black/grey for less distraction
    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    8371dfc View commit details
    Browse the repository at this point in the history

  21. Vertical align activity subjects at the top

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    da274d6 View commit details
    Browse the repository at this point in the history

  22. put preview image on separate row

    @jancborchardt
    jancborchardt committed May 14, 2014
    Copy the full SHA
    5337ae9 View commit details
    Browse the repository at this point in the history

  23. fix positioning of long lines

    @jancborchardt
    jancborchardt committed May 14, 2014
    Copy the full SHA
    7a07421 View commit details
    Browse the repository at this point in the history

  24. grey the changed and shared icons so they are less intense

    @jancborchardt
    jancborchardt committed May 14, 2014
    Copy the full SHA
    23c6726 View commit details
    Browse the repository at this point in the history

  25. Fix long lines in grouped activities

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    57e0e82 View commit details
    Browse the repository at this point in the history

  26. Display folder icon when a folder was shared/created

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    76242aa View commit details
    Browse the repository at this point in the history

  27. Add missing $highlight_params to the doc block

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    61f8d5f View commit details
    Browse the repository at this point in the history

  28. Fix Undefined index: message_long

    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    50b1ae0 View commit details
    Browse the repository at this point in the history

  29. Remove <strong> hack and correctly \OC_Util::sanitizeHTML() the dat… 

    …a before usage
    @nickvergessen
    nickvergessen committed May 14, 2014
    Copy the full SHA
    404edc0 View commit details
    Browse the repository at this point in the history