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

758 Коммитов

Автор SHA1 Сообщение Дата
thoemy
b4adf77693 Improve incoming webhook slack compatibility (#2972) (#2973)
By checking for form urlencoded content instead of JSON, requests without
or with a wrong Content-Type header and a JSON body are correctly parsed.
2016-05-12 07:44:44 -04:00
Christopher Speller
e1388877ad Merge branch 'release-3.0' 2016-05-11 11:53:04 -04:00
Corey Hulen
d7197943f0 Fixing compliance reporting (#2964) 2016-05-11 09:24:20 -03:00
Christopher Speller
720222f3a6 Removing export route (#2955) 2016-05-11 08:04:01 -04:00
Corey Hulen
c8285185a9 PLT-2806 sending websocket when adding user to team (#2953)
* PLT-2806 sending websocket when adding user to team

* Fixing config file
2016-05-10 12:54:11 -04:00
enahum
45b22f312d PLT-2674 Private Group should not have Leave option when only one member remains (#2888) 2016-05-10 08:24:52 -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
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
Corey Hulen
6c75662b82 PLT-2697 Fixing team admins (#2900)
* PLT-2697 Fixing team admins

* Fixing eslint error

* Fixing loc issues

* Fixing func

* Fixing func
2016-05-06 14:28:22 -04:00
Joram Wilander
0cfcf5c5de Add separator between DMs on your team and not (#2910) 2016-05-06 12:08:58 -04:00
Christopher Speller
d2f9fd52fe Fixing /logout command (#2908) 2016-05-06 12:08:49 -04:00
Joram Wilander
d75cb02948 Multiple cross-team functionality fixes (#2902) 2016-05-06 08:06:34 -04:00
Joram Wilander
f2e788f4b1 Allow system admins to switch user accounts to email/password (#2893) 2016-05-05 16:36:42 -04: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
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
Joram Wilander
b18cf58c8f Sanitize sensitive data of out config file for the system console (#2849) 2016-05-03 14:45:36 -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
Arif Usman
e76a30bca0 Fixed typo (#2862) 2016-05-03 13:07:49 -04:00
David Lu
e4b744362b Added query escaping to emails (#2867) 2016-05-03 13:06:43 -04:00
Joram Wilander
08a3cf6b38 Port HPNS from 2.2 to master (#2863) 2016-05-03 08:54:49 -07:00
Christopher Speller
f8ed606a5f Fixing edit direct channel header (#2842) 2016-05-02 12:57:32 -04:00
=Corey Hulen
f31108b7c4 Fixing cookie 2016-04-28 17:14:19 -07:00
=Corey Hulen
62901defae Merge branch 'master' of https://github.com/mattermost/platform 2016-04-28 17:03:59 -07:00
=Corey Hulen
ad9dfc9c42 Fixing cookie 2016-04-28 17:03:52 -07:00
Christopher Speller
f3fa435a1b Fixing slack import. (#2819) 2016-04-28 16:29:13 -04:00
Joram Wilander
383cddd3d1 Don't return error if already part of channel being joined (#2814) 2016-04-28 10:56:19 -04:00
Corey Hulen
9fecf96d3b PLT-2687 sending email on upgrade and moving profile pic to new location (#2808)
* Fixing CLI and adding unit tests

* Adding the upgrade_db_30 to the help text

* Adding the upgrade_db_30 to the help text

* Adding the upgrade_db_30 to the help text

* Fixing CLI tests

* PLT-2687 sending email on upgrade and moving profile pic to new location

* Fixing img move

* Fixing moving of profile image

* making upgrade email localizable

* Fixing email template
2016-04-28 09:53:30 -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
fa807d8e43 Fixing permalinks to channels your not a memeber of (#2805) 2016-04-27 16:02:58 -04:00
Corey Hulen
d962e175f8 Fix CLI to make -team_name optional or not required. I also added a -join_team cmd. (#2804)
* Fixing CLI and adding unit tests

* Adding the upgrade_db_30 to the help text

* Adding the upgrade_db_30 to the help text

* Adding the upgrade_db_30 to the help text

* Fixing CLI tests

* Fixing typo
2016-04-27 08:26:45 -04:00
Joram Wilander
735c2d9ae0 Use any whitespace as a demlimter when checking for outgoing webhook triggers (#2801) 2016-04-26 12:29:48 -04:00
Joram Wilander
c2fc28aa10 Fix deactivating MFA on user accounts (#2797) 2016-04-26 08:40:47 -04:00
Corey Hulen
1daa0d6b3e PLT-2298 fixing ephemeral message for loadtests (#2788)
* PLT-2298 fixing ephemeral message for loadtests

* Fixing unit tests
2016-04-25 08:39:02 -04: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
Joram Wilander
cf1f3ba322 PLT-2561 Add commandline option to upload license file (#2757)
* Add commandline option to upload license file

* Remove unnecessary comment
2016-04-21 09:43:10 -04:00
enahum
74e5161a4c PLT-2593: Fix logs being stored with user locale (#2722) 2016-04-17 17:32:20 -07:00
Joram Wilander
c6c3f1e478 Update client license etag to handle new features (#2716) 2016-04-15 08:48:14 -04:00
Joram Wilander
49ab8b2161 Add custom branding functionality (#2667) 2016-04-11 13:45:03 -04:00
Christopher Speller
81e7e85369 Fixing build 2016-04-11 08:49:03 -04:00
Harrison Healey
3803750fb1 Changed getFile api call to always attach headers 2016-04-08 18:06:35 -04:00
enahum
df77179ecc Fix email verification process (#2664)
- Fix email verification URL in login view
- Fix URL in email being sent for verification
- Add Email Verification on password reset
- Fix display of email in reset password
- Fix URL en team_signup_password_page
- Fix typo in webapp en loc
- Add missing es locs
- Removed extra es, fr and pt locs
2016-04-08 14:04:23 -07:00
Andy Lo-A-Foe
1a1fd39cf8 PLT-2525: Render attachment fields similar to Slack
* Render attachment fields similar to Slack

* Add /loadtest json url command

This allows us to easily create test posts with 
more props like Slack attachments
2016-04-06 08:23:26 -04:00
Christopher Speller
1954c44993 Adding LDAP user filtering capability 2016-04-06 08:19:56 -04:00
JoramWilander
a9458480d5 Minor fix for expired sessions 2016-04-04 14:58:05 -04:00
JoramWilander
277630b560 Send notifications to the creator of a posting webhook 2016-04-04 11:12:37 -04:00
Joram Wilander
785553384f Merge pull request #2320 from mozilla/msg-command
PLT-2231 /msg command and tests
2016-04-04 08:20:21 -04:00
Christopher Speller
7e9c7ce60a Visiting invalid URLs and bad APIs causes redirect to error page 2016-04-01 11:51:17 -04:00
Harrison Healey
a0a747b2b3 Merge pull request #2590 from mattermost/plt-2287
PLT-2287 Disable previously created public links with the config setting
2016-03-31 12:21:40 -04:00
JoramWilander
c27f700670 Disable previously created public links with the config setting 2016-03-31 10:08:20 -04:00