summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Expand)AuthorAgeFilesLines
* Adding import instead of require for fastclickAsaad Mahmood2016-02-121-1/+1
* Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2016-02-125-13/+24
|\
| * Merge pull request #2158 from mattermost/fix-socket-locChristopher Speller2016-02-111-7/+7
| |\
| | * Fixing so the loc tool can use these=Corey Hulen2016-02-111-7/+7
| * | Merge pull request #2155 from ZBoxApp/PLT-1948Christopher Speller2016-02-111-5/+3
| |\ \ | | |/ | |/|
| | * eslint no-shadow resolvedElias Nahum2016-02-111-1/+1
| | * Fix duplicate am/pm on last password updateElias Nahum2016-02-111-5/+3
| * | Merge pull request #2150 from ZBoxApp/PLT-1963Christopher Speller2016-02-111-4/+5
| |\ \
| | * | 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
| |\ \
| | * | 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=Corey Hulen2016-02-101-1/+13
| * | | Fixing socket store loc=Corey Hulen2016-02-111-7/+7
| | |/ | |/|
* / | Multiple UI ImprovementsAsaad Mahmood2016-02-115-9/+7
|/ /
* | Merge pull request #2144 from ZBoxApp/PLT-1928Christopher Speller2016-02-111-1/+9
|\ \
| * | 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
|\ \
| * | 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 #2130 from hmhealey/extrainfoChristopher Speller2016-02-101-1/+1
|\ \
| * | 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-092-76/+81
|\
| * Replaced Permalink popover with a Permalink modalhmhealey2016-02-092-76/+81
* | Merge pull request #2121 from ZBoxApp/PLT-1925Christopher Speller2016-02-091-1/+1
|\ \
| * | 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=Corey Hulen2016-02-092-127/+143
* | | Reset theme on close of settings modalJoramWilander2016-02-091-4/+9
|/ /
* | Merge pull request #2099 from hmhealey/plt1883Corey Hulen2016-02-092-8/+28
|\ \
| * | Changed SearchResults to update when the channel store receives datahmhealey2016-02-082-8/+28
* | | Merge pull request #2113 from mattermost/slash-command-fixesChristopher Speller2016-02-091-1/+1
|\ \ \
| * | | Multiple minor slash command fixesJoramWilander2016-02-091-1/+1
* | | | Multiple UI ImprovementsAsaad Mahmood2016-02-096-12/+14
|/ / /
* | | Merge pull request #2107 from rgarmsen2295/plt-1715Joram Wilander2016-02-081-5/+0
|\ \ \
| * | | 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
|/ /
* | Fixing eslint error=Corey Hulen2016-02-081-1/+0
* | PLT-1900 removing lang from preview and making spanish beta=Corey Hulen2016-02-082-42/+36
* | Merge pull request #2104 from mattermost/minor-fix-jwCorey Hulen2016-02-081-2/+2
|\ \
| * | Fix accidental adding of change listener on unmountJoramWilander2016-02-081-2/+2
* | | Merge pull request #2095 from mattermost/plt-1787Christopher Speller2016-02-081-1/+3
|\ \ \
| * | | Fix statuses not rendering until a change in the LHSJoramWilander2016-02-081-1/+3
* | | | Merge pull request #2101 from hmhealey/plt1415Christopher Speller2016-02-0814-34/+34
|\ \ \ \ | |_|/ / |/| | |
| * | | Renamed RECIEVED_* to RECEIVED_*hmhealey2016-02-0814-34/+34
| | |/ | |/|
* / | Multiple UI ImprovementsAsaad Mahmood2016-02-081-12/+14
|/ /
* | Merge pull request #2089 from mattermost/plt-1205Joram Wilander2016-02-087-143/+157
|\ \
| * | Fix cancel bugJoramWilander2016-02-081-1/+3
| * | Remove appearance settings tab and move theme management to display settings tabJoramWilander2016-02-057-143/+155