mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
8 158 коммитов 3 Ветки 0 Теги
c6ded1dbfd69a1da69add8d2b554f4b7dd0341b3
Граф коммитов

133 Коммитов

Автор SHA1 Сообщение Дата
George Goldberg
c6ded1dbfd Merge branch 'release-3.7' 2017-03-23 17:38:24 +00:00
Joram Wilander
2a753949f1 Implement POST /users/search endpoint for APIv4 (#5822) 
* 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)
 2017-03-23 10:34:22 +00:00
enahum
8ec3757074 PLT-5905 Fix saml certificates for 3.7 (#5843) 2017-03-22 21:26:00 +00:00
enahum
7e2e823884 PLT-5905 Fix saml certificates (#5803) 2017-03-22 19:24:05 +00:00
George Goldberg
0e98dfa445 PLT-5872: Remove Security Category from Security Alerts. (#5835) 
It wasn't actually providing any information, just `c=d` every time.
 2017-03-22 10:51:38 -04:00
Joram Wilander
dcdea9b54c Fix compile error on master (#5813) 2017-03-20 10:12:43 -04:00
Josta Yee
e86add77ad Add http_proxy support for http client (#5571) 
- if 'http_proxy' environment variable is set, respect it when creating http client
- otherwise initialize a http client with timeout settings

Add ogjson to cache even when it fails

in this way we can prevent from requesting unparsable urls repeatedly

Extend expire time of cached link preview data to a week

There's no need to invalidate cache and send request again frequently

Revert timeout

Revert cache_expire_time
 2017-03-20 10:20:42 -03:00
Saturnino Abril
7e89077a93 Endpoint for APIv4 POST /channels/{channel_id}/members (#5775) 2017-03-20 12:44:08 +00:00
George Goldberg
7f266c1951 Merge branch 'release-3.7' into master. 2017-03-17 16:29:26 +00:00
Christopher Speller
9298315ce9 Fxing code coverage numbers + APIv4 tests with EE (#5789) 2017-03-16 14:00:00 -07:00
Joram Wilander
0bc3e46082 Implement GET /logs endpoint for APIv4 (#5778) 2017-03-16 11:59:44 -07:00
Joram Wilander
d757645c24 Implement some channel endpoints for APIv4 (#5767) 2017-03-16 11:58:33 -07:00
Carlos Tadeu Panato Junior
6a5f621f73 cannot change ID and deleteat when trying to update the hook (#5784) 2017-03-16 16:26:15 +00:00
George Goldberg
91d430b2a3 Fix policy application in team edition. (#5771) 2017-03-15 19:32:02 +00:00
Joram Wilander
ad0ed008fe Implement brand image endpoints for APIv4 (#5733) 
* Implement brand image endpoints for APIv4

* Fix unit test
 2017-03-14 09:35:48 -04:00
Saturnino Abril
a71a9fc3bf APIv4 DELETE channels/{channel_id} (#5723) 2017-03-14 12:08:58 +00:00
Joram Wilander
ca90fe5cbe Fix permalink in email for DMs/GMs (#5751) 2017-03-13 17:20:21 +00:00
Joram Wilander
19c67d7fe3 Implement GET and POST /hooks/outgoing endpoints for APIv4 (#5645) 2017-03-13 10:40:43 -04:00
Joram Wilander
3ebfb36953 Implement compliance endpoints for APIv4 (#5683) 
* Implement compliance endpoints for APIv4

* Add paging to get reports endpoint
 2017-03-13 10:14:16 -04:00
Joram Wilander
a284cd8c18 Implement some team endpoints for APIv4 (#5745) 
* Implement PUT /teams/{team_id} endpoint for APIv4

* Implement GET /users/{user_id}/teams/{team_id}/unread endpoint for APIv4

* Implement POST /teams/{team_id}/members/ids endpoint for APIv4

* Remove debug statement
 2017-03-13 09:46:28 -04:00
Joram Wilander
e9c6cc269b Move command logic into app layer (#5617) 2017-03-13 09:23:16 -04:00
Joram Wilander
8b0eedbbcd Implement PUT /users/{user_id}/mfa endpoint for APIv4 (#5743) 2017-03-13 12:29:56 +00:00
Joram Wilander
1860d05d62 Implement GET /users/autocomplete endpoint for APIv4 (#5742) 2017-03-13 12:29:41 +00:00
Saturnino Abril
8731465957 Endpoint for APIv4: GET /team/{team_id}/channels (#5681) 2017-03-13 12:26:51 +00:00
Joram Wilander
3559fb7959 Implement SAML endpoints for APIv4 (#5671) 
* Implement SAML endpoints for APIv4

* Fix unit test

* Only disable encryption when removing puplic/private certs
 2017-03-13 12:26:23 +00:00
Carlos Tadeu Panato Junior
11f1859de1 improvements for inbucket email test and re-enable Email mention test (#5647) 
Now if we dont get the mailbox to check the email we try 5 times, if
still no message we disable the email verification.
 2017-03-11 19:39:00 -03:00
Saturnino Abril
d32334cdfb Endpoint for APIv4: /files/{file_id}/link (#5607) 
* APIv4: /files/{file_id}/link

* updated public link
 2017-03-11 19:24:44 -03:00
Harrison Healey
06a7c3ba8e PLT-5800 Cleaned up duplicated code for adding slack attachments to posts (#5711) 2017-03-10 10:22:14 +00:00
Harrison Healey
a8e68bd890 PLT-5765 Passed SiteURL to SendNotifications (#5705) 2017-03-10 10:18:18 +00:00
Joram Wilander
9c13863f48 Fix GMs showing up on refresh after being hidden (#5702) 2017-03-09 19:41:03 +00:00
Harrison Healey
5d62b3661b Added additional validation for slack attachment format on server (#5680) 2017-03-08 09:15:33 +00:00
Joram Wilander
83291e4c8f Merge 3.7 changes into master (#5679) 
* Save schema version for 3.7 (#5675)

* Adding index and cache to reactinos store (#5654)

* Fix badge count for push notifications (#5672)
 2017-03-07 16:05:01 -05:00
Christopher Speller
33b8b72a02 Adding index and cache to reactinos store (#5654) 2017-03-07 09:37:00 -05:00
Corey Hulen
3f070fe4b8 PLT-5685 Fixing perf issue and problem with pushing for any activity (#5662) 
* PLT-5685 Fixing perf issue and problem with pushing for any activity

* PLT-5685 Fixing perf issue and problem with pushing for any activity
 2017-03-06 17:06:27 -05:00
George Goldberg
fe3e3f7ef2 Remove FIXME and XXX from bulk import tests. (#5664) 2017-03-06 16:59:20 -05:00
Corey Hulen
847c716ea2 Example of how to call metrics (#5621) 2017-03-06 10:15:37 -05:00
George Goldberg
ca6f364d70 Fix license telemetry. (#5641) 2017-03-06 09:16:07 -05:00
enahum
511e9272da PLT-5701 Fix DM email subject text (#5630) 2017-03-04 17:55:47 +00:00
enahum
4fd6b909af PLT-4969 remove Push notifications @ preceeding the username or the user's name (#5629) 2017-03-04 17:54:46 +00:00
Joram Wilander
2e911b77c3 Usernames must start with a letter (#5581) 2017-03-03 12:04:15 -05:00
Joram Wilander
3a91d4e5e4 PLT-3077 Add group messaging (#5489) 
* Implement server changes for group messaging

* Majority of client-side implementation

* Some server updates

* Added new React multiselect component

* Fix style issues

* Add custom renderer for options

* Fix model test

* Update ENTER functionality for multiselect control

* Remove buttons from multiselect UI control

* Updating group messaging UI (#5524)

* Move filter controls up a component level

* Scroll with arrow keys

* Updating mobile layout for multiselect (#5534)

* Fix race condition when backspacing quickly

* Hidden or new GMs show up for regular messages

* Add overriding of number remaining text

* Add UI filtering for team if config setting set

* Add icon to channel switcher and class prop to status icon

* Minor updates per feedback

* Improving group messaging UI (#5563)

* UX changes per feedback

* Update email for group messages

* UI fixes for group messaging (#5587)

* Fix missing localization string

* Add maximum users message when adding members to GM

* Fix input clearing on Android

* Updating group messaging UI (#5603)

* Updating UI for group messaging (#5604)
 2017-03-02 17:48:56 -05:00
Ryan Wang
8c5cee9521 Correct typo in app/email.go (#5569) 2017-03-02 18:39:16 -03:00
enahum
7de54f063c Fix push notifications where channel is set to all activity (#5594) 
* Fix push notifications where channel is set to all activity

* feedback review

* moved push notification logic to DoesStatusAllowPushNotification

* Have every option handled in ShouldSendPushNotification

* unit tests
 2017-03-02 18:38:38 -03:00
George Goldberg
f513879ffc PLT-5479: Import Slack team without emails. (#5597) 
Use a fake email address for now, and inform the user doing the import
clearly that this has been done.
 2017-03-02 09:12:23 -05:00
Corey Hulen
7829c24e92 Removing typing check for master (#5583) 
* Removing typing check for master

* Removing typing check for master
 2017-03-01 12:49:46 -05:00
Corey Hulen
71e6a423e8 Optimizing weh_hub.Start() for master (#5576) 
* Optimizing weh_hub.Start()

* Optimizing weh_hub.Start()

* Optimizing weh_hub.Start()

* Adding to IsAuthenticated

* Fixing problem with IsAuthenticated
 2017-03-01 11:03:21 -05:00
Carlos Tadeu Panato Junior
e5065cf757 Make all emails with the same pattern on subject (#5198) 
* make all email subject standard

* move SendPasswordReset to app/email.go

update per review

* update email subjects per review

update error

fix expected subject

* Update email_test.go

* Update en.json

* fix missing quotes
 2017-03-01 09:28:38 -05:00
Corey Hulen
fc9e5d8510 Fixing removing push tokens and logging error messages (#5551) 2017-02-28 22:19:19 -03:00
George Goldberg
f7682ad11a PLT-5367: Basic post bulk importing. (#5562) 2017-02-28 20:55:21 -03:00
Josta Yee
23be0167f4 Set timeout to http client (#5540) 
Update client
 2017-02-28 17:59:53 -05:00