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

Update master from develop #1655

Merged
merged 138 commits into from
Dec 14, 2015
Merged

Update master from develop #1655

merged 138 commits into from
Dec 14, 2015

Commits on Dec 3, 2015

  1. Configuration menu
    Copy the full SHA
    adcaa85 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2015

  1. Configuration menu
    Copy the full SHA
    36bb64b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e7565a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9901d07 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f26aab2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8009147 View commit details
    Browse the repository at this point in the history
  6. cleanup

    sampaiodiego committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    b805370 View commit details
    Browse the repository at this point in the history
  7. Departments

    marceloschmidt committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    b463f4f View commit details
    Browse the repository at this point in the history
  8. Merge branches 'livechat-manager' and 'livechat-manager' of github.co…

    …m:RocketChat/Rocket.Chat into livechat-manager
    marceloschmidt committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    4e345c5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    817918f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    ad5a357 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    96845c6 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    13a1b16 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2015

  1. Configuration menu
    Copy the full SHA
    6b56d5e View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' into livechat-manager

    Conflicts:
    	packages/rocketchat-livechat/i18n/en.i18n.json
    	packages/rocketchat-livechat/package.js
    marceloschmidt committed Dec 7, 2015
    Configuration menu
    Copy the full SHA
    b31d235 View commit details
    Browse the repository at this point in the history
  3. Updating the font file to move "spin4" and "sliders" icons to locatio…

    …ns with no mirror property
    fduraibi committed Dec 7, 2015
    Configuration menu
    Copy the full SHA
    349d5f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2015

  1. A better fix for the font,

    Remove the icons that are not mirrored to regular locations. And moved the icons that need mirroring to mirrored locations. Replaced "octicon-chevron-right" with new set of mirrored icons from fontello
    fduraibi committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    82db55f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    15ec77b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5045fe9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4d0a2ee View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b63b28f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6798c08 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8f275d7 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5d1396c View commit details
    Browse the repository at this point in the history
  9. Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…

    …nto patch-font-mirror.
    
    Resolved the conflict
    fduraibi committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    703bcd8 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c7ce2ea View commit details
    Browse the repository at this point in the history
  11. Merge pull request #1594 from fduraibi/patch-font-mirror

    Font mirror icons fix
    engelgabriel committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    7946d6d View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    3386bcc View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    0904e08 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    f7a9daa View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    f3b203e View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    79873f8 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    fec1d04 View commit details
    Browse the repository at this point in the history
  18. Fix unsubscriptions

    marceloschmidt committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    1021233 View commit details
    Browse the repository at this point in the history
  19. update sandstorm tags

    engelgabriel committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    74284cb View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    141380b View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    ea77620 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    81d46cf View commit details
    Browse the repository at this point in the history
  23. tabbed added code

    MatthewMawby committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    ed56869 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    4ca1598 View commit details
    Browse the repository at this point in the history
  25. fix developerTools

    engelgabriel committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    c3ce99d View commit details
    Browse the repository at this point in the history
  26. Removed trash can icon

    Removed the trash icon since the buttons are used to upload files and not delete them
    fduraibi committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    0b9bfa6 View commit details
    Browse the repository at this point in the history
  27. Merge pull request #1600 from fduraibi/patch-6

    Removed trash can icon
    engelgabriel committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    d2cfd49 View commit details
    Browse the repository at this point in the history
  28. Add lib clipboard.js

    rodrigok committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    7a2bb2c View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    1f74b78 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    e3dd15a View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2015

  1. Configuration menu
    Copy the full SHA
    63d939f View commit details
    Browse the repository at this point in the history
  2. Encode url and token

    rodrigok committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    0656ee7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1598 from Nberton/master

    Added the code to fix issue #1579
    engelgabriel committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    315870e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    743e482 View commit details
    Browse the repository at this point in the history
  5. Flex settings

    marceloschmidt committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    662d63e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5a4f1f7 View commit details
    Browse the repository at this point in the history
  7. Move all texts to i18n

    rodrigok committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    d6299ff View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b64ed38 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b4693d6 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    04ef6f8 View commit details
    Browse the repository at this point in the history
  11. Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

    # By matthewmawby (2) and others
    # Via Gabriel Engel (2) and others
    * 'develop' of github.com:RocketChat/Rocket.Chat:
      fixes blockquote non-continous border - closes #1605
      Removed trash can icon
      tabbed added code
      Added the code to fix issue #1579
      Added in functionality recommended in issue #1412
    engelgabriel committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    f15d771 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    2be525b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    bb7eac5 View commit details
    Browse the repository at this point in the history
  14. Add some missing vlaues

    Added UTF8_Names_Validation and UTF8_Names_Slugify
    fduraibi committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    2797c33 View commit details
    Browse the repository at this point in the history
  15. Force file names to always be in LTR

    In RTL interface if the file name  has only number, or included RTL characters the file extension will be shown in the wrong side. This fix makes file extensions show correctly for all files
    fduraibi committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    ce4219e View commit details
    Browse the repository at this point in the history
  16. When uploading an avatar keep "Select file" button

    Currently when you upload an image as an avatar, the "SELECT FILE" button disappears and you get another button to use the uploaded file. However, if you didn't like how the uploaded image looks you cannot upload another one. The work around is to reopen the avatar settings page, instead the upload button should stay there to allow the user to upload a different image.
    fduraibi committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    506bdea View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    c57f16b View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    0827725 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    b68a8f6 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    5a6f99a View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    441ae0b View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    6617a03 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    dc9665e View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    04573f8 View commit details
    Browse the repository at this point in the history
  25. Merge pull request #1608 from fduraibi/patch-7

    Add some missing vlaues
    engelgabriel committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    565f59e View commit details
    Browse the repository at this point in the history
  26. Merge pull request #1609 from fduraibi/patch-8

    Force file names to always be in LTR
    engelgabriel committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    ae70543 View commit details
    Browse the repository at this point in the history
  27. Merge pull request #1613 from RocketChat/improment/integrations

    Improment/integrations
    engelgabriel committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    c167af6 View commit details
    Browse the repository at this point in the history
  28. Merge pull request #1611 from fduraibi/patch-9

    When uploading an avatar keep "Select file" button
    engelgabriel committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    0317e22 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2015

  1. Configuration menu
    Copy the full SHA
    3c631eb View commit details
    Browse the repository at this point in the history
  2. Fix oembed

    rodrigok committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    c33d75a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c3cfb05 View commit details
    Browse the repository at this point in the history
  4. 2 Configuration menu
    Copy the full SHA
    e9aa665 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    70b50c4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    14c1a5e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    431d225 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    75afe11 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    862deed View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    a144ffe View commit details
    Browse the repository at this point in the history
  11. improved error UI

    sampaiodiego committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    7dee035 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    f8c356d View commit details
    Browse the repository at this point in the history
  13. livechat popout support

    sampaiodiego committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    819783b View commit details
    Browse the repository at this point in the history
  14. Livechat survey

    marceloschmidt committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    7730a0e View commit details
    Browse the repository at this point in the history
  15. Set code blocks to always be LTR

    Code blocks and inline code that are preceded by RTL text will get displayed in RTL, and that breaks the formatting. This fix forces it to always display in LTR
    fduraibi committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    d92c555 View commit details
    Browse the repository at this point in the history
  16. Merge pull request #1625 from RocketChat/improvements/integrations

    Improvements/integrations
    engelgabriel committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    9aacab6 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #1626 from fduraibi/patch-10

    Set code blocks to always be LTR
    engelgabriel committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    3bb885a View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    17ff96d View commit details
    Browse the repository at this point in the history
  19. Update to the previous pull #1626

    >Code blocks and inline code that are preceded by RTL text will get displayed in RTL, and that breaks the formatting. This fix forces it to always display in LTR
    
    Moved the changes to the `base.less` since it is not specific to RTL interface it also applies even if the user interface is LTR.
    fduraibi committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    7ea0247 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2015

  1. Configuration menu
    Copy the full SHA
    9b4876c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    60cea70 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4e5c841 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1637 from RocketChat/livechat-manager

    Livechat manager
    sampaiodiego committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    3930c7a View commit details
    Browse the repository at this point in the history
  5. Fix for mentioning RTL names

    The current @mention (for user names and channel names) uses the regex `\b` to detect the name boundaries, however that token doesn't support unicode characters. This solution replaces the word boundary with regex that match end of the word with any of the following white space, colon, comma and dot.
    
    However, ending a name with a dot still has a problem as it doesn't get a mention link and this fix does not fix it. Part of the problem is that dots are allowed in the name validation regex. So this problem need to be solved later.
    
    Another thing that this fix adds is a description to the UTF8 Name Validation settings, to inform chat admins about the characters that they need to avoid using in their regexes to not break other chat functionalities that depends on special characters to denote special meanings.
    fduraibi committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    e44c17f View commit details
    Browse the repository at this point in the history
  6. Merge branch 'develop' into livechat-popout

    Conflicts:
    	packages/rocketchat-livechat/app/client/views/room.coffee
    sampaiodiego committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    0231db9 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1636 from RocketChat/livechat-popout

    Livechat popout
    sampaiodiego committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    da1d332 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9f50459 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #1639 from fduraibi/patch-rtl-mention

    Fix for mentioning RTL names
    engelgabriel committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    2d98018 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1630 from fduraibi/patch-code-block-ltr

    Set code blocks to always be LTR globally
    engelgabriel committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    df165b7 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    741469b View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    8fa87c2 View commit details
    Browse the repository at this point in the history
  13. no message

    marceloschmidt committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    b42cec3 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    1d2b158 View commit details
    Browse the repository at this point in the history
  15. Livechat Survey

    marceloschmidt committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    e93493b View commit details
    Browse the repository at this point in the history
  16. Merge pull request #1641 from RocketChat/livechat-survey

    Livechat survey
    engelgabriel committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    47c6eb2 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    9c3870a View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    a7a124b View commit details
    Browse the repository at this point in the history
  19. Avatars for Unicode usernames

    When a new avatar is saved the user name gets encoded using `encodeURIComponent`, this does not affect names in latin characters, however it does change non-latin/unicode names to an encoded string.
    
    However, when reading the avatar image file, the function uses the username directly without enocinding it, so latin names work since the encoding doesn't change anything, however, Unicode names don't since the usernames don't match the encoded names.
    
    This fix adds the encoding function when reading the avatars.
    Also adds the encoding to the function that writes avatars from URL.
    fduraibi committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    16a0ddd View commit details
    Browse the repository at this point in the history
  20. Merge pull request #1642 from fduraibi/patch-unicode-name-avatar

    Avatars for Unicode usernames
    engelgabriel committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    0d04894 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    fab937f View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    49035e1 View commit details
    Browse the repository at this point in the history
  23. Merge pull request #1627 from jgerle/develop

    fix broken image-link when og:image contains "&" (e.g. Google Maps)
    engelgabriel committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    b023db6 View commit details
    Browse the repository at this point in the history
  24. Fixed indentation and added unicode support

    The avatar image move need to only be done if a previous username exists. 
    Also we need `encodeURIComponent` to support names in unicode.
    fduraibi committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    d4d3f16 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2015

  1. Configuration menu
    Copy the full SHA
    8ded015 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b20e8aa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cebb602 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1647 from RocketChat/rocket-chat-shouldnt-be-admin

    Rocket.Cat Shouldn't be Admin, allowing first users to be admins again
    graywolf336 committed Dec 12, 2015
    Configuration menu
    Copy the full SHA
    199d3de View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a421255 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2015

  1. Configuration menu
    Copy the full SHA
    c997162 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2015

  1. Configuration menu
    Copy the full SHA
    4380757 View commit details
    Browse the repository at this point in the history
  2. Fix broken link

    Sing-Li committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    70c54e0 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1650 from RocketChat/turn-off-livechat

    Option to turn off livechat
    engelgabriel committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    6e59635 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1644 from fduraibi/patch-12

    Show toastr messages on the left side
    engelgabriel committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    4826b6c View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1649 from matthias-brun/fix-create-channel-instea…

    …d-of-private-group
    
    Fix 'create new' in private group list opening 'create channel' flex
    engelgabriel committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    ed9fff8 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1643 from fduraibi/patch-11

    Fixed indentation and added unicode support
    engelgabriel committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    e50a6bf View commit details
    Browse the repository at this point in the history
  7. Added setting Accounts_LoginExpiration

    Setting allows admin to modify Meteor.loginTokenExpires from default 90 days to something else.
    Server restart is required for this setting to take effect.
    Default value is still 90 days if not modified by admin.
    litewhatever committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    9b75b82 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #1652 from litewhatever/develop

    This is a good start. LIke noted by @litewhatever there are limitations that related to the way meteor works. I can see some workarounds we could do, but that would need to be discussed and maybe submitted back to MDG.
    engelgabriel committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    e287273 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f197c1a View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d60b6ff View commit details
    Browse the repository at this point in the history
  11. Merge branch 'lingohub' into develop

    * lingohub:
      Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: '[email protected]'.
    
    Conflicts:
    	packages/rocketchat-livechat/app/i18n/en.i18n.json
    engelgabriel committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    c1826b6 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    2184432 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    778f008 View commit details
    Browse the repository at this point in the history
  14. bump version to 0.9.0

    engelgabriel committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    57a10be View commit details
    Browse the repository at this point in the history
  15. Merge branch 'master' into develop

    * master:
    engelgabriel committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    332e841 View commit details
    Browse the repository at this point in the history