IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
925 Commits 845 Branches 1,202 Tags
252d0f3924dd19aa4dd1900c6c00c41c84755d1e
Commit Graph

925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
=Corey Hulen
252d0f3924 Fixes mm-1415 adding email bypass flag 2015-07-12 23:36:52 -08:00
Joram Wilander
27cab0f507 Merge pull request #165 from mattermost/revert-154-MM-831 
Revert "MM-831 Post timestamp now updates in real time"
 2015-07-10 17:49:23 -04:00
Corey Hulen
5bb2acc996 Merge pull request #159 from rgarmsen2295/mm-1269b 
MM-1269b Added yellow tinge to post and comment textbox when connection is disrupted
 2015-07-10 11:26:35 -08:00
Corey Hulen
d124b9df10 Merge pull request #157 from rgarmsen2295/mm-1265 
MM-1265 Button to change roles now shows "click" mouse ptr when hovered over & change with loading more channels
 2015-07-10 11:24:31 -08:00
Reed Garmsen
6f043c5b74 Final change to code affected by change to loading more channels logic 2015-07-10 11:54:36 -07:00
Reed Garmsen
2977467774 Removed test code 2015-07-10 11:49:28 -07:00
Reed Garmsen
2a1cdc68c8 Better logic for checking if channel has loaded 2015-07-10 11:48:52 -07:00
Joram Wilander
947da5d287 Merge pull request #162 from asaadmahmoodspin/master 
UI Improvements for RHS
 2015-07-10 13:56:36 -04:00
Joram Wilander
78cc36fa9a Revert "MM-831 Post timestamp now updates in real time" 2015-07-10 13:49:15 -04:00
Asaad Mahmood
eab6e1360a UI Improvements for RHS 2015-07-10 22:44:05 +05:00
Joram Wilander
f433da2e5f Merge pull request #156 from asaadmahmoodspin/master 
Improving mentions list and other UI improvements
 2015-07-10 12:12:03 -04:00
Asaad Mahmood
7d7a50d6b1 MM-1304 - Quick fix for error on welcome sign up page 2015-07-10 20:56:20 +05:00
Reed Garmsen
184eac99dd Removed extraneous setState 2015-07-10 08:40:38 -07:00
Reed Garmsen
d2e046a98c Changed spacing model of connection flag & removed unnecessary duplication of logic 2015-07-10 08:39:37 -07:00
Asaad Mahmood
14395689ca Merge branch 'master' of https://github.com/mattermost/platform 2015-07-10 20:24:18 +05:00
Joram Wilander
ff128d7c16 Merge pull request #154 from nickago/MM-831 
MM-831 Post timestamp now updates in real time
 2015-07-10 11:07:54 -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
ralder
34cc2fcd53 fix bugs for pr #150 MM-895 2015-07-10 04:36:16 -07:00
Joram Wilander
704b6766b2 Merge pull request #155 from nickago/MM-1296 
MM-1296 Server now notifies users they have been added to a new channel
 2015-07-09 23:22:03 -04:00
Reed Garmsen
b4b0e92fd4 Moved check for existing timer interrupt outside of if-else block for sanity 2015-07-09 18:23:14 -07:00
Reed Garmsen
582c94cee9 Removed newline 2015-07-09 18:18:59 -07:00
Reed Garmsen
eb99363169 Changed method again this time to a timer based system so that when inet does come back the yellow tinge goes away automatically not on user input 2015-07-09 18:17:40 -07:00
Reed Garmsen
7f0d070bf1 Added performance comment 2015-07-09 17:59:13 -07:00
Reed Garmsen
56f369cfd1 Use the AsyncClient call 'updateLastViewedAt' as a way of checking for inet connectivity immediately after clearning yellow bar after user has typed 5 characters 2015-07-09 17:49:02 -07:00
Reed Garmsen
80f9ebadef Added errorchange listener to textbox that detects if inet is not connected. Still do not have reliable way of checking if inet has reconnected 2015-07-09 16:41:33 -07:00
Reed Garmsen
eddf43e133 Notes to myself 2015-07-09 16:41:33 -07:00
Reed Garmsen
212a0da5f4 Removed extraneous console.log functions 2015-07-09 16:26:53 -07:00
Reed Garmsen
95a1540dff Leave result of _getMoreChannels unitialized if it does not yet exist in browser storage to know when list of more channels is loading vs when its empty 2015-07-09 16:25:57 -07:00
Reed Garmsen
ceb243fbb2 The options to change member roles are now links so that they have the 'click' mouse hand when hovered over 2015-07-09 16:04:13 -07:00
nickago
fe6f9437ab Added comments for the force update functions 2015-07-09 14:55:29 -07:00
Asaad Mahmood
53d0420e24 Improving mentions list and other UI improvements 2015-07-10 02:38:19 +05:00
nickago
702112dfb3 Placed event listeners on higher level components to avoid app dispatcher vomit 2015-07-09 14:12:37 -07:00
nickago
04b80b6a25 Merge branch 'master' of https://github.com/mattermost/platform into MM-831 
merge
 2015-07-09 13:44:28 -07:00
Joram Wilander
763618ef36 Merge pull request #151 from asaadmahmoodspin/master 
MM-1469 - Loading message in more channel modal
 2015-07-09 15:26:20 -04:00
nickago
3371f146f8 Minor formatting change 2015-07-09 12:18:43 -07:00
nickago
b1e2eccaf2 Added curly brace 2015-07-09 12:17:16 -07:00
nickago
44000b58d9 Server now notifies users they have been added to a new channel 2015-07-09 12:05:04 -07:00
nickago
38532013fa Time change ping riding on the status interupt for timestamp update 2015-07-09 10:44:23 -07:00
Asaad Mahmood
23c40243a4 Updating font size and margins for loading animation 2015-07-09 21:20:32 +05:00
Asaad Mahmood
c760e06433 Updating Ui for posts 2015-07-09 21:11:47 +05:00
Asaad Mahmood
b61f653626 Merge branch 'master' of https://github.com/mattermost/platform 2015-07-09 21:00:29 +05:00
Joram Wilander
b6fb6ea3be Merge pull request #145 from ralder/fix-tabIndex-channel_invite_modal 
[webui] add missing tabIndex for channel members modal
 2015-07-09 09:37:39 -04:00
Fabian Frei
5df0a55a5a remove newline 2015-07-09 11:42:41 +02:00
Fabian Frei
cb2cb1ee42 added link to manifest.json and ios metatags 2015-07-09 11:24:46 +02:00
Fabian Frei
48c22da847 added manifest.json 2015-07-09 11:24:21 +02: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
Asaad Mahmood
a533ff4d71 MM-1444 - Fixing text selection issue 2015-07-09 02:53:07 +05:00
Joram Wilander
11dde6c44b Merge pull request #150 from mattermost/mm-895 
MM-895 Reorganization of browser storage.
 2015-07-08 14:47:49 -04:00
Joram Wilander
a65b2a2df5 Merge pull request #146 from nickago/MM-1284 
MM-1284 Fixed auto-linking (for good hopefully)
 2015-07-08 14:47:32 -04:00