Commit Graph

314 Commits

Author SHA1 Message Date
Christopher Speller
ec7a273550 Revert "PLT-1800 Load server side locale from the config.json" (#3133) 2016-05-27 09:01:35 -04:00
enahum
a2c183f401 PLT-1800 Load server side locale from the config.json (#3092)
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics

* Fix localization on served locale file as plain/text
2016-05-27 08:25:37 -04:00
rompic
20302c6953 fixed type speical -> special (#3052) 2016-05-25 08:19:54 -04:00
Christopher Speller
4ae7128ecb Revert "PLT-1800 Load server side locale from the config.json (#3076)"
This reverts commit 34beaa569b.
2016-05-24 10:39:56 -04:00
enahum
34beaa569b PLT-1800 Load server side locale from the config.json (#3076)
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics
2016-05-24 08:36:27 -04:00
Christopher Speller
8fa582dd83 Filtering colons from search to prevent postgres error (#3075) 2016-05-23 09:56:39 -07:00
Christopher Speller
edd453c6cd Merge branch 'release-3.0' 2016-05-17 17:51:42 -04:00
Corey Hulen
123bfad69c Fixing LDAP issue with Postgres (#3033) 2016-05-17 15:52:10 -04:00
Joram Wilander
1f609e9cf7 Check team member instead of session for team admin role when updating/deleting channels (#3007) 2016-05-16 12:55:22 -04:00
Corey Hulen
9d94869cc6 Fixing issue with missing user (#2989) 2016-05-12 18:36:30 -07:00
Corey Hulen
3928535456 PLT-2905 fixing upgrade of SSO accounts (#2962)
* PLT-2905 fixing upgrade of SSO accounts

* Fixing multiple Auths mapped to different emails
2016-05-11 14:04:30 -04:00
Joram Wilander
07126101d3 Recent mention searches now OR terms instead of AND (#2931) 2016-05-09 09:00:08 -07:00
Joram Wilander
0cfcf5c5de Add separator between DMs on your team and not (#2910) 2016-05-06 12:08:58 -04:00
Joram Wilander
d75cb02948 Multiple cross-team functionality fixes (#2902) 2016-05-06 08:06:34 -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
Christopher Speller
5d7e34c94b Fixing ldap ability to modify user fields (#2868) 2016-05-03 12:27:00 -07:00
Park Daesun
d4a708ce19 Fix incorrect postgres keys. (#2855)
user_test.go test has errors because incorrect postgres keys.

[2016/05/03 10:19:15 KST] [EROR] /api/v3/users/create:SqlUserStore.Save code=500 rid=6h5gz1fuxids9ytzimzbgwno3e uid= ip=::1 We couldn't save the account. [details: user_id=3o8aod7uapnxzmngn3rz1rm48r, pq: duplicate key value violates unique constraint "users_email_key"]
--- FAIL: TestCreateUser (0.12s)
	user_test.go:59: : We couldn't save the account., user_id=3o8aod7uapnxzmngn3rz1rm48r, pq: duplicate key value violates unique constraint "users_email_key"

[2016/05/03 10:26:06 KST] [EROR] /api/v3/users/create:SqlUserStore.Save code=500 rid=tetdakekgffzu8muhrrxuzc9ae uid= ip=::1 We couldn't save the account. [details: user_id=izifcscu5igpzb48ey1gmi5wjw, pq: duplicate key value violates unique constraint "users_username_key"]
--- FAIL: TestCreateUser (0.12s)
	user_test.go:67: : We couldn't save the account., user_id=izifcscu5igpzb48ey1gmi5wjw, pq: duplicate key value violates unique constraint "users_username_key"
2016-05-03 12:26:36 -07: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
Park Daesun
e3f254c3be Fix the EmailVerified column value from '1' to true (#2843)
EmailVerified column type is bool.
but these queries were a string type and a number type.
this is ok in Mysql but cause errors in Postgresql.

like this(user_test.go:970).

```
[2016/05/02 23:20:47 KST] [EROR] /api/v3/users/reset_password:SqlUserStore.UpdatePassword code=500 rid=ezj4agkewibjzni3ptybq5knbh uid=9z53qbkxj7nq9m8r8jbb47enzr ip=::1 We couldn't update the user password [details: id=8bymugax77yhfff9zj4frthapc, pq: column "emailverified" is of type boolean but expression is of type integer]
--- FAIL: TestResetPassword (0.90s)
user_test.go:970: : We couldn't update the user password, id=8bymugax77yhfff9zj4frthapc, pq: column "emailverified" is of type boolean but expression is of type integer
```
2016-05-02 11:08:48 -07:00
Christopher Speller
c63e027aec Fixing LDAP editing of attributes (#2824) 2016-05-02 08:07:58 -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
Harrison Healey
d8df66c00c Fixed updating mention keys when a user's username changes (#2774) 2016-04-25 08:20:45 -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
a9bd9843d4 Lower case email before database queries (#2689) 2016-04-13 11:31:27 -07:00
Joram Wilander
49ab8b2161 Add custom branding functionality (#2667) 2016-04-11 13:45:03 -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
Harrison Healey
441156b91e Added DisplayName and Description fields to both types of webhooks and slash commands 2016-04-04 09:45:02 -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
c8b2af6246 Fix login 2016-03-31 08:59:08 -04:00
JoramWilander
f9a3a4b394 Add MFA functionality 2016-03-30 12:49:29 -04:00
Alan Mooiman
ad902f601f msg command 2016-03-24 23:45:15 -04:00
=Corey Hulen
54b9a4ef5b Removing old schema upgrades affecting postgres 2016-03-21 10:37:28 -07:00
Christopher Speller
85837efe06 Merge pull request #2475 from mattermost/plt-1606
PLT-1606/PLT-714 Change searches to AND terms instead of OR
2016-03-21 07:31:05 -04:00
Christopher Speller
35320efe1a Revert "PLT-2183 Slash command auto-complete" 2016-03-18 13:16:51 -04:00
JoramWilander
3e11921ac3 Update search unit tests 2016-03-18 12:25:11 -04:00
JoramWilander
5b7a87bd8e Change searches to AND terms instead of OR 2016-03-18 12:13:32 -04:00
Corey Hulen
53d7718e57 Merge pull request #2442 from mattermost/PLT-2115
PLT-2115 adding compliance feature
2016-03-17 13:16:10 -07:00
=Corey Hulen
5273559ca1 Fixing merge 2016-03-17 09:51:45 -07:00
Elias Nahum
1f5c8c4e4e Option to enable full snippets in push notifications 2016-03-17 13:20:17 -03:00
=Corey Hulen
b9d5b4e5dc merging files 2016-03-16 18:13:16 -07:00
Nicolas Clerc
5e2596598f add external slashcommands management 2016-03-17 01:45:37 +01:00
=Corey Hulen
e101b2cf7c Fixing unit tests 2016-03-15 19:54:04 -07:00
=Corey Hulen
36b17bf99d PLT-2115 Adding compliance 2016-03-15 18:27:45 -07:00
=Corey Hulen
397ebec88c PLT-2115 adding compliance 2016-03-14 10:22:36 -07:00
JoramWilander
fb9a6c7611 Auto-create account if team allows sign-up from login page and oauth account doesn't exist 2016-03-11 10:48:43 -05:00
=Corey Hulen
6d21a339dc PLT-2115 adding compliance feature to enterprise 2016-03-10 09:39:05 -08:00
JoramWilander
fbb71cab4b Fix unit test for session counting 2016-03-01 10:46:31 -05:00
JoramWilander
e09a18db31 Don't count expired sessions 2016-03-01 10:46:30 -05:00
JoramWilander
8239c68cf3 Refactor and modularize analytics on the client 2016-03-01 10:46:30 -05:00
Elias Nahum
f0084229a5 Member show on Activate and Hide on deactivate from channel member list and at_mention 2016-02-25 04:24:03 -03:00