summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2158 from mattermost/fix-socket-locChristopher Speller2016-02-111-7/+7
|\ | | | | Fixing so the loc tool can use these
| * Fixing so the loc tool can use these=Corey Hulen2016-02-111-7/+7
| |
* | Merge pull request #2155 from ZBoxApp/PLT-1948Christopher Speller2016-02-112-5/+7
|\ \ | |/ |/| PLT-1948: Fix duplicate am/pm on last password update
| * eslint no-shadow resolvedElias Nahum2016-02-112-2/+2
| |
| * Fix duplicate am/pm on last password updateElias Nahum2016-02-112-5/+7
| |
* | Merge pull request #2150 from ZBoxApp/PLT-1963Christopher Speller2016-02-111-4/+5
|\ \ | | | | | | PLT-1963: Fixing intl console error on Outgoing webhook edit
| * | Fixing intl console error on Outgoing webhook editElias Nahum2016-02-111-4/+5
| |/
* | Merge pull request #2153 from mattermost/plt-1939Christopher Speller2016-02-112-3/+3
|\ \ | | | | | | RC2 PLT-1939 Fix localization error for team invites
| * | Fix localization error for team invitesJoramWilander2016-02-112-3/+3
| |/
* | Merge pull request #2145 from mattermost/PLT-1956Christopher Speller2016-02-111-1/+13
|\ \ | | | | | | PLT-1956 Infinite "Loading..." Animation for Webhooks/Slash Commands UI
| * | PLT-1956=Corey Hulen2016-02-101-1/+13
| | |
* | | Merge pull request #2148 from mattermost/missing-posts-2.0Christopher Speller2016-02-112-19/+11
|\ \ \ | | | | | | | | RC2 PLT-1774 Fixing the elusive missing post bug
| * | | Switch to using create_at for latest postJoramWilander2016-02-111-1/+1
| | | |
| * | | If we have less than CHUNK_SIZE posts, then get the first pageJoramWilander2016-02-111-1/+3
| | | |
| * | | Fix case where channel has a postlist but no postsJoramWilander2016-02-111-1/+6
| | | |
| * | | Fixing the elusive missing post bugJoramWilander2016-02-112-19/+4
| |/ /
* | / Fixing socket store loc=Corey Hulen2016-02-112-7/+21
| |/ |/|
* | Merge pull request #2144 from ZBoxApp/PLT-1928Christopher Speller2016-02-111-1/+9
|\ \ | | | | | | PLT-1928: Fix localization on floating timestamp
| * | Fix localization on floating timestampElias Nahum2016-02-101-1/+9
| |/
* | Merge pull request #2141 from rgarmsen2295/fix-search-map-errorChristopher Speller2016-02-111-6/+9
|\ \ | | | | | | RC2 - Fix issue with searching for short strings
| * | Fix issue with searching for short stringsReed Garmsen2016-02-101-6/+9
| | |
* | | Improving UI for slash commandsAsaad Mahmood2016-02-101-2/+2
| |/ |/|
* | Merge pull request #2135 from asaadmahmoodspin/release-2.0Christopher Speller2016-02-101-1/+1
|\ \ | | | | | | PLT-1935 - Fixing codespan inline issue
| * | Fixing codespan inline issueAsaad Mahmood2016-02-101-1/+1
| |/
* | Merge pull request #2130 from hmhealey/extrainfoChristopher Speller2016-02-101-1/+1
|\ \ | | | | | | RC2 - Stopped returning inactive members with getExtraInfo calls
| * | Stopped returning inactive members with getExtraInfo callshmhealey2016-02-101-1/+1
| |/
* / Fix canceling themes when user has no themeJoramWilander2016-02-101-1/+4
|/
* Merge pull request #2122 from hmhealey/plt1544Christopher Speller2016-02-096-76/+93
|\ | | | | PLT-1544 Replaced Permalink popover with a Permalink modal
| * Replaced Permalink popover with a Permalink modalhmhealey2016-02-096-76/+93
| |
* | Merge pull request #2121 from ZBoxApp/PLT-1925Christopher Speller2016-02-091-1/+1
|\ \ | | | | | | PLT-1925: Fix delete_post_modal showing unnecessary $ sign
| * | Fix delete_post_modal showing unnecessary $ signElias Nahum2016-02-091-1/+1
| | |
* | | Merge pull request #2120 from mattermost/slash-helpChristopher Speller2016-02-092-127/+143
|\ \ \ | |/ / |/| | Fixing slash command help
| * | Fixing slash command help=Corey Hulen2016-02-092-127/+143
| | |
* | | Merge pull request #2117 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-02-091-0/+4
|\ \ \ | | | | | | | | Fixing single line code block on firefox
| * | | Fixing single line code block on firefoxAsaad Mahmood2016-02-091-0/+4
| |/ /
* / / Reset theme on close of settings modalJoramWilander2016-02-091-4/+9
|/ /
* | Merge pull request #2115 from mattermost/plt-1506Joram Wilander2016-02-092-3/+5
|\ \ | | | | | | PLT-1506 Fixing mentions for inactive browser tabs.
| * | Changing meation behaviour to show meantion when viewing channel but tab is ↵Christopher Speller2016-02-092-3/+5
| | | | | | | | | | | | not focused
* | | Merge pull request #2099 from hmhealey/plt1883Corey Hulen2016-02-093-8/+50
|\ \ \ | | | | | | | | PLT-1883 Update search result components when we receive channels
| * | | Changed SearchResults to update when the channel store receives datahmhealey2016-02-082-8/+28
| | | |
| * | | Added support for ES6 Maps to Utils.areObjectsEqualhmhealey2016-02-081-0/+22
| | | |
* | | | Merge pull request #2113 from mattermost/slash-command-fixesChristopher Speller2016-02-092-2/+8
|\ \ \ \ | | | | | | | | | | Multiple minor slash command fixes
| * | | | Multiple minor slash command fixesJoramWilander2016-02-092-2/+8
| | |/ / | |/| |
* / | | Multiple UI ImprovementsAsaad Mahmood2016-02-098-12/+16
|/ / /
* | | Merge pull request #2107 from rgarmsen2295/plt-1715Joram Wilander2016-02-081-5/+0
|\ \ \ | | | | | | | | PLT-1715 - Removed the ability to disable file storage from the admin console
| * | | Removed the ability to disable file storage from the admin consoleReed Garmsen2016-02-081-5/+0
| | |/ | |/|
* / | Provides error message on user sign-up page when no sign-up methods are enabledReed Garmsen2016-02-081-0/+11
|/ /
* | Merge pull request #2106 from mattermost/PLT-1900Joram Wilander2016-02-084-48/+37
|\ \ | | | | | | PLT-1900 removing lang from preview and making spanish beta
| * | Fixing eslint error=Corey Hulen2016-02-081-1/+0
| | |
| * | PLT-1900 removing lang from preview and making spanish beta=Corey Hulen2016-02-084-47/+37
| | |