Граф коммитов

886 Коммитов

Автор SHA1 Сообщение Дата
Jason Blais
dba2deabb0 Fix typo in admin.service.siteURLDescription (#3818)
* Fix typo in admin.service.siteURLDescription

* Update configuration_settings.jsx
2016-08-17 11:16:53 -04:00
Asaad Mahmood
4ef5c1bfb3 Multiple UI Improvements (#3804)
* PLT-3834 - Updating Manage members modal for mobile

* PLT-3792 - Making compact view compatible with search and flagged posts RHS

* PLT-3910 - Improving suggestions separator

* PLT-3769 - Enabling markdown headings in compact view

* Updating view members text in en..json

* Removing shouldcomponentupdate from search_results_item.jsx
2016-08-16 14:54:11 -04:00
Joram Wilander
ccf9778520 Clear search term before displaying flagged posts (#3802) 2016-08-16 14:52:56 -04:00
Joram Wilander
ad6363079d Correctly reset tracker for updateLastViewedAt and other asynchronous calls (#3801) 2016-08-16 14:52:40 -04:00
Harrison Healey
8203fd16ce PLT-3647 Email Batching (#3718)
* PLT-3647 Added config settings for email batching

* PLT-3647 Refactored generation of email notification

* PLT-3647 Added serverside code for email batching

* PLT-3647 Updated settings UI to enable email batching

* PLT-3647 Removed debug code

* PLT-3647 Fixed 0-padding of minutes in batched notification

* PLT-3647 Updated clientside UI for when email batching is disabled

* Go fmt

* PLT-3647 Changed email batching to be disabled by default

* Updated batched email message

* Added email batching toggle to system console

* Changed Email Notifications > Immediate setting to a 30 second batch interval

* Go fmt

* Fixed link to Mattermost icon in batched email notification

* Updated users to use 30 second email batching by default

* Fully disabled email batching when clustering is enabled

* Fixed email batching setting in the system console

* Fixed casing of 'Send Email notifications' -> 'Send email notifications'

* Updating UI Improvements for email batching (#3736)

* Updated text for notification settings and SiteURL.

* Prevented enabling email batching when SiteURL isn't set in the system console

* Re-added a couple debug messages

* Added warning text when clustering is enabled
2016-08-16 14:41:47 -04:00
Jason Blais
21750e3637 PLT-3886 Add missing period in tutorial intro screen (#3811)
* Add missing period in tutorial intro screen

* Update en.json
2016-08-16 09:08:11 -05:00
David Lu
782d5f64e7 Fixed mentions not updating when team switched (#3807) 2016-08-15 16:37:12 -05:00
David Lu
7a2ca395d1 Hardcoded login footer sitename to Mattermost (#3805) 2016-08-15 11:56:07 -04:00
David Lu
ef33f3fcd1 PLT-3005 Added confirmation screen to integrations (#3747) 2016-08-15 11:10:31 -04:00
enahum
52aa1120c5 PLT-3777 Channel URL name changes when display name is updated (#3795) 2016-08-15 09:21:57 -04:00
enahum
fdd7962d42 PLT-3869 Fix set default language when user logs out (#3796) 2016-08-15 09:21:12 -04:00
enahum
b972d2adba PLT-3844 Fix Not redirected out of system console after demoting self from System Admin (#3797) 2016-08-15 09:20:38 -04:00
enahum
6d6f1c8d8c Add missin localization strings (#3798) 2016-08-15 09:19:57 -04:00
Hugo Giraudel
1cd0ec5f1e Made em(..) return an actual number (#3735) 2016-08-12 07:51:37 -04:00
enahum
225ea35895 PLT-3793 Re-order languages in Account Settings (#3756) 2016-08-12 07:51:00 -04:00
Harrison Healey
c0a905c037 PLT-1424 Added XRegExp library to fix search highlighting (#3787) 2016-08-12 07:49:19 -04:00
Harrison Healey
96420542b1 Clear post textbox as soon as a slash command is sent (#3789) 2016-08-12 07:41:17 -04:00
Elias Nahum
c6d5448c75 Merge branch 'release-3.3' RC5 2016-08-11 13:46:24 -05:00
Eric Sethna
a6bb9b87f7 Clarify help text for available lanuages in localization_settings.jsx (#3776)
* Update localization_settings.jsx

* Update en.json

* Update localization_settings.jsx

* Update en.json
2016-08-11 13:35:31 -05:00
Joram Wilander
2073547018 Update licensing switches for Office365 and Google SSO through OAuth2 (#3786) 2016-08-11 13:35:08 -05:00
David Lu
7bb6a439a8 fixed endless loading (#3784) 2016-08-11 13:04:34 -05:00
Asaad Mahmood
c996011846 PLT-3760 - Fixing tutorial positioning on mobile (#3783) 2016-08-11 12:24:08 -04:00
Yi EungJun
d6da7d1220 Change ordering of at-mention suggestions (#3698)
List members in the current channel first.
2016-08-11 10:33:22 -04:00
David Lu
bb0b895bad Removed /shortcuts from mobile (#3753) 2016-08-11 10:32:41 -04:00
Harrison Healey
0cee02d4d3 PLT-3700 Made error message for too short channel URL more clear (#3773) 2016-08-11 10:31:56 -04:00
Elias Nahum
8d5aa69950 Merge branch 'release-3.3' RC4 2016-08-10 14:24:16 -05:00
David Lu
bd106bb401 fixed password reset salt broken (#3778) 2016-08-10 14:20:52 -05:00
David Lu
379efb0a33 PLT-3846 Fixed loading screen not disappearing upon joining team (#3779)
* fixed loading screen not disappearing upon joining team

* Update signup_user_complete.jsx
2016-08-10 14:20:44 -05:00
Joram Wilander
3ef26de2ac Marked Office 365 SSO through OAuth2 as beta (#3781) 2016-08-10 14:20:18 -05:00
Elias Nahum
8056592390 Merge branch 'release-3.3' RC3 2016-08-09 17:05:59 -05:00
enahum
ac2f75ac8f daily translations 20160809 (#3772) 2016-08-09 17:04:39 -05:00
David Lu
e4b0680a79 Fixed reset password error (#3769) 2016-08-09 16:00:51 -05:00
Joram Wilander
aa9f71039b Remove legacy code adding useless team name to oauth URLs (#3766) 2016-08-09 10:19:42 -05:00
Harrison Healey
0afa28de09 Changed autodetection of SiteURL (#3764)
* Changed autoconfiguration of SiteURL to be done on every request

* Added SiteURL to system console
2016-08-09 08:53:22 -05:00
Jason Blais
7be82c2b27 Add missing periods in error messages (#3757) 2016-08-09 08:50:55 -04:00
David Lu
ad2c3bdb1d Added @username and full name to user profile popover (#3765) 2016-08-08 21:41:05 -08:00
enahum
c49a7f3524 PLT-3847 Fix bad merge in the System Console help text (for Office 365) (#3762) 2016-08-08 14:30:50 -05:00
Asaad Mahmood
9a59b7912a PLT-3817 - Updating flag icon (#3750)
* Updating flag icon

* Updating padding for user list

* Removing stroke from hover

* PLT-3794 - Fixing integrations css
2016-08-08 14:30:19 -05:00
enahum
3dfc6c30d3 Fix missing and bad localization strings (#3755) 2016-08-08 12:56:04 -05:00
enahum
9bf6f5d15e PLT-3811 Fix OAuth 2.0 provider help text (#3748)
* PLT-3811 Fix OAuth 2.0 provider help text

* Fix Ids for RHS translations
2016-08-08 12:54:10 -05:00
Harrison Healey
d2aa2a7396 PLT-3802 Moved compliance section of system console back to the bottom of the sidebar (#3751) 2016-08-08 08:57:17 -05:00
Christopher Speller
f9e2674e35 Fixing build failure caused by dependancies updating 2016-08-07 10:02:07 -04:00
Corey Hulen
605f2a289b Adding beta label to HA (#3744) 2016-08-04 15:42:16 -05:00
David Lu
ef8f043f81 imported bootstrap (#3743) 2016-08-04 14:51:44 -05:00
Asaad Mahmood
f7155bca93 PLT-2036 - Enabling popover on mobile (#3742) 2016-08-04 14:10:45 -05:00
enahum
b04d2c2f39 PLT-3767 Promote localizations on System Console and Account Settings (#3734) 2016-08-04 13:32:57 -05:00
Corey Hulen
59d971dc75 PLT-2899 adding clustering of app servers (#3682)
* 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
2016-08-04 13:25:37 -04:00
Jason Blais
ac90f5b389 Update text for OAuth 2.0 and Google SSO (#3740)
* Update help text for OAuth

* Update oauth_settings.jsx

* Update en.json
2016-08-04 13:20:01 -04:00
Christopher Speller
18e7d7f485 Reverting plt-3366 due to a bug (#3737) 2016-08-04 08:37:47 -08:00
enahum
f5d69cb813 New Languages and translations (#3729) 2016-08-04 11:45:36 -04:00