summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #2073 from mattermost/ee-updatesCorey Hulen2016-02-046-337/+350
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Move license storage to databaseJoramWilander2016-02-041-1/+1
| * | | | Turn failed audit descriptions redJoramWilander2016-02-041-1/+6
| * | | | Convert audit_table to a proper tableJoramWilander2016-02-043-331/+327
| * | | | Rename audits tabJoramWilander2016-02-042-2/+2
| * | | | Disable remove license button until LDAP is disabledJoramWilander2016-02-042-2/+4
| * | | | Fix license info localizationJoramWilander2016-02-041-2/+12
| |/ / /
* | | | Merge pull request #2064 from hmhealey/plt882Christopher Speller2016-02-049-91/+103
|\ \ \ \ | |/ / / |/| | |
| * | | Added helper methods to send ephemeral messages to specific usershmhealey2016-02-042-2/+19
| * | | Changed how posts are marked ephemeralhmhealey2016-02-044-6/+9
| * | | Changed PostStore to not clear a deleted post's messagehmhealey2016-02-043-18/+23
| * | | Added ephemeral messages sent when a user mentions someone not in the channelhmhealey2016-02-042-1/+3
| * | | Changed deleted posts to be more general ephemeral postshmhealey2016-02-045-71/+56
* | | | Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-046-18/+883
|\ \ \ \ | |/ / / |/| | |
| * | | PLT-1429 Fixing code review comments=Corey Hulen2016-02-041-1/+0
| * | | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0323-145/+518
| |\| |
| * | | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0348-771/+2139
| |\ \ \
| * | | | Fixing console=Corey Hulen2016-02-021-1/+1
| * | | | Adding props to admin console=Corey Hulen2016-02-021-4/+100
| * | | | Adding loc to front-end=Corey Hulen2016-02-022-51/+269
| * | | | Fixing merge=Corey Hulen2016-02-01126-1589/+7199
| |\ \ \ \
| * \ \ \ \ merging=Corey Hulen2016-01-2520-331/+1082
| |\ \ \ \ \
| * \ \ \ \ \ merging=Corey Hulen2016-01-2229-113/+421
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merging=Corey Hulen2016-01-151-3/+3
| |\ \ \ \ \ \ \
| * | | | | | | | finishing up commands UI=Corey Hulen2016-01-142-68/+308
| * | | | | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-1424-94/+619
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Adding UI=Corey Hulen2016-01-112-0/+295
| * | | | | | | | | Fixing unit tests=Corey Hulen2016-01-091-1/+1
| * | | | | | | | | partial fix for UI=Corey Hulen2016-01-083-13/+30
* | | | | | | | | | Merge pull request #2068 from hmhealey/plt1767Corey Hulen2016-02-041-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed editing your last comment in the RHShmhealey2016-02-041-3/+2
* | | | | | | | | | | Fixed localization issues in file_upload.jsxhmhealey2016-02-041-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2062 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-042-54/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2016-02-032-54/+74
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2063 from mattermost/fix-locCorey Hulen2016-02-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fixing loc error=Corey Hulen2016-02-031-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2060 from ZBoxApp/PLT-7-channelHarrison Healey2016-02-0323-145/+518
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Messages for SocketStore and small fixesElias Nahum2016-02-036-42/+81
| * | | | | | | | PLT-7: Refactoring frontend (chunk 11)Elias Nahum2016-02-0317-103/+437
| | |_|_|_|_|_|/ | |/| | | | | |
* / | | | | | | Fix katex sanitizationJoramWilander2016-02-031-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #2055 from khoa-le/PLT-1693Christopher Speller2016-02-031-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Clear the password input boxes when user enter incorrect Retype New Password.Khoa, Le Ngoc2016-02-031-1/+2
* | | | | | | | Merge pull request #2054 from khoa-le/PLT-1433Christopher Speller2016-02-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | OGG files render as audio files with previewKhoa, Le Ngoc2016-02-031-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #2049 from mattermost/plt-1856Christopher Speller2016-02-039-536/+772
|\ \ \ \ \ \ \ \
| * | | | | | | | Add basic server audit tab to system console for EEJoramWilander2016-02-029-536/+772
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-035-85/+342
|\ \ \ \ \ \ \ \
| * | | | | | | | Added extra system-wide statistics for EEJoramWilander2016-02-025-85/+342
| |/ / / / / / /
* | | | | | | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modalsJoram Wilander2016-02-0318-119/+641
|\ \ \ \ \ \ \ \
| * | | | | | | | PLT-7: Refactoring frontend (chunk 10)Elias Nahum2016-02-0218-119/+641
| |/ / / / / / /