summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Change "Cancel" button to "Close" (#7131)94117nl2017-08-081-0/+6
|
* Revert "PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag ↵George Goldberg2017-08-082-24/+7
| | | | | (#7109)" (#7147) This reverts commit f4638aecec2933f20efb4b95c2e0a90c22b47b43.
* PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag (#7109)George Goldberg2017-08-072-7/+24
|
* Updating user access token UI (#7091)Asaad Mahmood2017-08-067-96/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updating user access token UI Updating help text Updating tokenlistClass Updating string for token Updating translations Updating translations Updating translations * Updating translations * Minor UI fix * Update manage_tokens_modal.jsx * Update user_settings_security.jsx * Update en.json * Fix merge conflicts
* System Console: Email notification content setting (#7122)Jonathan2017-08-0619-131/+794
| | | | | | | | | | | | | | | | * PLT-7195: Added new config option, new license feature, and config UI to system console. Still need to implement behaviour change in email batching code * PLT-7195: Modified batch emails to respect email notification content type setting * PLT-7195: Tweaking the colours a bit * PLT-7195: Added support for email notification content type setting in immediate (non-batched) notification messages. Attempted to clean up the code somewhat. Unit tests coming in a future commit * PLT-7195: Added unit tests for non-batched emails * Checked license when applying email content settings * Changed return type of getFormattedPostTime
* [PLT-7231/PLT-7306] Fix GitLab SSO failure with non-English locale and make ↵Saturnino Abril2017-08-063-7/+158
| | | | config locales more forgiving (#7125)
* Add beta tag to Elasticsearch (#7121)Eric Sethna2017-08-053-3/+4
| | | | | | | | * make Elasticsearch beta * make Elasticsearch beta * make Elasticsearch beta
* make suggestion box focus more robust, require more explicit enabling (#7123)Chris2017-08-042-7/+19
|
* fix some webhook attachments not truncating, lower short text to 300 chars ↵Chris2017-08-041-2/+3
| | | | (#7120)
* PLT-6924 Added ability to disable file uploads/downloads on old mobile apps ↵Harrison Healey2017-08-048-95/+174
| | | | (#7117)
* PLT-7267 Refactored tracking of recent emojis to hide deleted emojis (#7102)Harrison Healey2017-08-047-112/+95
| | | | | | * Fixed local ESLint error * PLT-7267 Refactored tracking of recent emojis to hide deleted emojis
* [PLT-2407] Improve ordering of uploaded attachments (#7022)Saturnino Abril2017-08-044-11/+21
| | | | | | * improve ordering of uploaded attachments * use LocalizationStore.getLocale() when comparing file names
* Fix issue 4161 (#6919)William Gathoye2017-08-051-43/+43
| | | | | | | | * Fix issue 4161 * Minor tweaks * Fix log title
* Update for 4.1 (#7088)Eric Sethna2017-08-051-0/+37
|
* PLT-7295 - Submitting UI changes for Jira (#7097)Asaad Mahmood2017-08-054-36/+38
| | | | | | | | | | * PLT-7295 - Submitting UI changes for Jira * Updating help text * Revert "Updating help text" This reverts commit 2885b290c6951b47da1465095ee6e83c6a750f33.
* PLT-7287 Move access token text in user list to under the dropdown (#7099)Joram Wilander2017-08-055-36/+51
| | | | | | * Move access token text in user list to under the dropdown * Updating UI for token help text (#7107)
* PLT-7223: Update "Database schema cannot be upgraded" error message to ↵Jonathan2017-08-042-15/+16
| | | | | | | | | | indicate expected version (#7079) * PLT-7223: Updated error message to include relevant schema versions * PLT-7223: Removed unit test. It poisons database state, and there's no recovery mechanism, because the code under test causes an ungraceful exit, so we can't fix the database in a defer statement. This causes the next test execution or server start to fail. * PLT-7223: Incorporated @crspeller's suggestions into error message string
* Ui improvements (#7092)Asaad Mahmood2017-08-049-224/+124
| | | | | | | | | | | | | | * PLT-7121 - Making channel header text dynamic * PLT-7268 - Fixing search results in compact view * PLT-7248 - Adjusting space between post controls * PLT-7303 - Fixing manage members button * Revert "PLT-7303 - Fixing manage members button" This reverts commit 7dcb68a8e333a2c95444d417ed9a244c9c30aa99.
* Set Elasticsearch replica count default to 1. (#7108)George Goldberg2017-08-042-3/+3
|
* PLT-7261 Fixed incorrect content type for preview and thumbnail images (#7119)Harrison Healey2017-08-042-4/+12
|
* fix caret position after autocomplete (#7118)Chris2017-08-031-1/+1
|
* PLT-7212: fix missing webhook post attachments (#7011)Chris2017-08-035-23/+68
| | | | | | * fix missing webhook post attachments * make ProcessSlackAttachments return a new slice instead of modifying it
* close post control button after reacting to a post (#7110)Saturnino Abril2017-08-033-0/+3
|
* Adding debugging to index creation (#7053)Corey Hulen2017-08-031-3/+4
| | | | | | | | * Adding debugging to index creation * Fixing debug stmt * Fixing debug stmt
* PLT-6455 Migrate installed_oauth_apps.jsx to be pure and use Redux (#7059)94117nl2017-08-036-115/+222
| | | | | | * Migrate installed_oauth_apps.jsx to be pure and use Redux * Props docs typo, add test, remove commands_container, bump yarn.lock
* PLT-6823 Removes option to set notification sound in Edge (#6883)Alex White2017-08-033-48/+51
| | | | | | | | | | | | | | | | | | | | | | * Remove sound notification support for Edge * Move the sound test to utils and also stop the dings for Edge along with firefox * Fix some styling issues * Remove sound notification support for Edge Move the sound test to utils and also stop the dings for Edge along with firefox Fix some styling issues * Reversing soundOptions util method. Fixing some string IDs for clarity * Fixing a syntax error * Restructure HasSoundOptions blocks to not begin with negative statement * Fixing paranthesis
* GH-6452 Migrate installed_command.jsx to be pure and use Redux (#6903)94117nl2017-08-036-57/+230
| | | | | | | | | | | | | | * Migrate installed_command.jsx to be pure and use Redux * Add test for InstalledCommand component * Fix failing test and typo * Whoops. Revert back deleted filter * Add filter test * Remove commands related code from /stores/integration_store.jsx
* PLT-6484 Add /leave command to leave a channel (#6402)David Meza2017-08-0311-119/+315
| | | | | | | | | | | | | | | | | | * PLT-6484 Add /leave command to leave a channel * Text changes requeted on review. * PLT-6484 Display the right error message when trying to /leave town-square * PLT-6484 Be able to execute /leave command in direct and group message channels with the same effect as clicking x * PLT-6484 Refactor to create new leave_private_channel_modal.jsx * PLT-6484 Remove previous leave private channel logic to use new leave_private_channel_modal.jsx * Remove dot in command description. Change localized error when leaving Town square. * disable /leave command in reply threads on the right-hand sidebar, since it is not obvious which channel you should leave
* Update test .md files with new emoji set (#7104)lindalumitchell2017-08-034-16/+34
| | | | | | | | | | | | | | | | | | * Updated with new emoji set for testing Changed test-emoticons4.md from Symbols and formatting tests to Flags, Special, and formatting tests. * Updated with new emoji set for testing Updated test-emoticons3.md from Places to Objects and Symbols. * Updated with new emoji set for testing Updated test-emoticons2.md from Objects to Food, Activity, and Travel. * Updated with new emoji set for testing Updated test-emoticons1.md to new emoji set, still containing the intro, People, and Nature sections.
* PLT-7250 Updated marked to better handle trailing periods on URLs (#7098)Harrison Healey2017-08-032-3/+3
|
* PLT-7194 Add email when adding user access tokens (#7087)Joram Wilander2017-08-033-1/+49
| | | | | | | | * Add email when adding user access tokens * Update en.json * Update en.json
* PLT-7130 adding more generic push notificaiton message. (#7044)Corey Hulen2017-08-035-7/+26
| | | | | | * PLT-7130 adding more generic push notificaiton message. * Fixing strings
* [PLT-1249] Add close button 'x' to the right of a link preview (#7017)Saturnino Abril2017-08-037-10/+132
| | | | | | | | | | | | | | | | | | | | * add close button 'x' to the right of a link preview * Updating webhook UI * UI improvements for close button * Adding hover state * Making the close button visible on mobile * previews are permanently disabled/closed for that link * make post as required props * fix JS error of undefined * fix update issue both at center and RHS view
* Fix teams being incorrectly marked unread across tabs (#7062)Joram Wilander2017-08-021-0/+5
|
* Do not show non-autocomplete commands for system admins (#7094)Joram Wilander2017-08-021-1/+5
|
* Merge pull request #7085 from saturninoabril/merge-4.0.2Christopher Speller2017-08-023-15/+37
|\ | | | | Merge 4.0.2
| * If login is using mobile respond with JSON object (#7030)enahum2017-08-033-15/+37
| |
* | PLT-7140: On slow connection searching should clear RHS and show spinner (#7014)Jonathan2017-08-029-12/+83
|/ | | | | | | | | | | | | | | | * Added a RECEIVED_SEARCH_TERM event on search form submit, attempted to modify Search Results Header title when loading search results * Fixed RHS behaviour so that loading icon is shown while waiting for search results on slow connections. * PLT-7140: Fixed all eslint issues * PLT-7140: reverted changes to config/config.json that were accidentally committed * PLT-7140: Removed all static function decorators that I previously added to jsx files. These were suggested by eslint, but can cause issues for functions that override parent functionality. still can't reproduce the errors seen on spinmint locally, so I'm guessing at this point * PLT-7140: Changed var to const * Updating UI for search results loading (#7096)
* PLT-7204 Fixed markdown preview (#6997)Harrison Healey2017-08-021-28/+14
| | | | | | * PLT-7204 Fixed markdown preview * Updated style of Textbox component
* Fix commenting on deleted post (#7095)Joram Wilander2017-08-023-79/+62
|
* Add more debugging info to server logs for failed OAuth requests (#7039)Joram Wilander2017-08-021-4/+7
|
* Fix TestUpdateOAuthUserAttrs unit test (#7037)Joram Wilander2017-08-021-1/+1
|
* PLT-7145: `platform user deleteall` expects a user as argument (#7002)Jonathan2017-08-021-34/+32
| | | | | | * PLT-7145: Fixed typo preventing deleteall command from working as expected. Cleaned up spelling and error messages throughout the user module * PLT-7145: Grammar and wording suggestions from PR 7002
* PLT-7275: Configure replica/shard count for Elasticsearch indexes. (#7093)George Goldberg2017-08-023-10/+28
|
* PLT-7238: Modified channel member dropdown list to show user name, as ↵Jonathan2017-08-021-1/+1
| | | | defined by display settings, rather than full name (#7086)
* Use redux selector for getting siderbar channels (#7078)Joram Wilander2017-08-021-70/+27
|
* Change refresh on version change to be after explicit click (#7090)Joram Wilander2017-08-025-21/+20
|
* PLT-6965 jira integration (plus plugin scaffolding) (#6918)Chris2017-08-0224-33/+891
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * plugin scaffolding / jira integration * add vendored testify packages * webhook fix * don't change i18n ids * support configuration watching * add basic jira plugin configuration to admin console * fix eslint errors * fix another eslint warning * polish * undo unintentional config.json commit >:( * test fix * add jira plugin diagnostics, remove dm support, add bot tag, generate web-safe secrets * rebase, implement requested changes * requested changes * remove tests and minimize makefile change * add missing license headers * add missing comma * remove bad line from Makefile
* Do not show commented on header for ephemeral posts (#7069)Joram Wilander2017-08-011-1/+1
|
* PLT-7262 Stopped including emoji sprite sheets multiple times in CSS (#7077)Harrison Healey2017-08-013-1459/+1482
| | | | | | * PLT-7262 Stopped including emoji sprite sheets multiple times in CSS * Changed EmojiPickerItem to be a PureComponent