summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-2322-162/+1150
| | | | | |
* | | | | | Merge pull request #769 from hmhealey/plt334Joram Wilander2015-09-242-1/+23
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | PLT-334 Restricted markdown output to only appear on one line when in singleline mode
| * | | | | Restricted markdown output to only appear on one line when in singleline modehmhealey2015-09-232-1/+23
| | | | | |
* | | | | | Merge pull request #766 from mattermost/postpone-oauth-and-webhooksCorey Hulen2015-09-231-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removing OAuth and webhooks changes
| * | | | | | Removing OAuth and webhooks changesit332015-09-231-5/+0
| | | | | | | | | | | | | | | | | | | | | While OAuth2 and webhooks are in the codebase, the UI was only partly finished and we foresee enough time for testing before shipping Oct 2 so we're postponing these to the Oct 16 release.
* | | | | | | Merge pull request #770 from hmhealey/plt339Corey Hulen2015-09-231-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | PLT-339 Changed Markdown links to open in a new tab
| * | | | | | Changed Markdown links to open in a new tabhmhealey2015-09-231-1/+1
|/ / / / / /
* | | | | | Merge pull request #768 from mattermost/segment-fixCorey Hulen2015-09-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fixing segment bug
| * | | | | | fixing segment bug=Corey Hulen2015-09-231-1/+1
| | | | | | |
* | | | | | | Merge pull request #767 from mattermost/segment-fixCorey Hulen2015-09-231-1/+0
|\| | | | | | | |_|/ / / / |/| | | | | fixing segment bug
| * | | | | fixing segment bug=Corey Hulen2015-09-231-1/+0
|/ / / / /
* | | | | Merge pull request #762 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-09-233-0/+30
|\ \ \ \ \ | | | | | | | | | | | | Markdown UI improvements with small description height fix
| * | | | | Markdown UI improvements with small description height fixAsaad Mahmood2015-09-233-0/+30
| | | | | |
* | | | | | Merge pull request #752 from mattermost/PLT-11-emailCorey Hulen2015-09-2361-1127/+3196
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | PLT-11 Cleaned up config file and added ability to makes changes from the admin console.
| * | | | | Changing image settings to file settings=Corey Hulen2015-09-2315-134/+134
| | | | | |
| * | | | | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-2368-353/+1504
| |\ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
* | | | | Merge pull request #764 from mattermost/theme-image-fixCorey Hulen2015-09-231-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix theme images 404ing.
| * | | | Fix theme images 404ing.JoramWilander2015-09-231-1/+1
|/ / / /
* | | | Merge pull request #761 from mattermost/plt-356Harrison Healey2015-09-231-15/+36
|\ \ \ \ | | | | | | | | | | PLT-356 Fix post not rendering properly in some cases.
| * | | | Fix post not rendering properly in some cases.JoramWilander2015-09-231-15/+36
| | | | |
* | | | | Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-2341-189/+1161
|\ \ \ \ \ | |_|_|/ / |/| | | | PLT-242 Implement custom UI theme colors.
| * | | | Implement UI theme colors.JoramWilander2015-09-2341-189/+1161
| | | | |
* | | | | Merge pull request #753 from hmhealey/plt341Corey Hulen2015-09-231-1/+12
|\ \ \ \ \ | |_|/ / / |/| | | | PLT-341 Added CSS classes to markdown headings, links, and tables
| * | | | Added CSS classes to markdown headings, links, and tableshmhealey2015-09-231-1/+12
| | | | |
* | | | | Merge pull request #760 from chengweiv5/PLT-126Harrison Healey2015-09-237-11/+11
|\ \ \ \ \ | |/ / / / |/| | | | PLT-126: Change 'Private Messages' to 'Direct Messages'
| * | | | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-237-11/+11
|/ / / / | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | | | Merge pull request #740 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-09-236-8/+16
|\ \ \ \ | | | | | | | | | | UI Modifications for multiple tickets
| * | | | Removing click event for channel description popoverAsaad Mahmood2015-09-221-1/+1
| | | | |
| * | | | UI Modifications for multiple ticketsAsaad Mahmood2015-09-225-7/+15
| | | | |
* | | | | Merge pull request #756 from rgarmsen2295/plt-165Joram Wilander2015-09-231-8/+15
|\ \ \ \ \ | | | | | | | | | | | | PLT-165 Prevents users from signing up via a public link using a non-valid email address
| * | | | | Adds a check for email validity client-side when joining a team using a ↵Reed Garmsen2015-09-221-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | public link
* | | | | | Merge pull request #757 from chengweiv5/PLT-168Joram Wilander2015-09-231-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-168: check email used to reset password strictly
| * | | | | | PLT-168: check email used to reset password strictlyChengwei Yang2015-09-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | | | | | | Merge pull request #755 from rgarmsen2295/plt-164Christopher Speller2015-09-232-24/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-164 Post drafts containing only files are now recognized properly
| * | | | | | | Functionalized draft checkingReed Garmsen2015-09-221-24/+26
| | | | | | | |
| * | | | | | | Post drafts are now displayed when they contain only files and no textReed Garmsen2015-09-221-2/+2
| | | | | | | |
| * | | | | | | Small change to remove react warningReed Garmsen2015-09-221-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #751 from hmhealey/plt344Christopher Speller2015-09-238-62/+203
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting
| * | | | | | Removed extra handling of markdown links when doing autolinkinghmhealey2015-09-221-31/+5
| | | | | | |
| * | | | | | Moved text formatting code to only occur inside of markdown text nodeshmhealey2015-09-222-19/+33
| | | | | | |
| * | | | | | Changed hashtag regex to only accept hashtags that begin with a letterhmhealey2015-09-221-1/+1
| | | | | | |
| * | | | | | Moved emoticon parsing to happen after url parsing so that we don't have ↵hmhealey2015-09-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | smilies accidentally occuring in urls
| * | | | | | Restored changes which remove emojify and switch to our own versionhmhealey2015-09-227-12/+165
| | | | | | |
* | | | | | | Merge pull request #758 from sjmog/readme-fixit332015-09-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix README typo
| * | | | | | | fix README typoSam Morgan2015-09-231-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #748 from hmhealey/plt233Christopher Speller2015-09-231-8/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-233 Removed click handler from RHS [...] menu
| * | | | | | | Removed click handler from RHS [...] menuhmhealey2015-09-221-8/+1
| | | | | | | |
* | | | | | | | Merge pull request #739 from rgarmsen2295/plt-39Christopher Speller2015-09-233-4/+17
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | PLT-39 Clicking "Resend email" on the verification page now confirms email was sent
| * | | | | | | Minor changes to how resend status is passedReed Garmsen2015-09-213-7/+11
| | | | | | | |
| * | | | | | | Added confirmation when users request another verification email; users are ↵Reed Garmsen2015-09-212-2/+11
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | no longer redirected after requesting another verification email
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 04:41:42 +0000