summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2208 from mattermost/client-upgradesHarrison Healey2016-02-2290-406/+449
|\
| * Updating some client deps + eslintChristopher Speller2016-02-2290-406/+449
* | PLT-1800 Replace webhooks documentation URLNicolas Clerc2016-02-212-3/+3
|/
* Merge pull request #2191 from hmhealey/plt1256Joram Wilander2016-02-184-95/+116
|\
| * Ported PostDeletedModal to React-Bootstraphmhealey2016-02-184-95/+116
* | Removed ability to copy a permalink on mobileReed Garmsen2016-02-183-52/+58
* | Merge pull request #2183 from mattermost/file-upload-fixCorey Hulen2016-02-173-3/+4
|\ \
| * | Fix loc error with cancelling in progress uploadsJoramWilander2016-02-173-3/+4
* | | Merge pull request #2181 from mattermost/plt-1707Christopher Speller2016-02-173-116/+117
|\ \ \ | |/ / |/| |
| * | Added help text to sso switching and removed redundant divsJoramWilander2016-02-173-116/+117
* | | Merge pull request #2179 from mattermost/fix-droidCorey Hulen2016-02-171-12/+16
|\ \ \ | |_|/ |/| |
| * | Fixing JS bug with droid=Corey Hulen2016-02-171-12/+16
* | | Added license audit parsing to audit tableReed Garmsen2016-02-161-12/+54
| |/ |/|
* | Other minor improvementsAsaad Mahmood2016-02-151-0/+9
* | Fixing custom theme header click eventAsaad Mahmood2016-02-151-2/+7
* | Multiple UI ImprovementsAsaad Mahmood2016-02-154-13/+126
|/
* Merge pull request #2146 from ttyniwa/feature/PLT-1908Corey Hulen2016-02-141-17/+110
|\
| * Add a warning when demoting yourself from System Administrator from the team ...Tatsuya Niwa2016-02-111-17/+110
* | Merge pull request #2123 from hmhealey/plt1711Joram Wilander2016-02-141-0/+1
|\ \
| * | Prevent the admin console from switching to a team that is being removed from...hmhealey2016-02-091-0/+1
| |/
* | Merge pull request #2138 from rgarmsen2295/plt-1672Joram Wilander2016-02-143-1/+46
|\ \
| * | Added permalink feature to posts in the RHSReed Garmsen2016-02-123-1/+46
* | | Merge branch 'release-2.0'Christopher Speller2016-02-134-7/+9
|\ \ \ | |/ / |/| |
| * | Merge pull request #2161 from mattermost/load-more-fixChristopher Speller2016-02-131-1/+1
| |\ \
| | * | Fix load more messages being broken by getPostsSince callJoramWilander2016-02-121-1/+1
| * | | Fix badge and tab */(1) not disappearing until switching away from channelJoramWilander2016-02-123-6/+8
| |/ /
* | | 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-129-32/+53
|\| |
| * | 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-112-5/+7
| |\ \ \ | | |/ / | |/| |
| | * | 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
| |\ \ \
| | * | | 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
| * | | | Merge pull request #2148 from mattermost/missing-posts-2.0Christopher Speller2016-02-112-19/+11
| |\ \ \ \
| | * | | | 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
| | |/ / | |/| |
* / | | Multiple UI ImprovementsAsaad Mahmood2016-02-117-10/+9
|/ / /
* | | 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
| | |/ | |/|