Asaad Mahmood
0fbe63eb37
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
2015-10-16 18:06:40 +05:00
Asaad Mahmood
b00ffa83e7
Multiple UI Improvements
2015-10-16 18:06:22 +05:00
Christopher Speller
89716cb046
Merge pull request #1054 from stasvovk/PLT-637
...
PLT-638: added display tab under account settings. added 24h time option
2015-10-16 08:22:37 -04:00
Christopher Speller
099d853877
Merge pull request #1079 from hmhealey/initprefs
...
Added an initial call to get all user preferences on page load
2015-10-16 08:16:40 -04:00
Joram Wilander
7718783d0c
Merge pull request #1049 from apaatsio/full-teams-data
...
Use display name instead of name in team switcher menu
2015-10-16 07:57:38 -04:00
Stas Vovk
79fcb98084
Merge remote-tracking branch 'upstream/master' into PLT-637
...
Conflicts:
web/react/utils/constants.jsx
2015-10-16 14:21:51 +03:00
Florian Orben
fcce3168b2
PLT-74: Enable Up Arrow keyboard shortcut to edit your last message
...
- fix bug where channel_id was not set if update_post ajax was "too fast"
- fix bug js error if there is no last post, i.e. empty channel
- renamed lastPostId to postId so it has a nicer api to be triggered from everywhere
- fix a typo
- automatically focus textarea on modal open
2015-10-15 21:25:31 +02:00
Florian Orben
551b07960e
PLT-74: Enable Up Arrow keyboard shortcut to edit your last message
2015-10-15 21:25:31 +02:00
hmhealey
327b0b5a21
Added an initial call to get all user preferences on page load
2015-10-15 15:17:07 -04:00
Christopher Speller
8d630fc3ee
Adding ReactDOM as a global
2015-10-15 15:00:28 -04:00
Christopher Speller
1571a9a2df
Fixing most deprication warnings
2015-10-15 15:00:28 -04:00
Asaad Mahmood
3d16d64c0b
Removing my navbar popover changes since Chris has already done the popover changes in his PR
2015-10-15 23:20:15 +05:00
Asaad Mahmood
ac2bac0334
Changing user popover trigger from hover click to just click
2015-10-15 22:57:07 +05:00
Asaad Mahmood
95aaa0a080
Multiple UI Improvements
2015-10-15 22:54:15 +05:00
Christopher Speller
f09685a373
Merge pull request #1057 from hmhealey/plt520
...
PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap
2015-10-15 13:34:42 -04:00
Stas Vovk
2bd81ff379
update posts time in the right sidebar when user changes time format
2015-10-15 19:49:34 +03:00
Antti Ahti
7abde676a1
Fix lint
2015-10-15 19:35:45 +03:00
Christopher Speller
adc20981e2
Merge pull request #1055 from florianorben/PLT-42
...
PLT-42: Add "File uploading" text left of "Add Comment" when file is uploading
2015-10-15 12:22:10 -04:00
Harrison Healey
0fb45dad18
Merge pull request #1065 from apaatsio/clarify-system-menu
...
Add titles to clarify icons in system console
2015-10-15 12:15:28 -04:00
Joram Wilander
3499401aca
Merge pull request #1058 from rgarmsen2295/plt-434
...
PLT-434 Improve Audit History Format
2015-10-15 11:21:53 -04:00
Antti Ahti
37bb95c775
Add titles to clarify icons in system console
...
The + and x icons in the team section can easily be misinterpreted as "Create team" and "Delete team".
Added clarifying title text that the user can see when hovering on the icon.
2015-10-15 12:00:52 +03:00
Antti Ahti
c0809bbc3f
Treat teams as an array instead of object
2015-10-15 08:54:20 +03:00
Antti Ahti
059df3de01
Sort teams by display name
...
First we need to convert the object to array, because objects cannot be sorted.
2015-10-15 08:41:52 +03:00
Reed Garmsen
04ddb3e1b3
Properly handle missing session IDs regardless of case
2015-10-14 15:10:50 -07:00
Reed Garmsen
48c69b86d8
Added all remaining audit descriptions to supported audits
2015-10-14 15:00:03 -07:00
Stas Vovk
440faabc60
fixed style guide error
2015-10-15 00:06:51 +03:00
hmhealey
ae0d4dce7b
Updated More Direct Channels modal and converted it to ReactBootstrap
2015-10-14 16:57:08 -04:00
Reed Garmsen
e7e83b44d8
Added more individual audit handling, primarily involving the user
2015-10-14 12:50:45 -07:00
Reed Garmsen
63b0ca8e4b
Added more supported audits to audit log
2015-10-14 12:50:45 -07:00
Reed Garmsen
487c47e803
Finished structure for formatting audits and began writing individual formatting for each audit
2015-10-14 12:50:45 -07:00
Reed Garmsen
536c55dc5f
Initial changes to audit log along with structure for handling different audit types
2015-10-14 12:50:45 -07:00
Florian Orben
f0a3c59834
PLT-42: Add "File uploading" text left of "Add Comment" when file is uploading
2015-10-14 21:48:32 +02:00
Florian Orben
b8c80c6d95
Don't auto-add http:// to mailto: and ftp: markdown links
2015-10-14 21:44:09 +02:00
Stas Vovk
29a0c182ef
added file with display settings
2015-10-14 21:39:33 +03:00
Stas Vovk
76e278a13d
added display tab under account settings. added 24h time option
2015-10-14 20:36:12 +03:00
Antti Ahti
1ab7034574
Use team display name in team switcher menu
...
- /teams/find_teams returns team objects instead of just team names
- use display_name in UI instead of name in the team switch menu
2015-10-14 18:27:03 +03:00
hmhealey
6c4022337c
Fixed overwritten CSS class in the sidebar
2015-10-14 09:11:35 -04:00
Harrison Healey
962a5d8beb
Merge pull request #1046 from asaadmahmoodspin/ui-improvements
...
Multiple UI Improvements
2015-10-14 09:02:05 -04:00
Christopher Speller
cdbe6342bb
Merge release branch 'release-1.1.0'
2015-10-14 08:27:34 -04:00
Asaad Mahmood
99f243b444
Multiple UI Improvements
2015-10-14 17:04:13 +05:00
Christopher Speller
cbefd88951
Merge pull request #993 from apaatsio/bootstrap-help-block
...
Use help-block class from Bootstrap
2015-10-14 07:39:53 -04:00
Joram Wilander
888ab49e23
Merge pull request #1042 from hmhealey/plt322-followup
...
PLT-322 Fixed leave direct channel button for users with a long username
2015-10-13 22:53:36 -04:00
Joram Wilander
52a87446ce
Merge pull request #1017 from stasvovk/PLT-589
...
PLT-589: changed Admin to Team Admin in Manage Team members
2015-10-13 22:53:01 -04:00
Joram Wilander
a4adc9b95e
Merge pull request #1038 from asaadmahmoodspin/ui-improvements
...
Multiple Ui Improvements
2015-10-13 22:52:28 -04:00
hmhealey
3f2b6bfa27
Fixed leave direct channel button for users with a long username
2015-10-13 18:31:17 -04:00
Harrison Healey
56b02f2eba
Merge pull request #968 from hmhealey/plt322
...
PLT-322 Updated Direct Messages menu
2015-10-13 18:23:53 -04:00
JoramWilander
ac0f8f6bcf
Fix webhook name not overriding in LHS and update webhook help text.
2015-10-13 18:01:11 -04:00
hmhealey
97b2f6ffe7
Made further changes based on feedback
2015-10-13 15:36:58 -04:00
Christopher Speller
1dfffacc31
Merge pull request #1030 from mattermost/Slack-import-UI-update
...
Slack Import changing "Preview" label to "Beta"
2015-10-13 15:23:16 -04:00
hmhealey
17d37816d4
Revert "Modified markdown lexer to not break up words written in snake_case"
...
This reverts commit 787d2ef7bc
2015-10-13 14:36:58 -04:00
