summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'release-3.3' RC3Elias Nahum2016-08-0934-1935/+3077
|\|
| * daily translations 20160809 (#3772)enahum2016-08-0919-1884/+3009
| |
| * Fixed reset password error (#3769)David Lu2016-08-091-13/+6
| |
| * Use correct column type for Postgres TriggerWhen column (#3770)Joram Wilander2016-08-091-1/+1
| |
| * PLT-3865 Fix OAuth provider routes (#3768)enahum2016-08-091-3/+3
| |
| * Remove legacy code adding useless team name to oauth URLs (#3766)Joram Wilander2016-08-091-2/+2
| |
| * Changed autodetection of SiteURL (#3764)Harrison Healey2016-08-0911-32/+56
| | | | | | | | | | | | * Changed autoconfiguration of SiteURL to be done on every request * Added SiteURL to system console
* | Add missing periods in error messages (#3757)Jason Blais2016-08-093-6/+6
| |
* | Added @username and full name to user profile popover (#3765)David Lu2016-08-081-1/+19
| |
* | Merge branch 'release-3.3'Elias Nahum2016-08-0815-67/+74
|\|
| * PLT-3840 Fix Typos in cluster localization strings (#3761)enahum2016-08-081-4/+4
| |
| * PLT-3847 Fix bad merge in the System Console help text (for Office 365) (#3762)enahum2016-08-082-2/+2
| |
| * PLT-3849 Fix No error message when invalid SAML SSO URL entered in System ↵enahum2016-08-081-1/+1
| | | | | | | | Console (#3763)
| * PLT-3817 - Updating flag icon (#3750)Asaad Mahmood2016-08-086-7/+5
| | | | | | | | | | | | | | | | | | | | * Updating flag icon * Updating padding for user list * Removing stroke from hover * PLT-3794 - Fixing integrations css
| * Fix missing and bad localization strings (#3755)enahum2016-08-083-8/+9
| |
| * PLT-3811 Fix OAuth 2.0 provider help text (#3748)enahum2016-08-082-32/+32
| | | | | | | | | | | | * PLT-3811 Fix OAuth 2.0 provider help text * Fix Ids for RHS translations
| * PLT-3802 Moved compliance section of system console back to the bottom of ↵Harrison Healey2016-08-081-13/+20
| | | | | | | | the sidebar (#3751)
| * Fixing build failure caused by dependancies updatingChristopher Speller2016-08-072-4/+7
| |
| * Bumping version to: 3.3.0-rc1Mattermost Build2016-08-041-0/+1
| |
* | Fixing build failure caused by dependancies updatingChristopher Speller2016-08-072-4/+7
|/
* Adding beta label to HA (#3744)Corey Hulen2016-08-043-3/+4
|
* imported bootstrap (#3743)David Lu2016-08-041-0/+1
|
* PLT-2036 - Enabling popover on mobile (#3742)Asaad Mahmood2016-08-042-2/+4
|
* PLT-3767 Promote localizations on System Console and Account Settings (#3734)enahum2016-08-043-7/+15
|
* Fix garbled mail subject (#3694)MARUYAMA Takayuki2016-08-041-1/+1
| | | | | | * Fix garbled mail subject * Notification email subject including full month
* PLT-2899 adding clustering of app servers (#3682)Corey Hulen2016-08-0432-16/+866
| | | | | | | | | | | | | | | | | | * PLT-2899 adding clustering of app servers * PLT-2899 base framework * PLT-2899 HA backend * PLT-2899 Fixing config file * PLT-2899 adding config syncing * PLT-2899 set System console to readonly when clustering enabled. * PLT-2899 Fixing publish API * PLT-2899 fixing strings
* Update text for OAuth 2.0 and Google SSO (#3740)Jason Blais2016-08-043-4/+4
| | | | | | | | * Update help text for OAuth * Update oauth_settings.jsx * Update en.json
* Update NOTICE.txt for v3.3 (#3739)Jason Blais2016-08-041-41/+301
|
* Reverting plt-3366 due to a bug (#3737)Christopher Speller2016-08-042-4/+5
|
* New Languages and translations (#3729)enahum2016-08-0421-359/+13853
|
* PLT-3737 - Fixing header popover behaviour (#3738)Asaad Mahmood2016-08-041-1/+1
|
* PLT-3506 Added flagged posts functionality (#3679)Joram Wilander2016-08-0438-103/+1077
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added flagged posts functionality * UI Improvements to flags (#3697) * Added flag functionality for mobile * Updating flagged text (#3699) * Add back button to RHS thread when coming from flagged posts * Updating position of flags (#3708) * Plt 3506 - Reverting flag position (#3724) * Revert "Updating position of flags (#3708)" This reverts commit aaa05632c5d9eda35a048300a5bd7e99584c5b58. * Fixing the icon in search * Help text and white space improvements (#3730) * Updatng help text and some white spacing. * Updating help text
* Hardcode preset OAuth2 endpoints when saving the config from the System ↵Joram Wilander2016-08-031-6/+6
| | | | Console (#3722)
* Update help text for Google/Office 365 OAuth (#3725)Jason Blais2016-08-032-4/+4
| | | | | | | | | | * Update help text for Google/Office 365 OAuth * Update en.json * Change " to ' in .jsx * Fix errors caused by "
* Fixing typo in LDAP system console (#3727)Christopher Speller2016-08-031-1/+1
|
* PLT-3534 Changed special handling of internal links to only occur for ↵Harrison Healey2016-08-032-4/+4
| | | | permalinks and links to channels (#3731)
* PLT-3419 Moving auditing and logs to the top of the system console sidebar ↵Harrison Healey2016-08-031-10/+10
| | | | (#3732)
* PLT-3484 OAuth2 Service Provider (#3632)enahum2016-08-0350-1121/+2297
| | | | | | | | | | | | | | * PLT-3484 OAuth2 Service Provider * PM text review for OAuth 2.0 Service Provider * PLT-3484 OAuth2 Service Provider UI tweaks (#3668) * Tweaks to help text * Pushing OAuth improvements (#3680) * Re-arrange System Console for OAuth 2.0 Provider
* PLT-3728 Updated help text on integration pages (#3721)Harrison Healey2016-08-024-30/+154
|
* PLT-3640 Add mobile landing pages (#3674)Harrison Healey2016-08-0219-82/+398
| | | | | | | | | | | | * PLT-3640 Moved all clientside user agent snooping into a single file * PLT-3640 Added mobile landing pages on login to iOS and Android web apps * PLT-3640 Moved landing page to appear before first login * PLT-3640 Fixed detection of Chrome on Android * PLT-3640 Disabled mobile landing pages when their respective URLs are set to blank
* PLT-3702 Fixed outgoing webhook creation API to properly clear error flags ↵Harrison Healey2016-08-021-0/+2
| | | | for public channels (#3719)
* PLT-3408 Add SiteURL to config.json (#3692)Harrison Healey2016-08-0226-117/+89
| | | | | | | | * PLT-3408 Changed serverside code to get the service's URL from config.json * PLT-3408 Changed most clientside code to use the SiteURL config setting instead of window.location * PLT-3408 Changed default SiteURL to be autodetected
* PLT-3740 Terms of Service link updates (#3707)enahum2016-08-023-3/+3
|
* Add ALT+[click on message] and ESC to /shortcuts (#3714)Jason Blais2016-08-021-2/+2
| | | | | | * Add ALT+[click on message] and ESC to /shortcuts * Remove extra space
* Use correct postgres column type for TriggerWhen column (#3716)Joram Wilander2016-08-021-1/+1
|
* Added custom branding to login description (#3710)David Lu2016-08-029-14/+91
|
* PLT-3691 tweaking sytem console text (#3712)Corey Hulen2016-08-022-12/+12
|
* Update help text for compliance settings (#3705)Jason Blais2016-08-012-3/+3
| | | | | | * Update help text for compliance settings * Update en.json
* Align the sidebar dropdown (#3693)Martin Bastien2016-08-011-0/+4
| | | | | | | | * Align the sidebar dropdown * Change the sidebar dropdown width and realign it. * move sidebar dropdown css fix to headers.scss
* Multiple Ui improvements (#3678)Asaad Mahmood2016-08-018-54/+76
| | | | | | | | * Adding permalink back to mobile * Improving reply flow and fixing colorpicker on mobile * Hiding colorpicker on click only for mobile size screens