summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* PLT-3143 Added serverside code for custom Emoji (#3311)Harrison Healey2016-06-144-0/+261
| | | | | | | | | | | | | | * Added model objects for emoji * Added database tables for emoji * Added settings for custom emoji * Added serverside APIs and unit tests for custom emoji * Added additional validation to catch duplicate emoji names earlier on * Added additional validation to prevent users from adding emoji as another user
* Merge branch 'release-3.1'JoramWilander2016-06-132-25/+76
|\ | | | | | | | | Conflicts: webapp/components/create_comment.jsx
| * Correctly set defaults for all LDAPSettings in the config (#3301)Joram Wilander2016-06-091-24/+64
| |
| * Changed default LocalizationSettings.AvailableLocales to include all locales ↵Harrison Healey2016-06-071-1/+11
| | | | | | | | (#3280)
| * Bumping version to: 3.1.0-rc1Mattermost Build2016-06-061-0/+1
| |
* | PLT-2058 Debugging incoming web hook content (#3150)Martin Schenck2016-06-101-6/+7
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-2058 Debugging incoming web hook content This change debugs contents of incoming webhooks using l4g. The problem is that in order to debug the request body, it neads to be read. And a Reader can only be read once. Hence, the body is only read for Debugging if it is actually enabled. Furthermore, a new reader is created from the content of the old reader in order for the rest of the method to work as usual (with or without debugging). The debug statement is wrapped in a closure, so that the content is only copied if Debug is actually enabled. It is not possible to return `(string, string)` from the closure to `l4g.Debug()`. That is the reason the debugging is not done with `=%v`, but the translations strings end with a space. I tested the change with a `application/json` HTTP header as well as `payload=` The debug method is extracted into util/log.go in order to be re-usable for debugging `io.Reader` * Added a config flag to turn off incoming webhook debugging Setting `EnableWebhookDebugging` to false in the `config.json` will disable the printing of the content of incoming webhooks to the console * Defaulting webhook debugging to true * Added the setting of debugging incoming webhooks to the system console
* PLT-3114 Moved preview collapse out of pre-release features (#3206)Joram Wilander2016-06-061-0/+3
| | | | | | | | | | * Added user setting to auto collapse image previews * Added slash commands for collapsing/expanding image previews * Added translation strings for collapse setting * Add default props for preview collapse setting
* PLT-2939 Fix Default slash command icon is invalid (#3250)enahum2016-06-061-1/+0
|
* Adding LDAP Syncronization (#3219)Christopher Speller2016-06-033-0/+231
|
* PLT-1800 Load server side locale from the config.json (#3202)enahum2016-06-022-15/+35
| | | | | | | | | | | | * 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 * Remove github.com/cloudfoundry/jibber_jabber as vendor dependency * Fix get locale on login_controller
* Close HTTP response bodies properly in golang driver (and some api ↵Joram Wilander2016-06-021-4/+114
| | | | functions) (#3217)
* PLT-2283 Improved trimming of punctuation from hashtags and search terms (#3178)Harrison Healey2016-06-013-7/+20
| | | | | | * Improved trimming of punctuation from hashtags and search terms * Separated punctuation regexes used for hashtags and for search terms
* Revert "PLT-1800 Load server side locale from the config.json" (#3201)Christopher Speller2016-06-012-35/+15
|
* PLT-1800 Load server side locale from the config.json (#3135)enahum2016-06-012-15/+35
| | | | | | | | | | * 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 * Remove github.com/cloudfoundry/jibber_jabber as vendor dependency
* PLT-2170 Send payload in application/json for outgoing webhooks (#3160)Thomas Balthazar2016-05-312-0/+90
| | | | | | | | | | | | | | | * Send payload in application/json for outgoing webhooks The Add outgoing webhook UI now has a 'Content-Type' field that allows to choose between application/x-www-form-urlencoded and application/json. All outgoing webhooks created before this change will be considered as x-www-form-urlencoded. There's also a minor change in the way the outgoing webhook summary is displayed: the 'Callback URLs' label was missing. * Fix JS formatting errors * Increase ContentType field length to 128
* Added validation to make sure theme entries are colours (#3107)Harrison Healey2016-05-312-0/+28
| | | | | | * Added validation to make sure theme entries are colours * Added serverside validation for theme
* Revert "PLT-1800 Load server side locale from the config.json" (#3133)Christopher Speller2016-05-272-35/+15
|
* PLT-1800 Load server side locale from the config.json (#3092)enahum2016-05-272-15/+35
| | | | | | | | * 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
* Adding APIs to reload config, recycle db connections and ping server (#3096)Corey Hulen2016-05-241-15/+113
| | | | | | | | * Adding APIs to reload config, recycle db connections and ping server * Fixing unit test * Adding unit tests
* Revert "PLT-1800 Load server side locale from the config.json (#3076)"Christopher Speller2016-05-242-35/+15
| | | | This reverts commit 34beaa569bfb32f1607375f1d5a22859322060d2.
* Max_File_Size setting in System Console > File Settings (#3070)Thomas Balthazar2016-05-242-4/+10
|
* PLT-1800 Load server side locale from the config.json (#3076)enahum2016-05-242-15/+35
| | | | | | * PLT-1800 Load server side locale from the config.json * Add support for locales with country specifics
* Added validation for command triggers (#3068)David Lu2016-05-201-1/+4
|
* Adding enterprise build hash to about dialog (#3058)Christopher Speller2016-05-201-0/+1
|
* PLT-2664 Split out push notifications from email notifications (#3049)Joram Wilander2016-05-191-0/+1
| | | | | | | | * Split out push and email notification logic, always send push notifications on mention * Add user setting to control push notifications * Minor changeto simplify code
* Integrations: Enable <!channel> notifications in incoming webhooks (#3039)Thomas Balthazar2016-05-182-0/+111
|
* Merge branch 'release-3.0'Christopher Speller2016-05-171-1/+1
|\
| * PLT-2965 Fix config sanitation (#3005)enahum2016-05-161-1/+1
| |
| * Fix heavy regression on GitLab for version 3.0.0 (#3000)ArthurH2016-05-161-1/+2
| | | | | | Fix regression on GitLab
* | PLT-2188 Integrations: Support raw new lines in the text payload (#2993)Thomas Balthazar2016-05-172-4/+150
| | | | | | | | | | | | | | | | | | | | * Integrations: Support raw new lines in the text payload * Improve support for raw new lines in text payload The regexp used to escape control characters now also searches for additional fields: text|fallback|pretext|author_name|title|value
* | Fix heavy regression on GitLab for version 3.0.0 (#3000)ArthurH2016-05-161-1/+2
|/ | | Fix regression on GitLab
* PLT-2905 fixing upgrade of SSO accounts (#2962)Corey Hulen2016-05-112-9/+20
| | | | | | * PLT-2905 fixing upgrade of SSO accounts * Fixing multiple Auths mapped to different emails
* PLT-2862 Re-added LDAP login boxes as part of signup flow (#2937)Harrison Healey2016-05-091-0/+8
| | | | | | * Added ldap_only parameter for login API * Re-added LDAP login boxes as part of signup flow
* Recent mention searches now OR terms instead of AND (#2931)Joram Wilander2016-05-092-2/+6
|
* PLT-2600/PLT-2770 Changed getPublicLink api call to return a proper JSON ↵Harrison Healey2016-05-062-8/+21
| | | | | | | | string (#2914) * Removed unused channelId and userId parameters from web client getPublicLink method * Changed getPublicLink api call to return a proper JSON string
* PLT-2697 Fixing team admins (#2900)Corey Hulen2016-05-062-2/+44
| | | | | | | | | | | | * PLT-2697 Fixing team admins * Fixing eslint error * Fixing loc issues * Fixing func * Fixing func
* Add separator between DMs on your team and not (#2910)Joram Wilander2016-05-061-0/+1
|
* PLT-2600/PLT-2770 Added Get Public Link modal and added new API for public ↵Harrison Healey2016-05-051-3/+10
| | | | | | | | file links (#2892) * Switched public file links to use a GetLinkModal * Separated getFile and the new getPublicFile api calls
* PLT-2798 Config sanitation fails when no LDAP Settings are present in ↵enahum2016-05-051-1/+1
| | | | config.json (#2882)
* PLT-2797 Remove LDAP Password Field Name setting (#2884)enahum2016-05-051-7/+1
|
* PLT-2707 Adding option to show DM list from all of server (#2871)Corey Hulen2016-05-042-4/+17
| | | | | | * PLT-2707 Adding option to show DM list from all of server * Fixing loc
* Sanitize sensitive data of out config file for the system console (#2849)Joram Wilander2016-05-032-4/+34
|
* PLT-2258 Unified login screen and related APIs (#2820)Harrison Healey2016-05-031-36/+5
| | | | | | | | | | | | | | | | | | | | * 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
* Port HPNS from 2.2 to master (#2863)Joram Wilander2016-05-032-11/+25
|
* added TrimSpace() to GLU email (#2827)Cyril Terets2016-04-291-0/+1
|
* Fixing help links=Corey Hulen2016-04-282-0/+34
|
* Add websocket event and cache invalidation for deleting channels (#2807)Joram Wilander2016-04-272-0/+2
|
* Fixing permalinks to channels your not a memeber of (#2805)Christopher Speller2016-04-271-0/+13
|
* Fixed updating mention keys when a user's username changes (#2774)Harrison Healey2016-04-252-4/+46
|
* PLT-2057 User as a first class object (#2648)Corey Hulen2016-04-2117-147/+596
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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