summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2188 from ZBoxApp/missing-locs-esChristopher Speller2016-02-183-12/+18
|\ | | | | Added missing spanish translations
| * Added missing spanish translationsElias Nahum2016-02-183-12/+18
|/
* Merge pull request #2183 from mattermost/file-upload-fixCorey Hulen2016-02-173-3/+4
|\ | | | | Fix loc error with cancelling in progress uploads
| * Fix loc error with cancelling in progress uploadsJoramWilander2016-02-173-3/+4
| |
* | Merge pull request #2181 from mattermost/plt-1707Christopher Speller2016-02-174-117/+119
|\ \ | | | | | | PLT-1707 Added help text to sso switching and removed redundant divs
| * | Added help text to sso switching and removed redundant divsJoramWilander2016-02-174-117/+119
| | |
* | | Update README.mdit332016-02-171-1/+1
| | |
* | | Merge pull request #2182 from rgarmsen2295/plt-1515Corey Hulen2016-02-171-1/+1
|\ \ \ | | | | | | | | PLT-1515 Changed wording in the password change email to be consistent
| * | | Changed wording of password change email to be more generalizedReed Garmsen2016-02-171-1/+1
| | |/ | |/|
* | | Merge pull request #2180 from hmhealey/plt1422Corey Hulen2016-02-171-18/+30
|\ \ \ | |/ / |/| | PLT-1422 Added restart-server target to Makefile
| * | Added restart-server target to Makefilehmhealey2016-02-171-18/+30
| |/
* | Merge pull request #2179 from mattermost/fix-droidCorey Hulen2016-02-171-12/+16
|\ \ | | | | | | Fixing JS bug with droid
| * | Fixing JS bug with droid=Corey Hulen2016-02-171-12/+16
| | |
* | | Merge pull request #2176 from rgarmsen2295/plt-1870Harrison Healey2016-02-172-12/+59
|\ \ \ | |_|/ |/| | PLT-1870 Added license audit parsing to the audit table
| * | Added license audit parsing to audit tableReed Garmsen2016-02-162-12/+59
|/ /
* | Merge pull request #2171 from asaadmahmoodspin/ui-fixesJoram Wilander2016-02-169-17/+212
|\ \ | |/ |/| Multiple UI Improvements
| * Other minor improvementsAsaad Mahmood2016-02-153-3/+25
| |
| * Fixing custom theme header click eventAsaad Mahmood2016-02-152-6/+10
| |
| * Multiple UI ImprovementsAsaad Mahmood2016-02-156-14/+183
|/
* Merge pull request #2146 from ttyniwa/feature/PLT-1908Corey Hulen2016-02-143-17/+118
|\ | | | | PLT-1908 Add a warning when demoting yourself from System Administrator from the team Manage Members menu
| * add translated messages to es.json.Tatsuya Niwa2016-02-121-0/+4
| |
| * delete not translated messages in es.jsonTatsuya Niwa2016-02-121-4/+0
| |
| * Add a warning when demoting yourself from System Administrator from the team ↵Tatsuya Niwa2016-02-113-17/+118
| | | | | | | | Manage Members menu
* | Merge pull request #2168 from ZBoxApp/permalink-spanishCorey Hulen2016-02-141-0/+2
|\ \ | | | | | | RHS spanish translations for permalink
| * | RHS spanish translations for permalinkElias Nahum2016-02-141-0/+2
| | |
* | | Merge pull request #2165 from ZBoxApp/update-locsCorey Hulen2016-02-142-2/+2
|\ \ \ | |/ / |/| | Update loc strings
| * | Update loc stringsElias Nahum2016-02-122-2/+2
| | |
* | | Merge pull request #2123 from hmhealey/plt1711Joram Wilander2016-02-141-0/+1
|\ \ \ | | | | | | | | PLT-1711 Prevent the admin console from switching to a team that is being remo…
| * | | Prevent the admin console from switching to a team that is being removed ↵hmhealey2016-02-091-0/+1
| | | | | | | | | | | | | | | | from the sidebar
* | | | Merge pull request #2138 from rgarmsen2295/plt-1672Joram Wilander2016-02-144-1/+48
|\ \ \ \ | | | | | | | | | | PLT-1672 Added permalink feature to posts in the RHS
| * | | | Added permalink feature to posts in the RHSReed Garmsen2016-02-124-1/+48
| | |/ / | |/| |
* | | | Merge branch 'release-2.0'Christopher Speller2016-02-136-17/+52
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #2161 from mattermost/load-more-fixChristopher Speller2016-02-131-1/+1
| |\ \ \ | | | | | | | | | | RC3 Fix load more messages being broken by getPostsSince call
| | * | | Fix load more messages being broken by getPostsSince callJoramWilander2016-02-121-1/+1
| | | | |
| * | | | Merge pull request #2164 from mattermost/unread-tab-fixChristopher Speller2016-02-133-6/+8
| |\ \ \ \ | | | | | | | | | | | | RC3 Fix badge and tab */(1) not disappearing until switching away from channel
| | * | | | Fix badge and tab */(1) not disappearing until switching away from channelJoramWilander2016-02-123-6/+8
| | |/ / /
| * | | | Merge pull request #2166 from mattermost/esethna-patch-1Christopher Speller2016-02-131-8/+18
| |\ \ \ \ | | | | | | | | | | | | Update Changelog.md with more known issues
| | * | | | Update Changelog.md with more known issuesEric Sethna2016-02-121-8/+18
| | |/ / / | | | | | | | | | | Add known issues found in testing
| * | | | Merge pull request #2167 from mattermost/gitlab-sso-fixChristopher Speller2016-02-131-2/+25
| |\ \ \ \ | | |/ / / | |/| | | RC3 Make sure the GitLab user has the required fields
| | * | | Make sure the GitLab user has the required fieldsJoramWilander2016-02-121-2/+25
| |/ / /
* | | | Merge pull request #2152 from asaadmahmoodspin/ui-fixesChristopher Speller2016-02-1212-69/+91
|\ \ \ \ | |/ / / |/| | | Multiple UI Improvements
| * | | 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-1217-38/+60
| |\ \ \ | |/ / / |/| | |
* | | | Updating dockerfile for v2.0.0-rc2Christopher Speller2016-02-121-1/+1
| | | |
* | | | Merge pull request #2157 from mattermost/ie-cache-fixChristopher Speller2016-02-126-6/+4
|\ \ \ \ | | | | | | | | | | Fixing IE expire issue
| * | | | Fixing IE expire issue=Corey Hulen2016-02-116-6/+4
| | | | |
* | | | | 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
| | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-01 14:26:36 +0000