Commit Graph

107 Commits

Author SHA1 Message Date
Christopher Speller
d1efb66ad7 Merge branch 'release-3.0' 2016-05-12 12:11:02 -04:00
Harrison Healey
d9f724f959 PLT-2927/PLT-2924 Fixing issues with integration lists (#2974)
* Changed IntegrationStore to store integrations by team

* Fixed regenerating a command's token not causing the UI to update

* Re-added IntegrationStore.hasReceived methods
2016-05-12 11:30:53 -04:00
Christopher Speller
4b260b761a Updating client dependancies and ESLint (#2954)
* Updating client dependancies

* Fixing eslint errors with updates

* Updating eslint
2016-05-12 07:50:53 -04:00
David Lu
a3cfdf0483 PLT-2786 Open Account Settings/Recent Mentions Shortcuts (#2957)
* Account settings shortcut added

* Added constants

* Added recent mentions shortcut
2016-05-12 07:50:25 -04:00
Harrison Healey
2b1db2974a Fixed loginByUsername unit test (#2975)
* Fixed loginByUsername unit test

* Removed unused variable from WebClient login functions
2016-05-12 07:44:06 -04:00
David Lu
4f39b8b2e4 Added 'here' to list of reserved usernames (#2933) 2016-05-10 08:23:05 -04:00
Harrison Healey
ff72a126d3 PLT-2862 Re-added LDAP login boxes as part of signup flow (#2937)
* Added ldap_only parameter for login API

* Re-added LDAP login boxes as part of signup flow
2016-05-09 15:56:50 -04:00
Joram Wilander
07126101d3 Recent mention searches now OR terms instead of AND (#2931) 2016-05-09 09:00:08 -07:00
Asaad Mahmood
64b6d8cde5 DM and Modal changes (#2927)
* DM and Modal changes

* Fixing image previews
2016-05-09 08:14:43 -04:00
Harrison Healey
761f59645d PLT-2816 Fixed handling of Unicode 8 emojis (#2924)
* Updated twemoji to properly recognize Unicode 8.0 emojis

* Updated unicode emoji parser to only render emojis we support as images

* Corrected filename for South African flag emoji

* Added Mattermost emoticons!

* Added additional emoticons to test files
2016-05-09 00:17:26 -07:00
David Lu
b58ccf0604 PLT-2765 Limit username UI to 22 characters (#2918)
* Shortened username length to 22 characters

* Update user_settings_general.jsx

* Added username requirements to account settings page

* Switched to double quotes

to escape ' in JSX, must use double quotes

* Update en.json

* Update user_settings_general.jsx

* Update es.json

* Update fr.json

* Update ja.json

* Update pt.json

* Added missing {
2016-05-09 00:15:25 -07:00
Harrison Healey
e1cae3b15b PLT-2600/PLT-2770 Changed getPublicLink api call to return a proper JSON string (#2914)
* Removed unused channelId and userId parameters from web client getPublicLink method

* Changed getPublicLink api call to return a proper JSON string
2016-05-06 11:32:08 -07:00
Joram Wilander
0cfcf5c5de Add separator between DMs on your team and not (#2910) 2016-05-06 12:08:58 -04:00
Asaad Mahmood
4b2843ee9d Improvements to reply (#2905) 2016-05-05 23:45:19 -07:00
Harrison Healey
d2ddf40f56 PLT-2600/PLT-2770 Added Get Public Link modal and added new API for public file links (#2892)
* Switched public file links to use a GetLinkModal

* Separated getFile and the new getPublicFile api calls
2016-05-05 16:35:03 -04:00
Harrison Healey
ed3162a59d Moved twemoji parsing so that it doesn't occur inside of code blocks (#2896) 2016-05-05 12:35:01 -07:00
Harrison Healey
3b8b23218d Added noreferrer to some links (#2897) 2016-05-05 14:17:59 -04:00
Christopher Speller
274a2a58f0 Performance improvments (#2869) 2016-05-04 10:10:19 -04:00
Corey Hulen
6611229cd7 PLT-2707 Adding option to show DM list from all of server (#2871)
* PLT-2707 Adding option to show DM list from all of server

* Fixing loc
2016-05-04 09:31:42 -04:00
Harrison Healey
87989b8afd PLT-2258 Unified login screen and related APIs (#2820)
* Unified login screen and related APIs

* Refactored login API call to be less convoluted

* Removed LDAP login prompt from invite process

* Fixed existing LDAP users being able to log in if LDAP was configured, but disabled

* Gofmt

* Future proofed login API

* Updated login APIs based on feedback

* Added additional auditing to login API

* Actually removed loginById
2016-05-03 14:10:36 -04:00
Joram Wilander
08a3cf6b38 Port HPNS from 2.2 to master (#2863) 2016-05-03 08:54:49 -07:00
David Lu
3e0adf6227 PLT-2755 Shortcut to upload file (#2848)
* Added file upload shortcuts (CTRL+U and CMD+U)

* Added KeyCode for U
2016-05-02 15:38:40 -04:00
Christopher Speller
29b91301a6 Closing 'RHS' on mobile when jump link is clicked (#2825) 2016-05-02 08:08:05 -04:00
Joram Wilander
7695cbd1b4 Add websocket event and cache invalidation for deleting channels (#2807) 2016-04-27 16:05:39 -04:00
Christopher Speller
ada513a014 Fixing email verification flow (#2806) 2016-04-27 16:03:31 -04:00
Asaad Mahmood
88cbfe7f1d UI Improvements to center channel (#2790)
Removing time from the center channel on sp (mobile)

Liking mention color to search highlight color aswell

Adjusting vertical spacing on mobile

Removing profile pic from mobile LHS header

Updating styles for the RHS

Fixing btn-danger
2016-04-25 11:52:32 -04:00
Harrison Healey
bfc6e4e6b6 PLT-2619/PLT-2661 Removed line numbers from markdown code blocks (#2795)
* Changed .editorconfig to indent CSS files using spaces

* Removed line numbers from markdown code blocks and made them wrap when no language is specified
2016-04-25 08:25:16 -07:00
Harrison Healey
2337fe236e Fixed external links to open in a new tab (#2793) 2016-04-25 10:46:34 -04:00
Harrison Healey
d8df66c00c Fixed updating mention keys when a user's username changes (#2774) 2016-04-25 08:20:45 -04:00
Harrison Healey
f73daebb61 PLT-1236 Added special handling for markdown links within mattermost (#2763)
* Added special handling for markdown links within mattermost

* Moved application of .app__body class to route components
2016-04-22 11:52:44 -07:00
Corey Hulen
2e5617c29b PLT-2057 User as a first class object (#2648)
* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding client side unit test

* Cleaning up the clint side tests

* Fixing msg

* Adding more client side unit tests

* Adding more using tests

* Adding last bit of client side unit tests and adding make cmd

* Fixing bad merge

* Fixing libraries

* Updating to new client side API

* Fixing borken unit test

* Fixing unit tests

* ugg...trying to beat gofmt

* ugg...trying to beat gofmt

* Cleaning up remainder of the server side routes

* Adding inital load api

* Increased coverage of webhook unit tests (#2660)

* Adding loading ... to root html

* Fixing bad merge

* Removing explicit content type so superagent will guess corectly (#2685)

* Fixing merge and unit tests

* Adding create team UI

* Fixing signup flows

* Adding LDAP unit tests and enterprise unit test helper (#2702)

* Add the ability to reset MFA from the commandline (#2706)

* Fixing compliance unit tests

* Fixing client side tests

* Adding open server to system console

* Moving websocket connection

* Fixing unit test

* Fixing unit tests

* Fixing unit tests

* Adding nickname and more LDAP unit tests (#2717)

* Adding join open teams

* Cleaning up all TODOs in the code

* Fixing web sockets

* Removing unused webockets file

* PLT-2533 Add the ability to reset a user's MFA from the system console (#2715)

* Add the ability to reset a user's MFA from the system console

* Add client side unit test for adminResetMfa

* Reorganizing authentication to fix LDAP error message (#2723)

* Fixing failing unit test

* Initial upgrade db code

* Adding upgrade script

* Fixing upgrade script after running on core

* Update OAuth and Claim routes to work with user model changes (#2739)

* Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740)

* Fixing team invite ldap login call (#2741)

* Fixing bluebar and some img stuff

* Fix all the different file upload web utils (#2743)

* Fixing invalid session redirect (#2744)

* Redirect on bad channel name (#2746)

* Fixing a bunch of issue and removing dead code

* Patch to fix error message on leave channel (#2747)

* Setting EnableOpenServer to false by default

* Fixing config

* Fixing upgrade

* Fixing reported bugs

* Bug fixes for PLT-2057

* PLT-2563 Redo password recovery to use a database table (#2745)

* Redo password recovery to use a database table

* Update reset password audits

* Split out admin and user reset password APIs to be separate

* Delete password recovery when user is permanently deleted

* Consolidate password resetting into a single function

* Removed private channels as an option for outgoing webhooks (#2752)

* PLT-2577/PLT-2552 Fixes for backstage (#2753)

* Added URL to incoming webhook list

* Fixed client functions for adding/removing integrations

* Disallowed slash commands without trigger words

* Fixed clientside handling of errors on AddCommand page

* Minor auth cleanup (#2758)

* Changed EditPostModal to just close if you save without making any changes (#2759)

* Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756)

* Fixed url in channel info modal (#2755)

* Fixing reported issues

* Moving to version 3 of the apis

* Fixing command unit tests (#2760)

* Adding team admins

* Fixing DM issue

* Fixing eslint error

* Properly set EditPostModal's originalText state in all cases (#2762)

* Update client config check to assume features is defined if server is licensed (#2772)

* Fixing url link

* Fixing issue with websocket crashing when sending messages to different teams
2016-04-21 22:37:01 -07:00
Christopher Speller
899ee09224 Adding option to display channels sanely (#2761) 2016-04-21 09:56:11 -04:00
Asaad Mahmood
c3c49e49b4 Minor Ui Improvements (#2713) 2016-04-14 09:24:58 -04:00
Harrison Healey
ac794bcc3b Fixed link formatting 2016-04-13 14:57:42 -04:00
Asaad Mahmood
51549cc0b2 Adding react scrollbar to the RHS thread (#2693)
* Adding scrollbar to the RHS thread

* Fixing the RHS thread scrolling issue
2016-04-13 08:33:42 -04:00
Joram Wilander
49ab8b2161 Add custom branding functionality (#2667) 2016-04-11 13:45:03 -04:00
Joram Wilander
2c9e184b8c Remove extra tracking data from api_channels requests (#2679) 2016-04-11 10:42:58 -07:00
Harrison Healey
3803750fb1 Changed getFile api call to always attach headers 2016-04-08 18:06:35 -04:00
Asaad Mahmood
c99d00d114 Fixing code block 2016-04-08 17:52:34 +05:00
Asaad Mahmood
32bc97f855 Multiple UI Improvements
* Multiple UI Improvements

* Adding app_body behind missing classes
2016-04-06 11:19:55 -07:00
Harrison Healey
b3edd32aee PLT-1750 Moved slash commands to backstage
* Added slash commands to InstalledIntegrations page

* Reset installed integration type filter if there is no longer any integrations of the selected type

* Added pages to backstage to add slash commands

* Cleaned up internationalization for slash commands

* Added ability to regen slash command tokens from backstage

* Removed Integrations tab from UserSettings
2016-04-05 09:29:01 -04:00
Joram Wilander
2bdab516b2 Merge pull request #2625 from mattermost/plt-2502
PLT-2502 Fxing some channel changing issues
2016-04-04 12:24:12 -04:00
Corey Hulen
578749d083 Merge pull request #2584 from hmhealey/plt2054
PLT-2054 Add DisplayName and Description fields for integrations
2016-04-04 08:15:13 -07:00
Christopher Speller
5f3111e880 Fxing some channel changing issues 2016-04-04 11:09:59 -04:00
Harrison Healey
cac5c0f0dd Improved handling of invalid incoming and outgoing webhooks 2016-04-04 09:50:01 -04:00
JoramWilander
0f3d62364b Properly display webhook username/icon in search results 2016-04-04 08:30:11 -04:00
Joram Wilander
94ab36500f Merge pull request #2621 from asaadmahmoodspin/ui-improvements
PLT-2027- Improvements to about dialog
2016-04-04 08:13:27 -04:00
Harrison Healey
a427d61b33 Merge pull request #2602 from ZBoxApp/autolinker
Replace Autolinker in extractLinks with a pattern
2016-04-01 15:05:54 -04:00
Asaad Mahmood
371dbfff22 Adding modal changes back again 2016-04-01 23:17:56 +05:00
Elias Nahum
9ec459526a Rename extractLinks to extractFirstLink 2016-04-01 14:08:02 -03:00