Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | PLT-6019: Add APIv4 Endpoint for restoring Channels (#6263) | Robin Naundorf | 2017-05-15 | 1 | -0/+8 | |
| | ||||||
* | Merge branch 'release-3.9' into merge-3.9 | JoramWilander | 2017-05-12 | 8 | -14/+89 | |
|\ | ||||||
| * | Send status change event if status changes on channel view (#6389) | Joram Wilander | 2017-05-11 | 2 | -4/+16 | |
| | | ||||||
| * | PLT-6523: Don't crash when replying to a post whose poster has left the ↵ | George Goldberg | 2017-05-10 | 2 | -1/+45 | |
| | | | | | | | | channel. (#6388) | |||||
| * | Detach session activity update from statuses (#6379) | Joram Wilander | 2017-05-10 | 4 | -7/+22 | |
| | | ||||||
| * | Get protocol correctly if using SSL direct to Mattermost (#6361) | Joram Wilander | 2017-05-09 | 1 | -1/+1 | |
| | | ||||||
| * | Forward port 3.8.1 changes that missed master (#6362) | Joram Wilander | 2017-05-09 | 1 | -1/+5 | |
| | | ||||||
| * | Fixing session error (#6370) | Christopher Speller | 2017-05-09 | 1 | -1/+1 | |
| | | ||||||
* | | Fix some issues in English (#5714) | William Gathoye | 2017-05-11 | 1 | -1/+1 | |
| | | ||||||
* | | PLT-6488: Reduce database queries in user bulk import. (#6371) | George Goldberg | 2017-05-10 | 3 | -42/+95 | |
| | | ||||||
* | | Fixing session error (#6370) | Christopher Speller | 2017-05-09 | 1 | -1/+1 | |
| | | ||||||
* | | Add API Endpoint for deleted Channels (#5889) | Robin Naundorf | 2017-05-09 | 1 | -0/+8 | |
|/ | ||||||
* | PLT-6492 Use new cookie to determine if user is logged in (#6317) | Joram Wilander | 2017-05-04 | 1 | -0/+10 | |
| | | | | | | * Use new cookie to determine if user is logged in * Add temporary code for 3.9 to prevent forced re-login | |||||
* | PLT-6262 Add config setting to disable file attachments (#6301) | Joram Wilander | 2017-05-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | * Add config setting to disable file attachments * Add unit tests * Updating UI for no attachments (#6312) * Update UI text on file upload System Console setting (#6313) * Update storage_settings.jsx * Update en.json | |||||
* | Update channel patch to post the correct system messages (#6290) | Joram Wilander | 2017-05-03 | 1 | -2/+29 | |
| | ||||||
* | PLT-6380 Fired websocket event when user joins a team (#6266) | Harrison Healey | 2017-05-03 | 1 | -2/+5 | |
| | ||||||
* | PLT-6277 Moved profile image cropping to server (#6269) | Harrison Healey | 2017-05-03 | 1 | -1/+1 | |
| | | | | | | * PLT-6277 Moved profile image cropping to server * Cosmetic refactoring of SettingPicture component | |||||
* | Add Password field to Bulk Importer. (#6268) | George Goldberg | 2017-04-28 | 2 | -1/+40 | |
| | ||||||
* | PLT-6214 Move channel store and actions over to redux (#6235) | Joram Wilander | 2017-04-28 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | * Move channel store and actions over to redux * Fix style errors * Fix unit test * Various fixes * More fixes * Revert config changes | |||||
* | Parallelise Bulk Import. (#6267) | George Goldberg | 2017-04-28 | 2 | -6/+70 | |
| | | | | | | * Parallelise Bulk Import. * Set worker count through command line flag. | |||||
* | PLT-6271 Changed word splitting to initially split on any non-name character ↵ | Harrison Healey | 2017-04-28 | 3 | -34/+38 | |
| | | | | | | | | (#6261) * PLT-6271 Changed word splitting to initially split on any non-name character * Fixed detection of out of channel mentions | |||||
* | Add config setting to disable statuses (#6254) | Joram Wilander | 2017-04-28 | 1 | -0/+28 | |
| | ||||||
* | Creating common token store and moving email invites and verification to it ↵ | Christopher Speller | 2017-04-27 | 5 | -53/+126 | |
| | | | | (#6213) | |||||
* | PLT-6108 fixing to use senderId for push (#6245) | Corey Hulen | 2017-04-27 | 1 | -1/+1 | |
| | ||||||
* | PLT-3915/PLT-5550 Improve handling of Markdown while parsing mentions (#6091) | Harrison Healey | 2017-04-26 | 2 | -1/+209 | |
| | | | | | | | | * PLT-3915 Removed ability to mention users in code blocks * PLT-3915 Added simple check for potential code blocks before using regexes * PLT-5550 Improve splitting when parsing mentions to ignore markdown characters | |||||
* | PLT-6108 adding extra params to push notifications (#6236) | Corey Hulen | 2017-04-26 | 1 | -0/+14 | |
| | | | | | | * PLT-6108 adding extra params to push notifications * PLT-6108 adding extra params to push notifications | |||||
* | Fix OAuth SSO first account creation, add mobile support, and fix refresh ↵ | Joram Wilander | 2017-04-25 | 1 | -6/+9 | |
| | | | | tokens (#6181) | |||||
* | PLT-4457 Added API to get multiple users by their usernames (#6218) | Harrison Healey | 2017-04-25 | 2 | -38/+26 | |
| | | | | | | | | | | * Allow getting profiles by username without a team * Changed UserStore.GetProfilesByUsernames to return an array * PLT-4457 Added API to get multiple users by their usernames * Changed users/names route to users/usernames | |||||
* | Fxing hub panic (#6214) | Christopher Speller | 2017-04-24 | 1 | -2/+3 | |
| | ||||||
* | APIv4 DELETE /users/{user_id}/posts/{post_id}/reactions/name (#6117) | Saturnino Abril | 2017-04-22 | 1 | -0/+17 | |
| | | | | | | | | | | * APIv4 DELETE /users/{user_id}/posts/{post_id}/reactions/name * updated v3 deleteReaction endpoint * update parameter of app.DeleteReactionForPost() * update utils.IsValidAlphaNum, add utils.IsValidAlphaNumHyphenUnderscore, and add related tests | |||||
* | Adding slow pump detection to web_conn and better metrics (#6114) | Corey Hulen | 2017-04-21 | 1 | -21/+43 | |
| | | | | | | | | * Adding slow pump detection to web_conn and better metrics * Fixing bad merge * Fixing typo | |||||
* | [APIV4] GET /emoji/{emoji_id}/image for apiV4 (#6141) | Carlos Tadeu Panato Junior | 2017-04-20 | 1 | -1/+22 | |
| | | | | | | * implement GET /emoji/{emoji_id}/image for apiV4 * update per request | |||||
* | Implement v4 endpoints for OAuth (#6040) | Joram Wilander | 2017-04-20 | 1 | -14/+14 | |
| | | | | | | | | | | | | | | | | | | * Implement POST /oauth/apps endpoint for APIv4 * Implement GET /oauth/apps endpoint for APIv4 * Implement GET /oauth/apps/{app_id} and /oauth/apps/{app_id}/info endpoints for APIv4 * Refactor API version independent oauth endpoints * Implement DELETE /oauth/apps/{app_id} endpoint for APIv4 * Implement /oauth/apps/{app_id}/regen_secret endpoint for APIv4 * Implement GET /user/{user_id}/oauth/apps/authorized endpoint for APIv4 * Implement POST /oauth/deauthorize endpoint | |||||
* | PLT-1384 Added websocket event when preferences are updated/deleted (#6107) | Harrison Healey | 2017-04-20 | 1 | -6/+29 | |
| | ||||||
* | Don't sanitize returned user when updating a user (#6095) | Joram Wilander | 2017-04-19 | 1 | -7/+5 | |
| | | | | | | * Don't sanitize returned user when updating a user * Use user model function for clearing private data | |||||
* | Revert "Usernames must start with a letter (#5581)" | Christopher Speller | 2017-04-18 | 2 | -9/+9 | |
| | | | | This reverts commit 2e911b77c3386833f8f0cea82c7b6b3e5583a08e. | |||||
* | Adding hub deadlock detection into master (#6100) | Corey Hulen | 2017-04-18 | 1 | -13/+79 | |
| | ||||||
* | APIv4 POST /reactions (#6092) | Saturnino Abril | 2017-04-18 | 1 | -0/+34 | |
| | | | | | | * APIv4 POST /reactions * update corresponding V3 endpoint | |||||
* | Merge branch 'release-3.8' | Christopher Speller | 2017-04-17 | 1 | -1/+1 | |
|\ | ||||||
| * | PLT-5977: Only reload clients when client config changes. (#5989) | George Goldberg | 2017-04-05 | 1 | -1/+1 | |
| | | ||||||
* | | PLT-6317 disable file watcher while running from makefile (#6103) | Corey Hulen | 2017-04-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | * PLT-6317 disable file watcher while running from make file * Removing debug stmt | |||||
* | | implement DELETE /emoji/{emoji_id} fro apiV4 (#6021) | Carlos Tadeu Panato Junior | 2017-04-17 | 1 | -0/+42 | |
| | | | | | | implement GET /emoji/{emoji_id} for apiv4 | |||||
* | | Implement GET /webrtc/token endpoint for APIv4 (#6046) | Joram Wilander | 2017-04-16 | 1 | -0/+87 | |
| | | ||||||
* | | PLT-6113 Added initial unit tests for cmd package (#6086) | Harrison Healey | 2017-04-15 | 2 | -1/+11 | |
| | | | | | | | | | | | | | | | | * Fixed app.CreateUser not using the provided locale * Added initial unit tests for cmd package * Disabled unit tests while we move to 'go build' | |||||
* | | Fixed copyright dates (#6109) | Harrison Healey | 2017-04-13 | 1 | -1/+1 | |
| | | ||||||
* | | Refactor OAuth 2.0 code into app layer (#6037) | Joram Wilander | 2017-04-12 | 2 | -1/+507 | |
| | | ||||||
* | | Fixing error messages (#5995) | Corey Hulen | 2017-04-12 | 1 | -2/+2 | |
| | | ||||||
* | | PLT-5860 Updated copyright date (#6058) | Harrison Healey | 2017-04-12 | 69 | -78/+77 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * PLT-5860 Updated copyright date in about modal * PLT-5860 Updated copyright notice in JSX files * PLT-5860 Updated copyright notice in go files * Fixed misc copyright dates * Fixed component snapshots | |||||
* | | APIv4 GET /posts/{post_id}/reactions (#6047) | Saturnino Abril | 2017-04-11 | 1 | -0/+16 | |
| | | ||||||
* | | Refactor switching login type code into app layer and add v4 endpoint (#6000) | Joram Wilander | 2017-04-10 | 3 | -15/+256 | |
| | | | | | | | | | | | | * Refactor switching login type code into app layer and add v4 endpoint * Fix unit test |