summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding config file timestamp to X-Version header=Corey Hulen2015-09-161-1/+2
|
* Merge branch 'master' into PLT-93=Corey Hulen2015-09-167-21/+66
|\
| * Merge pull request #690 from mattermost/fix-safariHarrison Healey2015-09-162-4/+4
| |\ | | | | | | Fixing issues on safari
| | * Removing js map from react bootstrap to make safari happy.Christopher Speller2015-09-162-4/+4
| |/ | | | | | | | | Adding babel runtime to build process because Safari hasen't gotten with the program yet.
| * Merge pull request #686 from hmhealey/plt172Joram Wilander2015-09-164-13/+58
| |\ | | | | | | PLT-172 Fixes TypeErrors and random jumping that occurs when clicking the scroll bar in the sidebar
| | * PLT-172 Added a modified version of perfect-scrollbar-0.6.5 which correctly ↵hmhealey2015-09-152-6/+9
| | | | | | | | | | | | stops clicks through the scrollbar
| | * PLT-172 Updated perfect-scrollbar to 0.6.5hmhealey2015-09-154-12/+54
| | |
| * | Merge pull request #688 from mattermost/fixing-typoJoram Wilander2015-09-161-4/+4
| |\ \ | | | | | | | | Fixing typo
| | * | Fixing typo=Corey Hulen2015-09-151-4/+4
| |/ /
* | | Fixing eslint problems=Corey Hulen2015-09-153-7/+0
| | |
* | | Finished removing some of the last bits of client side config=Corey Hulen2015-09-154-41/+1
| | |
* | | Removing old config stuff=Corey Hulen2015-09-1511-273/+6
| | |
* | | PLT-93 cleaing up client side configs=Corey Hulen2015-09-1582-374/+428
| | |
* | | removing loggly=Corey Hulen2015-09-153-18/+0
|/ /
* | Merge pull request #681 from mattermost/PLT-12-logChristopher Speller2015-09-1516-18/+332
|\ \ | | | | | | PLT-12 Adding server logs viewer to admin console
| * | Moving style into css=Corey Hulen2015-09-153-14/+14
| | |
| * | Fixing eslint issues=Corey Hulen2015-09-141-9/+0
| | |
| * | Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-1459-733/+18562
| |\ \
| * | | PLT-12 adding log viewer=Corey Hulen2015-09-1014-15/+338
| | | |
* | | | Merge pull request #685 from mattermost/update-style-guideHarrison Healey2015-09-151-8/+11
|\ \ \ \ | | | | | | | | | | Updating style guide
| * | | | Updating style guideChristopher Speller2015-09-151-8/+11
| | | | |
* | | | | Merge pull request #684 from mattermost/fix-text-overflowCorey Hulen2015-09-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixing long channel name overflow by changing text to Edit
| * | | | | Fixing long channel name overflow by changing text to EditChristopher Speller2015-09-151-1/+1
| |/ / / /
* | | | | Merge pull request #682 from mattermost/nc-patchJoram Wilander2015-09-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fixing cutoff team name in new channel modal.
| * | | | Fixing cutoff team name in new channel modalChristopher Speller2015-09-151-1/+1
| | |/ / | |/| |
* | | | Merge pull request #673 from apaatsio/clean-go-depsJoram Wilander2015-09-151-0/+2
|\ \ \ \ | | | | | | | | | | Clean installed Go dependencies
| * | | | Clean installed Go dependenciesAntti Ahti2015-09-141-0/+2
| | | | | | | | | | | | | | | | | | | | If these are not cleaned it can cause problems when switching between different Go versions. Especially when downgrading Go.
* | | | | Merge pull request #676 from hmhealey/mm1900bJoram Wilander2015-09-159-220/+308
|\ \ \ \ \ | |_|/ / / |/| | | | MM-1900 Removed textToJsx
| * | | | Renamed text formatting tokens so that there should be significantly less ↵hmhealey2015-09-141-11/+11
| | | | | | | | | | | | | | | | | | | | chance of having conflicting tokens
| * | | | Removed textToJsx!hmhealey2015-09-141-199/+0
| | | | |
| * | | | Removed all calls to textToJsx and replaced them with calls to TextFormattinghmhealey2015-09-147-28/+39
| | | | |
| * | | | Cleaned up TextFormatting and added a default click handler for hashtags and ↵hmhealey2015-09-141-47/+74
| | | | | | | | | | | | | | | | | | | | @mentions
| * | | | Added highlighting of search terms to the new text formattinghmhealey2015-09-141-6/+41
| | | | |
| * | | | Added autolinking of hashtags to the new text formattinghmhealey2015-09-141-6/+48
| | | | |
| * | | | Added autolinking of urls to the new text formattinghmhealey2015-09-141-4/+35
| | | | |
| * | | | Added highlighting when the current user is mentioned to the new text formattinghmhealey2015-09-141-17/+69
| | | | |
| * | | | Changed one instance of textToJsx to use new text formatting for testing ↵hmhealey2015-09-141-1/+9
| | | | | | | | | | | | | | | | | | | | purposes
| * | | | Added handling for @mentions to the new text formattinghmhealey2015-09-141-9/+54
| | | | |
| * | | | Added skeleton for new text formatting code which will replace textToJsxhmhealey2015-09-141-0/+36
| | | | |
* | | | | Merge pull request #678 from mattermost/mm-1589Corey Hulen2015-09-1427-627/+18350
|\ \ \ \ \ | |_|_|_|/ |/| | | | PLT-171 MM-1589 New add channel modal using react-bootstrap.
| * | | | New add channel modal using react-bootstrap.Christopher Speller2015-09-1427-627/+18350
| | | | |
* | | | | Merge pull request #679 from mattermost/fix-file-content-typeHarrison Healey2015-09-142-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Blank Content-Type for file GETs.
| * | | | | Blank Content-Type for file GETs.JoramWilander2015-09-142-4/+4
| | | | | |
* | | | | | Merge pull request #674 from Trozz/PLT-41Joram Wilander2015-09-144-7/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-41 Automatically convert uppercase letters to lowercase in username input box.
| * | | | | | update remaining web files tolowercaseMichael Leer2015-09-142-2/+2
| | | | | | |
| * | | | | | replace lowerName with nameMichael Leer2015-09-141-3/+1
| | | | | | |
| * | | | | | PLT-41Michael Leer2015-09-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed lowercase from the error wording. Removed additional toLowerCase within validator.
| * | | | | | PLT-41Michael Leer2015-09-141-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically convert uppercase letters to lowercase in username input box. Validator not changed.
* | | | | | Merge pull request #677 from mattermost/plt-50Joram Wilander2015-09-144-6/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
| * | | | | | Allowing underscores in channel names. Added conversion of some slack ↵Christopher Speller2015-09-144-6/+21
| | |_|/ / / | |/| | | | | | | | | | | | | | | | channel names into valid mattermost names.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-10 05:09:32 +0000