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

1713 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
6bf080393d Fixing race conditions in the code base (#5966)
* Adding initial race detector

* Remove setting of config twice

* Fixing config file watch and config reload on license save

* Fixing config file watch and config reload on license save

* Fixing build error

* Fixing locking issue

* Fixing makefile

* Fixing race in config

* Fixing race in status unit test

* Adding EE race tests

* Fixing race in cluster info

* Removing code that's isn't needed

* Fixing some more races

* Fixing govet issue
2017-04-04 14:42:07 -04:00
enahum
0b5c0794fd PLT-5906 Set logs path instead log filename (#5949)
* PLT-5906 Set logs path instead log filename

* feedback review
2017-04-04 18:13:31 +01:00
Harrison Healey
ac0c7e30ca PLT-3958 Updated title for permalink error page (#5970) 2017-04-04 18:10:55 +01:00
Christopher Speller
cbb6a30596 Adding more text to webpack build so jenkins doesn't timeout (#5972) 2017-04-04 12:33:56 -04:00
Harrison Healey
6ae3464484 Fixed pasting images not working (#5971) 2017-04-04 12:25:55 -04:00
Harrison Healey
c7bdce8a66 PLT-5900 Removed automatic configuration of SiteURL (#5952)
* Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)"

This reverts commit a8e68bd890.

* Removed automatic configuration of SiteURL

* Reverted unintentional config changes

* Updated help text

* Added link to docs in Site URL warning

* Fixed merge conflict
2017-04-04 11:54:52 -04:00
enahum
3a79e451ff translations PR 20170403 (#5964) 2017-04-04 12:44:38 -03:00
doh5
adb22a8a85 Add ID to siderbar_header_dropdown_button (#5967)
under testing
2017-04-04 08:25:53 -07:00
Harrison Healey
c4fd04efb6 Fixed channel autocomplete flickering (#5961) 2017-04-03 21:22:09 -07:00
Harrison Healey
5cd0d5b87e Fixed console error thrown by PostList when switching teams (#5960) 2017-04-03 21:21:47 -07:00
Harrison Healey
410aaab6c5 Added SidebarHeaderDropdownButton to stop console warning (#5959) 2017-04-03 21:21:33 -07:00
Harrison Healey
63cdb89144 PLT-6147 Fixed reactions not rendering properly while loading (#5958) 2017-04-03 21:21:15 -07:00
Harrison Healey
348374fba5 PLT-6098 Added Manage Teams modal to System Console users list (#5914)
* Added Manage Teams modal to System Console users list

* Localized ManageTeamsModal

* Fixed borders between Manage Teams list items

* Updated appearance of ManageTeamsModal

* Fixed admin being redirected from system console when removing self from a team

* Sorted teams in ManageTeamsModal

* Updated Manage Teams styling
2017-04-03 21:18:04 -07:00
Jason Blais
d5f56e678a Update UI text for emoji picker setting (#5963)
* Update user_settings_advanced.jsx

* Update en.json
2017-04-03 21:27:45 -04:00
Ryan Wang
169c490892 Save recently used emojis after logout (#5926) 2017-04-03 21:27:14 -04:00
Asaad Mahmood
4ebc85e05c Ui improvements (#5948)
* PLT-5849 - Code block wrap on IOS

* PLT-5972 - Comment has first line indented

* PLT-6048 - Adjusting UI for link previews

* PLT-5733 - Adding error text theme option
2017-04-03 10:38:15 -07:00
Joram Wilander
68bb5a2ec8 Replace initial load of user's channel members for all teams with a lazy load (#5942) 2017-04-03 10:36:47 -07:00
Harrison Healey
36c74d7b47 PLT-5873 Renamed private groups to private channels (#5924)
* PLT-5873 Renamed private groups to private channels in web app

* PLT-5873 Renamed private groups to private channels in server
2017-04-03 13:42:05 +01:00
doh5
06e09a0553 Add IDs to the Admin Sidebar Section (#5909)
* Add IDs to the Admin Sidebar Section

Under Testing

* Update admin_sidebar_section.jsx

* Update admin_sidebar_section.jsx

* Update admin_sidebar_section.jsx

* Update admin_sidebar_section.jsx
2017-04-03 08:17:21 -04:00
doh5
8e70e40c30 Different 'name' value for system console LHS "Email" section + route name update (#5917)
* Different 'name' value for system console LHS "Email" section

Under Testing
-This is to create a unique ID for the Selenium UI Automiation

* Update the system console route because of the name change

for unique selenium ID

* Update admin_sidebar.jsx

* Update route_admin_console.jsx
2017-04-03 08:16:57 -04:00
bonespiked
c3d095b465 Add reaction picker (#5904) 2017-04-01 17:00:30 -04:00
Joram Wilander
95da05a8c9 PLT-5750 Add sequence number to websocket connections and events (#5907)
* Add sequence number to websocket connections and events

* Copy pointer instead of pass by value and use int64 over uint64

* Add more logging to missed events
2017-04-01 11:39:13 -04:00
Harrison Healey
d39947f539 Corrected 'hangup' to 'hang up' (#5930) 2017-03-31 13:06:25 -04:00
Joram Wilander
ea17e8d004 Fix console error and reverted colorpicker upgrade to prevent crash (#5897) 2017-03-31 09:55:03 -04:00
prixone
fa40bfb9e6 Fixed @ not working on latest build due to... (#5878)
* Fixed @ not working on latest build due to...

On latest build the @ shortcut to search for mentions was not working due to missing parameters on the onListenerChange method, due to changes done previously to post_action and search_bar that were not made to the onListenerChange method.

* Update search_bar.jsx

added fix for when no notification options for mentions is defined by the user...
2017-03-31 09:53:19 -04:00
enahum
bd5b6f19ca translations PR 20170328 (#5899) 2017-03-30 19:07:53 -03:00
Harrison Healey
4092836c94 PLT-1990 Closed markdown preview when edit post modal is closed (#5921) 2017-03-30 13:45:58 -04:00
Harrison Healey
364543c05b PLT-5976 Fixed date of first post in RHS (#5922) 2017-03-30 13:45:17 -04:00
Harrison Healey
689cac535e PLT-2713/PLT-6028 Added System Users list to System Console (#5882)
* PLT-2713 Added ability for admins to list users not in any team

* Updated style of unit test

* Split SearchableUserList to give better control over its properties

* Added users without any teams to the user store

* Added ManageUsers page

* Renamed ManageUsers to SystemUsers

* Added ability to search by user id in SystemUsers page

* Added SystemUsersDropdown

* Removed unnecessary injectIntl

* Created TeamUtils

* Reduced scope of system console heading CSS

* Added team filter to TeamAnalytics page

* Updated admin console sidebar

* Removed unnecessary TODO

* Removed unused reference to deleted modal

* Fixed system console sidebar not scrolling on first load

* Fixed TeamAnalytics page not rendering on first load

* Fixed chart.js throwing an error when switching between teams

* Changed TeamAnalytics header to show the team's display name

* Fixed appearance of TeamAnalytics and SystemUsers on small screen widths

* Fixed placement of 'No users found' message

* Fixed teams not appearing in SystemUsers on first load

* Updated user count text for SystemUsers

* Changed search by id fallback to trigger less often

* Fixed SystemUsers list items not updating when searching

* Fixed localization strings for SystemUsers page
2017-03-30 09:46:47 -07:00
Yusuke Nemoto
9a9729f22f fix typo and missing messages (#5902) 2017-03-30 08:20:55 -07:00
Harrison Healey
ee3b983a63 PLT-5035 Added loading of missing profiles when hovering over reactions (#5887) 2017-03-30 09:49:22 -04:00
Asaad Mahmood
6d6b813446 Ui ifxes (#5890)
* PLT-5975 - Back arrow in flag list cutting off

* PLT-6049 - Fixing pin icon color, and hover state

* PLT-5989 - Channel member and pin icon issue

* PLT-6067 - Pinned icon misaligned in firefox

* PLT-5885 - Adjusting icon spacing in modal
2017-03-29 21:07:39 -04:00
doh5
8d36a1e96a Add ID to System Console in the LHS Header Dropdown (#5900)
* Add ID to System Console in the LHS Header Dropdown

Under TEsting

* Update sidebar_header_dropdown.jsx

* Update sidebar_header_dropdown.jsx
2017-03-29 17:37:03 -04:00
Joram Wilander
8dde651ded Remove user from list when selected in DM modal (#5884) 2017-03-29 08:07:10 -07:00
Ryan Wang
31830ffc7b Add extra check before rendering emojis (#5879) 2017-03-29 09:43:08 -04:00
Joram Wilander
060b9f92c3 Remove API endpoints being deprecated in 3.8 (#5880) 2017-03-28 08:07:15 -04:00
Corey Hulen
ca8b8d1245 Fixing cancel ids for selenium (#5896)
* Fixing ids for selenium

* Fixing ids

* Fixing prop
2017-03-27 18:12:24 -07:00
Asaad Mahmood
84dc60a640 PLT-5868 - Redesigning compact view (#5821)
* PLT-5868 - Redesigning compact view

* Improvements to compact view

* Updating compact view

* Updating webhook styles
2017-03-27 09:16:08 -04:00
Corey Hulen
7460302dec Fixing ids for selenium (#5874) 2017-03-24 19:28:35 -07:00
Ari Autio
9cfa733178 PLT-5281 error messages contain a link to documentation about reserved words (#5530)
* PLT-5281 error messages contain a link to documentation about reserved words

* Updated comments per PM review

* Proposed fix to review comments
2017-03-24 17:10:40 -04:00
Joram Wilander
4dc03613b4 Check if LHS DM list needs updating on channel switch and channel members fetch (#5861) 2017-03-24 13:46:39 -07:00
George Goldberg
22715a31ed PLT-5879: User email notification settings disabling. (#5837)
When Email Notifications are turned off server wide, don't allow the
user to configure their email notification preferences.
2017-03-24 13:43:09 -07:00
George Goldberg
2c0c71d460 PLT-5910: Fix Channel header menu in Town Square. (#5831) 2017-03-24 13:42:37 -07:00
George Goldberg
92a1878708 PLT-5907: Fix Create Channel in More Channels dialog. (#5830) 2017-03-24 13:42:22 -07:00
Joram Wilander
a2f78d01bd Fix LHS group message sorting (#5812) 2017-03-24 13:41:45 -07:00
bonespiked
28ad645153 Ticket 4665 - Emoji Picker (#5157)
*  #4665  Added EmojiPicker

Work primarily by @broernr-de and @harrison on pre-release.mattermost.com

* Final fixes to handle custom emojis from internal review and single merge error

* ESLint fixes

* CSS changes and other code to support emoji picker in reply window

* Fix for file upload and emoji picker icon positions on post and comment.

RHS emoji picker appearing see-through at this time.

* Fix for two ESLint issues.

* covered most of feedback:
RHS emoji picker looks correct color-wise
RHS emoji picker dynamically positions against height of thread size (post + reply messages)
escape closes emoji window
search box focused on open

ESLint fixes against other files
oversized emoji preview fixes

* Adding in 'outside click' eventing to dismiss the emoji window

* Changing some formatting to fix mismatch between my local eslant rules and jenkins.

* adding alternative import method due to downstream testing errors

* yet another attempt to retain functionality and pass tests - skipping import of browser store

* fix for feedback items 5 and 7:
* move search to float on top with stylistic changes
* whitespace in the header (+1 squashed commit)
Squashed commits:
[6a26d32] changes that address items
1, 2, 6, 8, and 9 of latest feedback

* Fix for attachment preview location on mobile

* Fix for latest rounds of feedback

* fixing eslint issue

* making emojipicker sprite based, fixing alignments

* Fix for emoji quality, fixing some behavior (hover background and cursor settings)
undoing config changes

* Preview feature for emojis

* Adjustments to config file, and changing layout/design of attachment and emoji icon.

* manual revert from master branch for config.json

* reverting paperclip and fixing alignments.  Additionally fixing inadvertent display of picker on mobile.

* CSS changes to try to fix the hover behavior - currently working for emoji picker (when enabled), but hover for attachment isn't working

* Made suggested changes by jwilander except for jQuery removal

* Adding hover for both icons

* removal of some usages of jQuery

* Fix for two layout issues on IE11/Edge

* UI improvements for emoji picker

* Fix for many minor display issues

* fix for additional appearance items

* fix to two minor UI items

* A little extra padding for IE11

* fix for IE11 scroll issue, and removing align attribute on img tag which was throwing js error

* fixes some display issues on firefox

* fix for uneven sides of emojis

* fix for eslint issues that I didn't introduce

* fix for missing bottom edge of RHS emojipicker.  also fixing text overlapping icons on text area (including RHS)

* Update "emoji selector" to "emoji picker"

* changes for code review
- removal of ..getDOMNode
- use sprite imagery for emoji preview
- remove lastBlurAt from state as it wasn't used

* fixes for:
- fake custom emoji preview in picker
- RHS scrollbar on preview

* fix for minor alignment of preview emoji
2017-03-24 09:09:51 -04:00
Ryan Wang
4c1eb7ff55 Update default town square purpose (#5810) 2017-03-24 09:17:01 +00:00
VeraLyu
3ea091fd6d Add file attachment to search result (#5806) 2017-03-24 09:14:27 +00:00
Saturnino Abril
1167b39185 Fixed mobile search focus - keyboard collapse/focus (#5766) 2017-03-24 09:05:43 +00:00
Corey Hulen
98baf1536e Fixing issue with ids for selenium (#5859)
* Fixing issue with ids for selenium

* removing comment
2017-03-23 19:41:08 -07:00