Граф коммитов

599 Коммитов

Автор SHA1 Сообщение Дата
nickago
baebfdcf9f Split up user settings files 2015-08-18 12:20:43 -07:00
hmhealey
0b6fa5db22 Fixed 'X is typing...' messages being malformed when sent to the server 2015-08-18 09:57:54 -04:00
JoramWilander
f4c2a9244c reformat post_list.jsx to match style guide more closely 2015-08-18 09:02:00 -04:00
JoramWilander
5caaface49 reformatted post_right to match style guide more closely 2015-08-18 08:59:27 -04:00
JoramWilander
bb5810e549 reformat post_body.jsx to match style guide more closely 2015-08-18 08:59:27 -04:00
JoramWilander
c9bb7e85f7 fix minor issues caused by rebase 2015-08-18 08:59:27 -04:00
JoramWilander
76d54190a0 reformatting and minor refactoring of post_*.jsx to match style guide 2015-08-18 08:59:27 -04:00
Asaad Mahmood
7e2da89590 MM-319 - Minor ui changes 2015-08-18 08:59:27 -04:00
JoramWilander
265cf7d9f4 add received post action on successful post/comment retry 2015-08-18 08:59:27 -04:00
JoramWilander
4866606eb7 minor bug fixes to pending posts 2015-08-18 08:59:26 -04:00
JoramWilander
fa1491bbfb finalize implenetation of predictive client posts so that users get immediate feedback after posting 2015-08-18 08:59:26 -04:00
JoramWilander
5596a6b37c added client predictive commenting 2015-08-18 08:58:31 -04:00
JoramWilander
32f7b50bb5 adds predictive posting on the client 2015-08-18 08:58:02 -04:00
Christopher Speller
4805608cc9 Merge pull request #391 from asaadmahmoodspin/master
Multiple UI changes
2015-08-18 08:56:24 -04:00
Christopher Speller
2f1dcf6f52 Merge pull request #381 from mattermost/mm-1705
MM-1705 add google as an oauth single-sign-on service
2015-08-18 08:47:35 -04:00
Christopher Speller
96d1eb1c80 Merge pull request #378 from rgarmsen2295/mm-316c
MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them
2015-08-18 08:46:14 -04:00
Joram Wilander
ab197e9835 Merge pull request #352 from nickago/MM-1092
Mm 1092 Renders scrolling in firefox every time for the more channels modal
2015-08-18 07:55:21 -04:00
Joram Wilander
5f7be5c1d3 Merge pull request #374 from nickago/MM-1299
MM-1299 Fixes problem of two notification sounds in firefox
2015-08-18 07:51:04 -04:00
Joram Wilander
ca6f4e9d03 Merge pull request #377 from nickago/MM-1894
Mm 1894 Add state listening to the sidebar relative to the team store
2015-08-18 07:50:08 -04:00
Asaad Mahmood
f68a8c8de3 Multiple UI changes 2015-08-18 11:58:15 +05:00
nickago
602bcc4f38 Moved controlling CSS into post list so it always shows up 2015-08-17 13:23:58 -07:00
Reed Garmsen
e8a291741f Fixed issue with redirects not working on safari 2015-08-17 12:51:09 -07:00
Joram Wilander
646214b49b Revert "Mm 1640 Fixed odd scrolling issues on channel refresh" 2015-08-17 11:35:30 -04:00
nickago
fb9e891246 Added hardcoded firefox function 2015-08-17 08:10:49 -07:00
Christopher Speller
1c65fe1f84 Merge pull request #372 from nickago/MM-1640
Mm 1640 Fixed odd scrolling issues on channel refresh
2015-08-17 09:44:27 -04:00
Joram Wilander
738e53af95 Merge pull request #369 from nickago/MM-1703
MM 1703 Closing access history or activity log returns user to security menu
2015-08-17 09:37:16 -04:00
Joram Wilander
2fbc92af10 Merge pull request #379 from asaadmahmoodspin/mm-1854
mm-1858 - Truncating and adding tooltips to file names
2015-08-17 09:30:53 -04:00
nickago
63005366ad move browser check functionality into a method 2015-08-14 14:21:41 -07:00
nickago
dd8b0acc57 cosmetic refactoring 2015-08-14 14:01:27 -07:00
Asaad Mahmood
5f068109a7 Fixing style guide issues 2015-08-15 01:30:20 +05:00
Asaad Mahmood
8f9f4810a5 Using variables efficiently 2015-08-15 01:17:26 +05:00
Christopher Speller
26a8e19a35 Revert "MM-375 Adds text formatting features using a modified version of the marked js library" 2015-08-14 15:03:32 -04:00
Reed Garmsen
2c098d7711 Small changes to css to clean up code 2015-08-14 11:33:33 -07:00
nickago
6c78ec3439 Changed timeout code to event based 2015-08-14 09:58:12 -07:00
JoramWilander
3faa09c641 reformat login.jsx to meet style guide 2015-08-14 12:38:16 -04:00
JoramWilander
8feec04929 incorporate asaad's UI updates for google sign-up 2015-08-14 12:38:16 -04:00
JoramWilander
b704e9489b added google sign-in functionality to the client, with minor model modifications 2015-08-14 12:38:16 -04:00
nickago
156682e3de Changed user_settings1 to user_settings and removed vestigial css 2015-08-14 09:29:15 -07:00
nickago
5c1bead36a cosmetic refactoring 2015-08-14 09:09:39 -07:00
Asaad Mahmood
9a4a1c5f96 Initialising trimmedFilename variable 2015-08-14 19:38:01 +05:00
Asaad Mahmood
67dc6e60f3 mm-1858 - Truncating and adding tooltips to file names in thumbnail details 2015-08-14 19:36:58 +05:00
Joram Wilander
b9aef9f2a6 Merge pull request #360 from rgarmsen2295/mm-375d
MM-375 Adds text formatting features using a modified version of the marked js library
2015-08-14 09:28:24 -04:00
Christopher Speller
92c4df5b10 Merge pull request #370 from hmhealey/mm1812
MM-1812 Provide warnings on team invite screens when email is disabled
2015-08-14 08:48:24 -04:00
Christopher Speller
a8930cbabe Merge pull request #365 from mattermost/mm-1700
MM-1700 don't pull all channel data all the time
2015-08-14 08:35:19 -04:00
Reed Garmsen
bcea7ae74f Minor cosmetic refactoring of file_upload.jsx 2015-08-13 16:29:02 -07:00
Reed Garmsen
3a55cc6dcb Minor refactoring for better maintainibility 2015-08-13 16:00:55 -07:00
Reed Garmsen
6f68c508ee Better error checking along with other fixes 2015-08-13 15:47:50 -07:00
Reed Garmsen
912ca8e8dd Changed location of file upload overlay 2015-08-13 12:07:32 -07:00
Asaad Mahmood
6ca6072f47 Updating UI to cover RHS and the centre channel separately 2015-08-13 23:33:18 +05:00
Asaad Mahmood
673ca225ca Merge branch 'master' of https://github.com/mattermost/platform into mm-316 2015-08-13 23:11:14 +05:00