summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Implement client config/license endpoints for APIv4 (#5867)Joram Wilander2017-03-274-1/+131
|
* Implement PUT /users/sessions/device endpoint for APIv4 (#5866)Joram Wilander2017-03-273-0/+89
|
* PLT-5868 - Redesigning compact view (#5821)Asaad Mahmood2017-03-274-13/+50
| | | | | | | | | | * PLT-5868 - Redesigning compact view * Improvements to compact view * Updating compact view * Updating webhook styles
* PLT-5904 (Server): Config flag for SMTP Cert Check. (#5857)George Goldberg2017-03-273-25/+32
|
* APIv4 post /channels/ids (#5845)Saturnino Abril2017-03-278-5/+259
| | | | | | * APIv4 post /channels/ids * updated enpoint as /teams/{team_id}/channels/ids
* PLT-6063: AddUserToTeam permission depends on policy. (#5869)George Goldberg2017-03-264-18/+183
| | | Uses same policy setting as InviteUserToTeam.
* PLT-6046 remove webrtc from tests (#5872)enahum2017-03-262-63/+0
|
* Implement some team endpoints for APIv4 (#5870)Joram Wilander2017-03-254-7/+141
| | | | | | * Implement GET /users/{user_id}/teams/members endpoint for APIv4 * Implement DELETE /teams/{team_id}/members/{user_id} endpoint for APIv4
* PLT-6076 Adding viper libs for config file changes (#5871)Corey Hulen2017-03-25752-449/+463100
| | | | | | | | * Adding viper libs for config file changes * Removing the old fsnotify lib * updating some missing libs
* Fixing ids for selenium (#5874)Corey Hulen2017-03-241-1/+1
|
* PLT-5281 error messages contain a link to documentation about reserved words ↵Ari Autio2017-03-243-7/+13
| | | | | | | | | | (#5530) * PLT-5281 error messages contain a link to documentation about reserved words * Updated comments per PM review * Proposed fix to review comments
* Check if LHS DM list needs updating on channel switch and channel members ↵Joram Wilander2017-03-242-1/+4
| | | | fetch (#5861)
* Add query parameters to get posts v4 endpoint (#5858)Joram Wilander2017-03-244-10/+213
| | | | | | * Add since query paremeter to get posts v4 endpoint * Add query paremeters for before/after to get posts v4 endpoint
* Implement some channel endpoints for APIv4 (#5846)Joram Wilander2017-03-246-1/+364
| | | | | | | | | | * Add v4 endpoint for getting the channels on a team for a user * Implement PUT /channels/{channel_id}/patch endpoint for APIv4 * Implement POST /teams/{team_id}/channels/search endpoint for APIv4 * Update permission check
* PLT-5879: User email notification settings disabling. (#5837)George Goldberg2017-03-242-1/+35
| | | | When Email Notifications are turned off server wide, don't allow the user to configure their email notification preferences.
* PLT-5910: Fix Channel header menu in Town Square. (#5831)George Goldberg2017-03-241-21/+21
|
* PLT-5907: Fix Create Channel in More Channels dialog. (#5830)George Goldberg2017-03-241-8/+4
|
* Implement POST /users/email/verify/send endpoint for APIv4 (#5825)Joram Wilander2017-03-243-16/+74
|
* Fix LHS group message sorting (#5812)Joram Wilander2017-03-241-2/+19
|
* [APIV4] GET /users/{user_id}/status - user status endpoint for apiV4 (#5824)Carlos Tadeu Panato Junior2017-03-247-1/+174
|
* Ticket 4665 - Emoji Picker (#5157)bonespiked2017-03-2428-53/+4827
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * #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
* APIv4 put /teams/{team_id}/patch (#5860)Saturnino Abril2017-03-246-3/+196
|
* Update default town square purpose (#5810)Ryan Wang2017-03-242-4/+18
|
* Add file attachment to search result (#5806)VeraLyu2017-03-241-0/+12
|
* Endpoint for APIv4 POST /teams/{team_id}/members (#5804)Saturnino Abril2017-03-245-0/+263
|
* Fixed mobile search focus - keyboard collapse/focus (#5766)Saturnino Abril2017-03-245-120/+132
|
* Fixing issue with ids for selenium (#5859)Corey Hulen2017-03-233-3/+12
| | | | | | * Fixing issue with ids for selenium * removing comment
* implement POST /commands for apiv4 (#5849)Carlos Tadeu Panato Junior2017-03-234-0/+122
|
* Fix delete channel test (#5863)Joram Wilander2017-03-231-0/+12
|
* Adding a last message id for selenium testing (#5840)Corey Hulen2017-03-235-3/+14
|
* PLT-5755: Infrastructure for Component Testing. (#5814)George Goldberg2017-03-2340-799/+1426
| | | | | | | | | | This migrates the existing webapp tests to using Jest and Enzyme. The infrastructure is put in place for React component testing, and a few simple example component tests are implemented. This also adds snapshot testing of components, coverage checking for the webapp (although that is not yet integrated to Coveralls), and the ability to run npm run test:watch to automatically re-run affected tests when working on the webapp codebase.
* Merge branch 'release-3.7'George Goldberg2017-03-2312-116/+284
|\
| * PLT-5905 Fix saml certificates for 3.7 (#5843)enahum2017-03-221-1/+14
| |
| * Fix telemetry. (#5841)George Goldberg2017-03-221-1/+1
| |
| * Fxing some unit testsChristopher Speller2017-03-222-5/+5
| |
| * PLT-5943 Reduce minimum username length (#5798)Joram Wilander2017-03-173-5/+3
| |
| * Fix policy application in team edition. (#5771)George Goldberg2017-03-158-110/+280
| |
* | Websocket CORS Support (#5667)Brad Howes2017-03-232-1/+46
| | | | | | | | | | | | | | | | | | | | * Second attept at patching api/websocket.go for CORS support. * Missing include * Fixed whitespace formatting so that gofmt passes. * Added tests for CORS filtering
* | add implementation for endpoint DELETE outgoing webhook for apiv4 (#5828)Carlos Tadeu Panato Junior2017-03-233-2/+110
| |
* | PLT-5913: Remove id from heading markdown compilation (#5782)VeraLyu2017-03-232-4/+3
| | | | | | | | | | Id for heading markdown is unnecessary as we didn't attach any style/effect on that id, and it also introduce duplicate id. So remove it from heading markdown generatiing.
* | Fxing TODO check (#5836)Christopher Speller2017-03-231-8/+8
| |
* | add implementation to get outgoing webhook for apiv4 (#5827)Carlos Tadeu Panato Junior2017-03-233-0/+79
| |
* | PLT-5669: Change format of timestamp of access history (#5646)VeraLyu2017-03-232-15/+22
| | | | | | | | Add new line for timestamp and forbid wrap for ip and sessionid of access history to prevent unnecessary line wrap.
* | fix - make loginId always lowercase (#5613)Carlos Tadeu Panato Junior2017-03-231-1/+1
| |
* | Implement POST /users/search endpoint for APIv4 (#5822)Joram Wilander2017-03-2310-13/+392
| | | | | | | | | | | | | | | | | | | | * Implement POST /users/search endpoint for APIv4 * PLT-2713 Added store functions for searching users that don't have a team * PLT-2713 Added 'without_team' option when searching users * PLT-2713 Added 'without_team' option when searching users (v4)
* | PLT-5905 Fix saml certificates (#5803)enahum2017-03-221-1/+14
| |
* | Update channel permissions for v4 endpoints (#5829)Joram Wilander2017-03-225-32/+126
| | | | | | | | | | | | | | | | * Fix join channel permission for v4 endpoint * Allow regular users to get public channels they are not in * Fix unit test
* | PLT-5872: Remove Security Category from Security Alerts. (#5835)George Goldberg2017-03-221-3/+0
| | | | | | It wasn't actually providing any information, just `c=d` every time.
* | translations PR 20170320 (#5819)enahum2017-03-2120-131/+263
| |
* | Add IDs to Team Settings, Channel Settings, Account Settings (Display & ↵Eric Sethna2017-03-2111-3/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Advanced) (#5823) * Add IDs to Channel Notification Preferences * Add IDs to Display Settings * Add ID to language dropdown * Add Ids * Add ids * Add Ids * Add Ids * Add Ids * Add Id * Add Ids * Add Ids * Fix duplicate Id