summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Changed user_settings1 to user_settings and removed vestigial cssnickago2015-08-148-25/+15
| | | | | |
| * | | | | cosmetic refactoringnickago2015-08-142-64/+74
| | | | | |
| * | | | | Fixed camelCase typosnickago2015-08-111-2/+2
| | | | | |
| * | | | | Cosmetic refactoring and removing no-op condition of set statenickago2015-08-112-15/+20
| | | | | |
| * | | | | access history and activity log closing re-opens user settings in correct statenickago2015-08-113-5/+13
| | | | | |
* | | | | | Merge pull request #379 from asaadmahmoodspin/mm-1854Joram Wilander2015-08-172-6/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | mm-1858 - Truncating and adding tooltips to file names
| * | | | | | Fixing style guide issuesAsaad Mahmood2015-08-151-3/+2
| | | | | | |
| * | | | | | Using variables efficientlyAsaad Mahmood2015-08-151-3/+3
| | | | | | |
| * | | | | | Initialising trimmedFilename variableAsaad Mahmood2015-08-141-0/+1
| | | | | | |
| * | | | | | mm-1858 - Truncating and adding tooltips to file names in thumbnail detailsAsaad Mahmood2015-08-142-6/+13
| | | | | | |
* | | | | | | Merge pull request #384 from mattermost/it33-patch-1Joram Wilander2015-08-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added missing "is"
| * | | | | | | Added missing "is"it332015-08-151-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #382 from mattermost/revert-360-mm-375dChristopher Speller2015-08-1419-2065/+119
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Revert "MM-375 Adds text formatting features using a modified version…
| * | | | | | Revert "MM-375 Adds text formatting features using a modified version of the ↵Christopher Speller2015-08-1419-2065/+119
|/ / / / / / | | | | | | | | | | | | | | | | | | marked js library"
* | | | | | Merge pull request #360 from rgarmsen2295/mm-375dJoram Wilander2015-08-1419-119/+2065
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-375 Adds text formatting features using a modified version of the marked js library
| * | | | | | Cosmetic refactoring of the notifyMe function in utils.jsx and removed ↵Reed Garmsen2015-08-123-452/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary files
| * | | | | | Minor change to bold and italic parsing to be more similar to code parsingReed Garmsen2015-08-121-2/+2
| | | | | | |
| * | | | | | Cosmetic refactoring of post_body.jsxReed Garmsen2015-08-125-66/+46
| | | | | | |
| * | | | | | Cosmetic refactoring of textToJsx functionReed Garmsen2015-08-121-82/+131
| | | | | | |
| * | | | | | Implemented basic text formatting package using a modfied version of the ↵Reed Garmsen2015-08-1221-42/+2387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | marked js library. Supports *bold*, _italics_, and `code`
* | | | | | | Merge pull request #370 from hmhealey/mm1812Christopher Speller2015-08-1410-292/+546
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1812 Provide warnings on team invite screens when email is disabled
| * | | | | | | Removed isEmailEnabledSynchronous and switched the email disabled warnings ↵hmhealey2015-08-134-28/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use ConfigStore
| * | | | | | | Added ConfigStore that is populated from the serverhmhealey2015-08-137-3/+123
| | | | | | | |
| * | | | | | | Reformatted code to match the style guidehmhealey2015-08-113-262/+306
| | | | | | | |
| * | | | | | | Disabled the invite members dialog when email is disabled on the serverhmhealey2015-08-112-11/+56
| | | | | | | |
| * | | | | | | Disabled the invite email portion of the team setup when email is disabled ↵hmhealey2015-08-111-23/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on the server
| * | | | | | | Added initial api to allow clientside code to query serverside configurationhmhealey2015-08-113-0/+45
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #365 from mattermost/mm-1700Christopher Speller2015-08-1418-367/+869
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | MM-1700 don't pull all channel data all the time
| * | | | | | removed underscores from function names in channel_storeJoramWilander2015-08-131-34/+34
| | | | | | |
| * | | | | | merge fixJoramWilander2015-08-111-2/+2
| | | | | | |
| * | | | | | switch to channel after creationJoramWilander2015-08-111-2/+1
| | | | | | |
| * | | | | | format channel_store to more closely match style guide and sort channels in ↵JoramWilander2015-08-112-226/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | channel store over sidebar
| * | | | | | don't refresh page on channel creation and ignore case when sorting channels ↵JoramWilander2015-08-112-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in sidebar
| * | | | | | update rename channel modal to not refresh page on channel name changeJoramWilander2015-08-113-13/+39
| | | | | | |
| * | | | | | fixed channel counts etag to only update when appropriateJoramWilander2015-08-112-4/+13
| | | | | | |
| * | | | | | fix channelIdWithCountAndUpdateAt naming to be proper camel caseJoramWilander2015-08-111-2/+2
| | | | | | |
| * | | | | | change getChannel api service to not register as user activityJoramWilander2015-08-111-1/+1
| | | | | | |
| * | | | | | add etag cache testing to api GetChannelCounts unit testJoramWilander2015-08-111-0/+7
| | | | | | |
| * | | | | | added api unit test for GetChannelCountsJoramWilander2015-08-112-0/+43
| | | | | | |
| * | | | | | added store unit test for GetChannelCountsJoramWilander2015-08-111-0/+47
| | | | | | |
| * | | | | | incorporate channel updateAt into channel counts and pull channel data on ↵JoramWilander2015-08-115-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | channel update
| * | | | | | added getChannelCounts service and refactored the client to more ↵JoramWilander2015-08-1110-165/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | intelligently pull channel data
| * | | | | | added getChannel api service and use that over getChannels where appropriate ↵JoramWilander2015-08-1110-10/+190
| |/ / / / / | | | | | | | | | | | | | | | | | | on client
* | | | | | Merge pull request #371 from nickago/MM-1229Joram Wilander2015-08-131-19/+36
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | MM-1229 Mobile client display public link in same tab instead of new tab
| * | | | | Added cosmetic refactoringnickago2015-08-131-17/+23
| | | | | |
| * | | | | get public link now displays in the same window pane on mobile, but in a new ↵nickago2015-08-111-3/+14
| |/ / / / | | | | | | | | | | | | | | | tab on desktop. Also added proptypes
* | | | | Merge pull request #368 from nickago/MM-1911Harrison Healey2015-08-123-19/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | | MM 1911 Added support for .jpeg in addition to .jpg
| * | | | Fixed typonickago2015-08-121-1/+1
| | | | |
| * | | | Cosmetic refactoringnickago2015-08-111-10/+17
| | | | |
| * | | | Added server side validation of jpegs as imagesnickago2015-08-112-8/+2
| | | | |