summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PLT-1851=Corey Hulen2016-02-0417-100/+1027
|\
| * Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-049-26/+928
| |\
| | * PLT-1429 Fixing code review comments=Corey Hulen2016-02-041-1/+0
| | * Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0325-268/+788
| | |\
| | * \ Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0352-842/+2399
| | |\ \
| | * | | Fixing console=Corey Hulen2016-02-021-1/+1
| | * | | Adding props to admin console=Corey Hulen2016-02-023-12/+108
| | * | | Adding loc to front-end=Corey Hulen2016-02-023-51/+302
| | * | | Fixing merge=Corey Hulen2016-02-01153-1784/+9627
| | |\ \ \
| | * \ \ \ merging=Corey Hulen2016-01-2522-338/+1085
| | |\ \ \ \
| | * \ \ \ \ merging=Corey Hulen2016-01-221694-147/+1541284
| | |\ \ \ \ \
| | * \ \ \ \ \ 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-1430-118/+643
| | |\ \ \ \ \ \ \
| | * | | | | | | | Adding UI=Corey Hulen2016-01-112-0/+295
| | * | | | | | | | Fixing unit tests=Corey Hulen2016-01-091-1/+1
| | * | | | | | | | Fixing unit tests=Corey Hulen2016-01-081-0/+4
| | * | | | | | | | partial fix for UI=Corey Hulen2016-01-083-13/+30
| * | | | | | | | | Fixing center channel icon position in IEAsaad Mahmood2016-02-041-0/+1
| * | | | | | | | | 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-045-65/+90
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2016-02-035-65/+90
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #2065 from ZBoxApp/PLT-7-fixCorey Hulen2016-02-031-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix claim translationsElias Nahum2016-02-031-2/+2
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge pull request #2063 from mattermost/fix-locCorey Hulen2016-02-031-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fixing loc error=Corey Hulen2016-02-031-1/+1
| | |/ / / / / / /
* | / / / / / / / PLT-1851 reconnect and get missing messages=Corey Hulen2016-02-031-1/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #2060 from ZBoxApp/PLT-7-channelHarrison Healey2016-02-0325-268/+788
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix socketError message in spanishElias Nahum2016-02-031-1/+1
| * | | | | | | Add missing translationsElias Nahum2016-02-032-99/+110
| * | | | | | | Messages for SocketStore and small fixesElias Nahum2016-02-038-43/+96
| * | | | | | | PLT-7: Refactoring frontend (chunk 11)Elias Nahum2016-02-0319-126/+582
* | | | | | | | 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-0310-583/+823
|\ \ \ \ \ \ \ \
| * | | | | | | | Add basic server audit tab to system console for EEJoramWilander2016-02-0210-584/+824
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-038-89/+354
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove missing ES translationsJoramWilander2016-02-021-7/+0
| * | | | | | | | Added extra system-wide statistics for EEJoramWilander2016-02-028-89/+361
| |/ / / / / / /
* | | | | | | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modalsJoram Wilander2016-02-0320-119/+821
|\ \ \ \ \ \ \ \
| * | | | | | | | PLT-7: Refactoring frontend (chunk 10)Elias Nahum2016-02-0220-119/+821
| |/ / / / / / /
* | | | | | | | Merge pull request #2048 from rgarmsen2295/plt-1317Joram Wilander2016-02-036-28/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed clock icon in repeat posts to simple timestampReed Garmsen2016-02-026-24/+31
| * | | | | | | | Removed css clock from sub-postsReed Garmsen2016-02-021-4/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #2047 from hmhealey/helpurlJoram Wilander2016-02-031-8/+2
|\ \ \ \ \ \ \ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 12:50:38 +0000