IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,391 Commits 1,692 Branches 1,583 Tags
cd66b096bb7bd0862661419acecebc54cf5ac3e1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Speller cd66b096bb Updating Dockerfile and Dockerrun.aws.json to point at release 2015-08-05 14:09:54 -04:00
Christopher Speller a2d26be5df Merge pull request #331 from mattermost/060-readme-updates 
Updates to the README for release.
 2015-08-05 12:13:25 -04:00
Christopher Speller 110a1e51a4 Merge pull request #328 from asaadmahmoodspin/mm-1874 
mm-1874 - Improving team url screen and fixing file attachments in IE 10
 2015-08-05 12:09:30 -04:00
Christopher Speller 2e684943b0 Merge pull request #337 from mattermost/docker-config-updates 
Updating docker configuration files for release
 2015-08-05 12:04:52 -04:00
Christopher Speller 49cff876c4 Updating docker configuration files for release 2015-08-05 09:00:26 -04:00
Christopher Speller c21ac25df0 Fixing typeo 2015-08-04 14:49:29 -04:00
Christopher Speller 5a1f4b087f Merge pull request #320 from rgarmsen2295/mm-1873 
Fixed typo on landing page for sign-up
 2015-08-04 14:31:05 -04:00
Christopher Speller 9e4b510adb Merge pull request #319 from mattermost/fix-dist 
Adding docs to build
 2015-08-04 14:30:49 -04:00
Christopher Speller e76fc37b6d Updating dockerfile for 0.6.0-rc1. Moving docker files into versioned directories. 2015-07-31 15:51:36 -04:00
Christopher Speller b1cc1ef0bc Merge pull request #299 from nickago/MM-1734 
MM-1734 Changed language in error message and did cosmetic refactoring
 2015-07-31 12:08:42 -04:00
Christopher Speller ec6d408e29 Merge pull request #303 from nickago/MM-1642 
MM-1642 Updated the password error
 2015-07-31 11:39:00 -04:00
Christopher Speller 6819f85a22 Merge pull request #306 from nickago/MM-1660 
MM-1660 Added singlequotes around 'Edit' and did cosmetic refactoring
 2015-07-31 11:38:30 -04:00
Christopher Speller 7b968a7572 Merge pull request #293 from rgarmsen2295/mm-1725 
MM-1725 Added text to inform the user a session id is not available for a login attempt
 2015-07-31 08:57:51 -04:00
Christopher Speller b7869cdb3c Merge pull request #283 from mattermost/mm-1787 
MM-1787 Fixing links for signup from team invite link.
 2015-07-31 08:56:24 -04:00
Christopher Speller 9cc369b6b6 Removing nickname parameter from FireAndForgetVerifyEmail 2015-07-30 13:42:27 -04:00
Christopher Speller 6222d2cb30 Fixing links for signup from team invite link. Enter now advances signup_user_complete screen. Signin now link now redirects properly. 2015-07-30 08:53:20 -04:00
Christopher Speller 51e244ab5a Merge pull request #282 from nickago/MM-1642 
MM-1642 Updated the password error message to not contain extraneous information
 2015-07-30 08:51:00 -04:00
Christopher Speller 4646c22ef1 Merge pull request #281 from nickago/MM-1600 
MM-1600 Improve quality of error returned upon a duplicate username request
 2015-07-30 08:49:36 -04:00
Christopher Speller b2b6bddadc Merge pull request #272 from rgarmsen2295/mm-1463 
MM-1463 Adds back username initials being included in user's default profile picture
 2015-07-30 08:34:37 -04:00
Christopher Speller c7a8112c17 Moving the handing of extra_info etag before the extra info is retrieved from the database 2015-07-30 08:24:06 -04:00
Christopher Speller 3f97e06bf8 Adding etag to channel extra_info api call. 2015-07-29 14:35:25 -04:00
Christopher Speller 0f54233f66 Merge pull request #277 from mattermost/mm-1741 
MM-1741 updated channel error messages to reflect proper naming
 2015-07-29 12:57:43 -04:00
Christopher Speller d5c5ae0939 Merge pull request #269 from rgarmsen2295/mm-1686 
MM-1686 Access History and Active Sessions now load upon opening instead of at start
 2015-07-29 12:55:57 -04:00
Christopher Speller 9913895423 Merge pull request #259 from nickago/MM-1683 
MM-1683 Removed a vestigial wait condition from the signup process.
 2015-07-29 12:55:31 -04:00
Christopher Speller a9e9d10e41 Merge pull request #252 from rgarmsen2295/ie10-image-regression-fix 
Fixes issue with images not displaying in IE10 due to window.location.origin not being defined in IE10
 2015-07-29 08:32:48 -04:00
Christopher Speller 35fe9655c3 Merge pull request #267 from nickago/MM-1652 
MM-1652 Fixed typo in delete post modal
 2015-07-29 08:31:00 -04:00
Christopher Speller 9e64500e31 Fixing spelling and clarifying a few parts of style guide. 2015-07-29 08:20:26 -04:00
Christopher Speller bf5548ad6d Minor tweaks to style guide 2015-07-28 12:14:40 -04:00
Christopher Speller 5a4b736c8a Adding style guide 2015-07-28 12:10:14 -04:00
Christopher Speller 3d94d047c0 Adding rest of directories to eslint list 2015-07-28 11:57:25 -04:00
Christopher Speller 2602f3b49e Merge pull request #255 from hmhealey/mm1682 
MM-1682 Allow files without file extensions to be attached to messages
 2015-07-28 11:14:16 -04:00
Christopher Speller 18aaa9d175 Adding check target to makefile to run eslint. Adding eslint to package.json 2015-07-28 10:24:24 -04:00
Christopher Speller ec2e61bc55 Merge pull request #253 from nickago/MM-1654 
MM-1654 Anti-clickjacking measures
 2015-07-28 10:03:10 -04:00
Christopher Speller c1637ce113 Configuration for eslintrc 2015-07-28 09:53:04 -04:00
Christopher Speller de07cdaf29 Merge pull request #239 from nickago/MM-1295 
MM-1295 Removal from a channel occurs in real time
 2015-07-28 08:49:29 -04:00
Christopher Speller 432e96f52c Merge pull request #257 from mattermost/mm-1502 
Fixes mm-1502 changing session age to 30 days
 2015-07-28 08:31:23 -04:00
Christopher Speller 32e8dddd0c Merge pull request #242 from asaadmahmoodspin/master 
UI Fixes
 2015-07-23 15:03:05 -04:00
Christopher Speller d9175d7525 Merge pull request #243 from hmhealey/mm1678 
MM-1678 Fixed sidebar so that it can open threads containing non-image attachments
 2015-07-23 15:02:52 -04:00
Christopher Speller 772e644343 Merge pull request #244 from rgarmsen2295/mm-1610 
MM-1610 Fixed issue with error message for uploading more than 5 files not appearing on OSX
 2015-07-23 14:56:53 -04:00
Christopher Speller 03cd1cc7d6 Small patch for a null TypeError in post_list updating code 2015-07-22 09:51:42 -04:00
Christopher Speller eb7c08ab00 Merge pull request #231 from mattermost/file-fixes 
More patches for files
 2015-07-22 08:54:54 -04:00
Christopher Speller 495a9d7be5 Merge pull request #230 from mattermost/download-link-fix 
fixed download link in image viewer
 2015-07-22 08:37:36 -04:00
Christopher Speller 2384951a4c Merge pull request #224 from hmhealey/mm1625 
MM-1625 Correct the appearance of the post menu on both desktop and mobile
 2015-07-22 08:33:59 -04:00
Christopher Speller 06bac01e88 Merge pull request #227 from mattermost/files-patch 
Fixing image previews.
 2015-07-21 18:50:01 -04:00
Christopher Speller 2d51e93d8e Fixing image previews 2015-07-21 18:44:03 -04:00
Christopher Speller 73ee387319 Fixing issues with files trasitioning to relative paths 2015-07-21 18:06:30 -04:00
Christopher Speller 1c08a33b92 Fixing file uploads and previews for new /team/ URL structure 2015-07-21 16:54:24 -04:00
Christopher Speller f5837c1b64 Old files are saved with full paths, this changes so that new files are not saved with absolute paths and detects old files saved and fixes them. 2015-07-21 16:25:49 -04:00
Christopher Speller a820b67468 Merge pull request #211 from rgarmsen2295/mm-1186 
MM-1186 Adds channel name to RHS comment threads
 2015-07-20 18:06:01 -04:00
Christopher Speller c6fb95912b Changing the way we mattermost handles URLs. team.domain.com becomes domain.com/team. 
Renaming team.Name to team.DisplayName and team.Domain to team.Name.
So: team.Name -> url safe name. team.DisplayName -> nice name for users
 2015-07-20 17:45:23 -04:00
Christopher Speller 1d7509493e Merge pull request #203 from nickago/MM-1601 
MM-1601 Fixed typo in reset password field
 2015-07-17 14:24:32 -04:00
Christopher Speller 09b2fda4f6 Fixing grammar 2015-07-17 10:24:43 -04:00
Christopher Speller dc84a2e727 Modifications to readme for mm-1356 2015-07-17 10:03:33 -04:00
Christopher Speller f49fccdee3 Merge pull request #196 from nickago/MM-1058 
MM-1058 Added last updated for pictures
 2015-07-17 09:44:51 -04:00
Christopher Speller 31e9c6ae49 Merge pull request #189 from nickago/MM-1591 
MM-1591 Fixed typo, returned password flow to standard model
 2015-07-15 12:10:23 -04:00
Christopher Speller e38ea318a1 Merge pull request #158 from nickago/MM-975 
MM-975 Added timestamps to pictures to stop caching
 2015-07-13 14:36:27 -04:00
Christopher Speller 6447af758c Merge pull request #163 from ralder/fix-and-refactor-browser-store 
[webui] second bugfix for pr #150 and refactor BrowserStore
 2015-07-13 12:07:50 -04:00
Christopher Speller ae939cb98d Merge pull request #160 from ralder/fix-pr-150-MM-895 
[webui] fix bugs for pr #150 MM-895
 2015-07-10 09:08:33 -04:00
Christopher Speller d254b64159 Merge pull request #152 from faebser/manifest-for-mobile 
Manifest for mobile
 2015-07-10 08:42:14 -04:00
Christopher Speller 3ad2098926 Merge pull request #149 from rgarmsen2295/mm-1260 
MM-1260 Member Invites can no longer be sent to emails already used to signup
 2015-07-08 20:24:39 -04:00
Christopher Speller ce5639a629 Adding comments to change versions in sync 2015-07-08 12:43:23 -04:00
Christopher Speller d5785ee901 Finishing centralization of BrowserStore 2015-07-08 12:38:14 -04:00
Christopher Speller 7f5ebb42b5 Modifying all storage to use session storage. Also adding an abstraction layer to add current user id as a prefix to most keys. 2015-07-08 09:55:24 -04:00
Christopher Speller 450821bcba Merge pull request #148 from hmhealey/mm1488 
MM-1488 Changed code to dismiss mention list to not trigger when you click on the list itself
 2015-07-08 09:01:17 -04:00
Christopher Speller 4e856c29b2 Merge pull request #138 from hmhealey/mm756 
MM-756 Don't mark channels as unread after user joined/left messages
 2015-07-07 13:36:05 -04:00
Christopher Speller 95b9f87288 Merge pull request #141 from hmhealey/profilepicture32bit 
Fix an out of bounds exception when generating profile pictures on 32 bit installations
 2015-07-07 08:44:29 -04:00
Christopher Speller 982c9eeceb Merge pull request #134 from nickago/MM-1313 
Mm 1313 Made the typing notification more responsive/accurate
 2015-07-07 08:30:56 -04:00
Christopher Speller 10b625ba17 Merge pull request #128 from rgarmsen2295/mm-832 
MM-832 Fixed not being able to open channel notifications settings menu in IE10
 2015-07-06 12:07:56 -04:00
Christopher Speller 681d4d3b78 Merge pull request #125 from asaadmahmoodspin/master 
MM-1319 - Copy link and background change
 2015-07-02 17:21:15 -04:00
Christopher Speller 4adecf8198 Merge pull request #117 from nickago/MM-1308 
MM-1308 Changed offline timeout to 1 mintue
 2015-07-02 07:55:35 -04:00
Christopher Speller 7a7be75e74 Merge pull request #109 from nickago/MM-1289 
Mm 1289 Now sorts extra channel members lexigraphically
 2015-06-30 14:06:00 -04:00
Christopher Speller aa023c8b08 Merge pull request #108 from rgarmsen2295/mm-1309 
MM-1309 Fixed grammmatical issue in error message
 2015-06-30 14:03:23 -04:00
Christopher Speller ae21685e35 Merge pull request #107 from mattermost/revert-91-MM-1289 
Revert "MM-1289 Sorted the channel members popover lexigraphically"
 2015-06-30 10:24:15 -04:00
Christopher Speller 3943d6a209 Revert "MM-1289 Sorted the channel members popover lexigraphically" 2015-06-30 10:23:46 -04:00
Christopher Speller 236f7a9bd2 Merge pull request #101 from rgarmsen2295/mm-983 
MM-983 Fixed file preview removal in IE10
 2015-06-30 08:07:13 -04:00
Christopher Speller ae86eab289 Merge pull request #91 from nickago/MM-1289 
MM-1289 Sorted the channel members popover lexigraphically
 2015-06-30 08:06:05 -04:00
Christopher Speller 5113699a86 Spacing in the notes section 2015-06-22 15:35:01 -04:00
Christopher Speller 9fcc9fed09 Spacing in the notes section 2015-06-22 15:35:01 -04:00
Christopher Speller 7c89e94d83 Sections for install instructions 2015-06-22 15:31:24 -04:00
Christopher Speller 2e804c79b8 Sections for install instructions 2015-06-22 15:31:24 -04:00
Christopher Speller 6207f2b7e8 Changing test images 2015-06-22 08:37:20 -04:00
Christopher Speller ba8f9c40dd Changing test images 2015-06-22 08:37:20 -04:00
Christopher Speller cf73cd1d63 Changing test images 2015-06-22 08:37:20 -04:00
Christopher Speller 172f05d216 Changing test images 2015-06-22 08:37:20 -04:00
Christopher Speller 053d8fe779 Merge pull request #44 from mattermost/readme 
Require single instance
 2015-06-19 15:57:24 -04:00
Christopher Speller b49501b7c0 Merge pull request #44 from mattermost/readme 
Require single instance
 2015-06-19 15:57:24 -04:00
Christopher Speller 44daae1a7e Merge pull request #44 from mattermost/readme 
Require single instance
 2015-06-19 15:57:24 -04:00
Christopher Speller 1d18d796c6 Merge pull request #44 from mattermost/readme 
Require single instance
 2015-06-19 15:57:24 -04:00
Christopher Speller 9b4cdea40b Require single instance 2015-06-19 15:56:37 -04:00
Christopher Speller bfceb87efe Require single instance 2015-06-19 15:56:37 -04:00
Christopher Speller 53e4c09596 Require single instance 2015-06-19 15:56:37 -04:00
Christopher Speller 38f247e424 Require single instance 2015-06-19 15:56:37 -04:00
Christopher Speller 213129255d Merge pull request #42 from mattermost/readme 
Linebreaks HELIUM
 2015-06-19 12:50:58 -04:00
Christopher Speller 378397dd8e Merge pull request #42 from mattermost/readme 
Linebreaks HELIUM
 2015-06-19 12:50:58 -04:00
Christopher Speller 8f0b6d6c36 Merge pull request #42 from mattermost/readme 
Linebreaks HELIUM
 2015-06-19 12:50:58 -04:00
Christopher Speller 07c65be91c Merge pull request #42 from mattermost/readme 
Linebreaks HELIUM
 2015-06-19 12:50:58 -04:00
Christopher Speller 88af193576 Linebreaks 2015-06-19 12:49:22 -04:00
Christopher Speller dd0a179f33 Linebreaks 2015-06-19 12:49:22 -04:00
Christopher Speller d83768a2e0 Linebreaks 2015-06-19 12:49:22 -04:00
Christopher Speller b72b25f30a Linebreaks 2015-06-19 12:49:22 -04:00