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

910 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
df2d668d59 Merge pull request #730 from mattermost/shorten-description-help-text
Shorten description help text
2015-09-22 00:42:44 -07:00
it33
80488dec22 Adjusting sentence 2015-09-21 15:26:44 -07:00
JoramWilander
3e868a6042 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. 2015-09-21 11:30:08 -04:00
Joram Wilander
a35fa9c974 Merge pull request #732 from mattermost/plt-243
PLT-243 Adding new create channel modal to the more menu
2015-09-21 11:18:24 -04:00
hmhealey
d1101e3c91 Wrapped comment messages in divs like posts in the center pane 2015-09-21 10:03:47 -04:00
Christopher Speller
05b4a14d1e Adding new create channel modal to the more menu 2015-09-21 09:40:45 -04:00
Joram Wilander
7255209b72 Merge pull request #722 from hmhealey/timestamp
Added a tooltip to post timestamps displaying the actual time the post was created
2015-09-21 08:38:27 -04:00
Christopher Speller
4578138d57 Merge pull request #731 from asaadmahmoodspin/new-channel
Updating new channel UI
2015-09-21 08:25:41 -04:00
Asaad Mahmood
5dbdc0ff76 Updating new channel UI 2015-09-21 11:09:23 +05:00
it33
814e467435 Shorten description help text
Currently it word wraps, this prevents word-wrapping
2015-09-20 21:24:27 -07:00
hmhealey
bb330b662a Added marked library to text_formatting.jsx 2015-09-19 10:08:59 -04:00
hmhealey
cfc919d111 Added a tooltip to post timestamps displaying the actual time the post was created 2015-09-19 09:18:27 -04:00
=Corey Hulen
cdf813f07b merging 2015-09-18 09:25:47 -07:00
Joram Wilander
5a436fd447 Merge pull request #699 from mattermost/PLT-92
PLT-92 Adding server side versioning to the binary
2015-09-18 12:22:57 -04:00
=Corey Hulen
60af1fad1f Moving logout item 2015-09-17 22:25:37 -07:00
=Corey Hulen
804b696bdc PLT-11 adding config for logs to UI 2015-09-17 22:00:33 -07:00
=Corey Hulen
44714dfcb1 PLT-11 Adding ability to save config file 2015-09-17 21:00:59 -07:00
Corey Hulen
82127341ca Merge pull request #705 from esethna/patch-1
Grammar change to New Channel ui text
2015-09-17 13:25:21 -07:00
=Corey Hulen
c63da24964 moving to security tab 2015-09-17 13:24:55 -07:00
=Corey Hulen
af4deb2369 Making changes to versioning 2015-09-17 13:01:40 -07:00
=Corey Hulen
9b5198c69c Merge branch 'master' into PLT-92 2015-09-17 09:21:56 -07:00
Joram Wilander
7901126b63 Merge pull request #701 from mattermost/PLT-40
PLT-40 adding experimental support for emojis
2015-09-17 11:56:59 -04:00
esethna
aa79a12a31 Grammar change to New Channel ui text 2015-09-17 09:56:42 -06:00
Joram Wilander
fd3a7afb3e Merge pull request #702 from mattermost/oauth-switch-fix
Properly check if OAuth providing is enabled on the client.
2015-09-17 07:53:02 -04:00
JoramWilander
ce19b3c211 Properly check if OAuth providing is enabled on the client. 2015-09-17 07:46:38 -04:00
=Corey Hulen
99d0db136c Fixing css 2015-09-16 23:27:25 -07:00
=Corey Hulen
8e848f38d5 PLT-40 adding experimental support for emojis 2015-09-16 23:22:15 -07:00
=Corey Hulen
4352118700 Adding version to UI 2015-09-16 20:16:42 -07:00
Christopher Speller
acf2fb64b4 Cleaned up logic for the unread indicators 2015-09-16 17:08:05 -04:00
hmhealey
7e66a3d5be Moved unread channel indicators into their own React component and file 2015-09-16 16:51:16 -04:00
hmhealey
8d0c69aec6 Properly hide unread channel indicators when there are no unread channels 2015-09-16 16:51:16 -04:00
JoramWilander
47e6a33a45 Implement OAuth2 service provider functionality. 2015-09-16 15:49:12 -04:00
Christopher Speller
7e418714bc Merge pull request #687 from mattermost/PLT-93
PLT-93 Cleaning up client side configs
2015-09-16 12:52:50 -04:00
Asaad Mahmood
28b61e6437 UI Updates for multiple tickets 2015-09-16 20:32:10 +05:00
=Corey Hulen
2fc01df828 Fixing eslint problems 2015-09-15 19:34:02 -07:00
=Corey Hulen
5e2f701e6c Removing old config stuff 2015-09-15 19:09:50 -07:00
=Corey Hulen
b2a679c25d PLT-93 cleaing up client side configs 2015-09-15 18:59:14 -07:00
Christopher Speller
1bbb5265be Merge pull request #681 from mattermost/PLT-12-log
PLT-12 Adding server logs viewer to admin console
2015-09-15 15:59:29 -04:00
=Corey Hulen
23a1311ef5 Moving style into css 2015-09-15 09:19:29 -07:00
Christopher Speller
56dfdb8bd8 Fixing long channel name overflow by changing text to Edit 2015-09-15 10:49:46 -04:00
Joram Wilander
4a9984d166 Merge pull request #676 from hmhealey/mm1900b
MM-1900 Removed textToJsx
2015-09-15 08:20:01 -04:00
=Corey Hulen
3bd350dcaf Merge branch 'master' into PLT-12-log 2015-09-14 16:59:24 -07:00
Corey Hulen
bfebb41bc0 Merge pull request #678 from mattermost/mm-1589
PLT-171 MM-1589 New add channel modal using react-bootstrap.
2015-09-14 16:57:54 -07:00
Harrison Healey
c447db6e78 Merge pull request #679 from mattermost/fix-file-content-type
Blank Content-Type for file GETs.
2015-09-14 16:17:22 -04:00
Joram Wilander
312f7d7656 Merge pull request #674 from Trozz/PLT-41
PLT-41 Automatically convert uppercase letters to lowercase in username input box.
2015-09-14 14:45:33 -04:00
Joram Wilander
125b7dc71b Merge pull request #677 from mattermost/plt-50
PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
2015-09-14 14:32:15 -04:00
Michael Leer
c961c529af update remaining web files tolowercase 2015-09-14 19:29:56 +01:00
JoramWilander
0654b0c06b Blank Content-Type for file GETs. 2015-09-14 14:18:01 -04:00
Christopher Speller
0ea0233c50 New add channel modal using react-bootstrap. 2015-09-14 13:56:58 -04:00
Corey Hulen
8d021a13f8 Merge pull request #668 from nickago/MM-1958
MM-1958 please read comment, base video player
2015-09-14 10:18:24 -07:00