Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'release-3.7' | George Goldberg | 2017-03-23 | 12 | -116/+284 | |
|\ | ||||||
| * | PLT-5905 Fix saml certificates for 3.7 (#5843) | enahum | 2017-03-22 | 1 | -1/+14 | |
| | | ||||||
| * | Fix telemetry. (#5841) | George Goldberg | 2017-03-22 | 1 | -1/+1 | |
| | | ||||||
| * | Fxing some unit tests | Christopher Speller | 2017-03-22 | 2 | -5/+5 | |
| | | ||||||
| * | PLT-5943 Reduce minimum username length (#5798) | Joram Wilander | 2017-03-17 | 3 | -5/+3 | |
| | | ||||||
| * | Fix policy application in team edition. (#5771) | George Goldberg | 2017-03-15 | 8 | -110/+280 | |
| | | ||||||
* | | Websocket CORS Support (#5667) | Brad Howes | 2017-03-23 | 2 | -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 Junior | 2017-03-23 | 3 | -2/+110 | |
| | | ||||||
* | | PLT-5913: Remove id from heading markdown compilation (#5782) | VeraLyu | 2017-03-23 | 2 | -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 Speller | 2017-03-23 | 1 | -8/+8 | |
| | | ||||||
* | | add implementation to get outgoing webhook for apiv4 (#5827) | Carlos Tadeu Panato Junior | 2017-03-23 | 3 | -0/+79 | |
| | | ||||||
* | | PLT-5669: Change format of timestamp of access history (#5646) | VeraLyu | 2017-03-23 | 2 | -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 Junior | 2017-03-23 | 1 | -1/+1 | |
| | | ||||||
* | | Implement POST /users/search endpoint for APIv4 (#5822) | Joram Wilander | 2017-03-23 | 10 | -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) | enahum | 2017-03-22 | 1 | -1/+14 | |
| | | ||||||
* | | Update channel permissions for v4 endpoints (#5829) | Joram Wilander | 2017-03-22 | 5 | -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 Goldberg | 2017-03-22 | 1 | -3/+0 | |
| | | | | | | It wasn't actually providing any information, just `c=d` every time. | |||||
* | | translations PR 20170320 (#5819) | enahum | 2017-03-21 | 20 | -131/+263 | |
| | | ||||||
* | | Add IDs to Team Settings, Channel Settings, Account Settings (Display & ↵ | Eric Sethna | 2017-03-21 | 11 | -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 | |||||
* | | Add ability to use 'me' in place of user id for APIv4 (#5826) | Joram Wilander | 2017-03-21 | 4 | -0/+32 | |
| | | ||||||
* | | Implement GET /audits endpoint for APIv4 (#5779) | Joram Wilander | 2017-03-21 | 6 | -12/+78 | |
| | | | | | | | | | | | | * Implement GET /audits endpoint for APIv4 * Fix log unit test | |||||
* | | implement PUT /hooks/outgoing/{hook_id} - update outgoing hook (#5793) | Carlos Tadeu Panato Junior | 2017-03-21 | 3 | -0/+221 | |
| | | ||||||
* | | translations PR 20170316 (#5791) | enahum | 2017-03-20 | 18 | -114/+478 | |
| | | ||||||
* | | Update contributing guidelines for platform repo (#5455) | Jason Blais | 2017-03-20 | 1 | -14/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update CONTRIBUTING.md * Fix formatting * Update CONTRIBUTING.md * Update CONTRIBUTING.md * ES: minor tweaks to review process * Update CONTRIBUTING.md | |||||
* | | Revert "PLT-3181 Added crossorigin='anonymous' to all external images ↵ | Harrison Healey | 2017-03-20 | 7 | -15/+5 | |
| | | | | | | | | | | (#5774)" (#5815) This reverts commit 24848f9d6a92eb1e09189c358636fd1ba32fa6d6. | |||||
* | | Fxing some unit tests (#5817) | Christopher Speller | 2017-03-20 | 2 | -5/+5 | |
| | | ||||||
* | | Fix compile error on master (#5813) | Joram Wilander | 2017-03-20 | 2 | -3/+3 | |
| | | ||||||
* | | Remove blue bar from link previews (#5673) | Ryan Wang | 2017-03-20 | 1 | -0/+3 | |
| | | ||||||
* | | Add http_proxy support for http client (#5571) | Josta Yee | 2017-03-20 | 2 | -6/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | |||||
* | | Fix success typo in Makefile (#5809) | Joram Wilander | 2017-03-20 | 1 | -1/+1 | |
| | | ||||||
* | | Removing old CLI (#5797) | Christopher Speller | 2017-03-20 | 4 | -1127/+3 | |
| | | ||||||
* | | [APIV4] POST /hooks/outgoing/{hook_id}/regen_token - regentoken endpoint ↵ | Carlos Tadeu Panato Junior | 2017-03-20 | 3 | -0/+89 | |
| | | | | | | | | for apiV4 (#5783) | |||||
* | | Update pinned posts help text (#5811) | Jason Blais | 2017-03-20 | 2 | -4/+11 | |
| | | | | | | | | | | | | | | | | * Update pinned posts help text * Update en.json * Fix id | |||||
* | | Endpoint for APIv4 POST /channels/{channel_id}/members (#5775) | Saturnino Abril | 2017-03-20 | 5 | -2/+172 | |
| | | ||||||
* | | Add updateConfig endpoint for apiV4 (#5706) | Carlos Tadeu Panato Junior | 2017-03-20 | 5 | -2/+82 | |
| | | ||||||
* | | Split delete modal trigger for reuse (#5740) | VeraLyu | 2017-03-19 | 5 | -65/+133 | |
| | | | | | | | | Spllit delete modal trigger for reuse and make emoji delete to use this modal trigger. | |||||
* | | Fxing build | Christopher Speller | 2017-03-17 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'release-3.7' into master. | George Goldberg | 2017-03-17 | 91 | -799/+939 | |
|\| | ||||||
| * | PLT-5804 Fix email blue error not showing up (#5749) | Joram Wilander | 2017-03-14 | 1 | -1/+1 | |
| | | ||||||
| * | Fix permalink in email for DMs/GMs (#5751) | Joram Wilander | 2017-03-13 | 1 | -2/+1 | |
| | | ||||||
| * | Report correct session for React Native app (#5734) | enahum | 2017-03-13 | 1 | -2/+2 | |
| | | ||||||
| * | PLT-5800 Cleaned up duplicated code for adding slack attachments to posts ↵ | Harrison Healey | 2017-03-10 | 4 | -91/+19 | |
| | | | | | | | | (#5711) | |||||
| * | translations PR 20170309 (#5710) | enahum | 2017-03-10 | 22 | -435/+489 | |
| | | ||||||
| * | PLT-5792 Fixed all ephemeral posts using system message icons (#5709) | Harrison Healey | 2017-03-10 | 1 | -3/+1 | |
| | | ||||||
| * | PLT-5765 Passed SiteURL to SendNotifications (#5705) | Harrison Healey | 2017-03-10 | 35 | -118/+120 | |
| | | ||||||
| * | Fix user list updating when removing a user from team (#5712) | Joram Wilander | 2017-03-10 | 1 | -2/+2 | |
| | | ||||||
| * | PLT-5772: Use standardised javascript method instead of Chrome-only one. (#5708) | George Goldberg | 2017-03-09 | 1 | -1/+1 | |
| | | ||||||
| * | Fix posts from your own webhook not showing as unread until refresh (#5703) | Joram Wilander | 2017-03-09 | 2 | -2/+6 | |
| | | ||||||
| * | Fix GMs showing up on refresh after being hidden (#5702) | Joram Wilander | 2017-03-09 | 3 | -2/+6 | |
| | | ||||||
| * | Multiple bug fixes (#5699) | Asaad Mahmood | 2017-03-09 | 5 | -4/+15 | |
| | | | | | | | | | | | | * Multiple bug fixes * Fixing modal on mobile |