summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Added two possible options for removing blue bar error, will choose one laterReed Garmsen2015-07-021-1/+1
|
* Added line that disables caching with a ajax client call that was causing ↵Reed Garmsen2015-07-021-0/+1
| | | | errors to be thrown in IE10
* Restructured logic to flow more naturally and be cleanerReed Garmsen2015-07-021-42/+44
|
* Added logic for loading animation to appear when posts have yet to be ↵Reed Garmsen2015-07-022-5/+15
| | | | loaded. Added markup necessary for loading animation css. Removed a file that was no longer needed for the design.
* Added new files for adding new loading animationReed Garmsen2015-07-021-0/+3
|
* MM-1319 - Copy link and background changeAsaad Mahmood2015-07-181-1/+1
|
* Merge pull request #123 from asaadmahmoodspin/mm-1426Corey Hulen2015-07-023-14/+30
|\ | | | | MM-1426 - Updating UI
| * Changing var currentUser in post_rightAsaad Mahmood2015-07-171-6/+6
| |
| * Changing var name from currentUser to currentUserCssAsaad Mahmood2015-07-171-3/+3
| |
| * Merge pull request #2 from rgarmsen2295/mm-1453asaadmahmoodspin2015-07-022-8/+24
| |\ | | | | | | MM-1453 Added additional class to the markup indicating if the post came from the current user
| | * Added additional class to the markup indicating if the post came from the ↵Reed Garmsen2015-07-022-8/+24
| | | | | | | | | | | | current user
| * | Merge branch 'master' of https://github.com/mattermost/platform into mm-1426Asaad Mahmood2015-07-171-11/+13
| |\ \
| * | | Improving modal UIAsaad Mahmood2015-07-171-3/+3
| | | |
| * | | Improving channel notificationsAsaad Mahmood2015-07-171-3/+3
| | |/ | |/|
* | | Merge pull request #121 from rgarmsen2295/mm-1445Corey Hulen2015-07-021-3/+4
|\ \ \ | |_|/ |/| | MM-1445 Changed valet title and description for clarity
| * | Changed valet title and description for clarityReed Garmsen2015-07-021-3/+4
| |/
* | make loop simplerJoramWilander2015-07-021-1/+1
| |
* | fix getDirectTeammate so that if teammate is the second id it doesn't return ↵JoramWilander2015-07-021-11/+13
|/ | | | null
* Merge pull request #118 from nickago/MM-1363Joram Wilander2015-07-021-3/+10
|\ | | | | Mm 1363 Limit uploads to only JPEGs for profile pictures
| * Changed ordering of steps for upload to imporve astheticnickago2015-07-011-2/+4
| |
| * Restricted profile picture uploads to just JPEGsnickago2015-07-011-1/+6
| |
* | Merge pull request #115 from nickago/MM-1425Corey Hulen2015-07-015-8/+8
|\ \ | | | | | | MM-1425 Facelifted "direct message" to "private message"
| * | Facelifted "direct message" to "private message"nickago2015-07-015-8/+8
| |/
* / Finally fixed the git weirdnessnickago2015-07-014-14/+27
|/
* Merge pull request #110 from nickago/MM-1430Corey Hulen2015-06-301-2/+2
|\ | | | | MM-1430 Added the ability to have hashtags with dashes in them
| * Added the ability to have hashtags with dashes in themnickago2015-06-301-2/+2
| |
* | Merge pull request #102 from nickago/MM-1328Corey Hulen2015-06-301-1/+3
|\ \ | | | | | | MM-1328 Now limits domain to just alphanumeric
| * | Aligned front end and back end domain requirementsnickago2015-06-301-1/+3
| |/
* | Removed unnecessary loop copyingReed Garmsen2015-06-301-5/+1
| |
* | Changed keyword logic to use arrays rather than maps to remove highlighting ↵Reed Garmsen2015-06-301-5/+5
|/ | | | of js object properties like constructor and __proto__
* Merge pull request #109 from nickago/MM-1289Christopher Speller2015-06-301-3/+10
|\ | | | | Mm 1289 Now sorts extra channel members lexigraphically
| * Added extra precaution to avoid null errornickago2015-06-301-7/+9
| |
| * MM-1289 Now sorts users in lexigraphical order in extra members popovernickago2015-06-301-1/+6
| |
* | Merge pull request #108 from rgarmsen2295/mm-1309Christopher Speller2015-06-301-1/+1
|\ \ | | | | | | MM-1309 Fixed grammmatical issue in error message
| * | Fixed grammmatical issue in error messageReed Garmsen2015-06-301-1/+1
| |/
* | Merge pull request #106 from mattermost/mm-1119Joram Wilander2015-06-307-11/+74
|\ \ | |/ |/| fixes mm-1119 adds @all and @channel mention capabilites
| * @all and @channel now highlight like other mentionsJoramWilander2015-06-302-2/+8
| |
| * add default icon for non-user autocompletesJoramWilander2015-06-301-2/+8
| |
| * @all and @channel now auto-completeJoramWilander2015-06-294-3/+17
| |
| * added team-wide and channel-wide mentionsJoramWilander2015-06-291-5/+42
| |
* | Revert "MM-1289 Sorted the channel members popover lexigraphically"Christopher Speller2015-06-301-6/+1
| |
* | Merge pull request #101 from rgarmsen2295/mm-983Christopher Speller2015-06-301-1/+1
|\ \ | | | | | | MM-983 Fixed file preview removal in IE10
| * | Changed file preview removal from using dataset which is unsupported in ie10 ↵Reed Garmsen2015-06-291-1/+1
| |/ | | | | | | to using the getAttribute method which is backwards and forwards compatible
* | Merge pull request #91 from nickago/MM-1289Christopher Speller2015-06-301-1/+6
|\ \ | | | | | | MM-1289 Sorted the channel members popover lexigraphically
| * | Added semicolonsnickago2015-06-291-2/+2
| | |
| * | Sorted the channel members popover lexigraphicallynickago2015-06-291-1/+6
| |/
* | Merge pull request #103 from nickago/MM-1293Joram Wilander2015-06-301-1/+1
|\ \ | | | | | | MM-1293 Updated file display key to avoid child flattening
| * | Changed the style of key-assignment to allow for more assured variancenickago2015-06-291-2/+1
| | |
| * | Updated file display key to avoid child flatteningnickago2015-06-291-1/+2
| |/
* / add intro text specific to off-topic channelJoramWilander2015-06-292-1/+13
|/
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 14:51:03 +0000