IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,891 Commits 845 Branches 1,202 Tags
a6bb9b87f7b9208ece16aa28816803763ab0ae80
Commit Graph

6891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
enahum
4dcbe4bf09 fix OAuth provider when running test multiple times (#3782) 2016-08-11 08:47:12 -08: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
enahum
b523f98675 PLT-3879 Fix OAuth provider routes (#3780) 2016-08-10 14:20:31 -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
1e7e6687e3 Use correct column type for Postgres TriggerWhen column (#3770) 2016-08-09 16:00:34 -05:00
enahum
6b0e3d62fb PLT-3865 Fix OAuth provider routes (#3768) 2016-08-09 10:43:54 -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
Elias Nahum
415145d62f Merge branch 'release-3.3' 2016-08-08 15:07:34 -05:00
enahum
09d98b486e PLT-3840 Fix Typos in cluster localization strings (#3761) 2016-08-08 14:58:05 -05: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
enahum
86824cdf39 PLT-3849 Fix No error message when invalid SAML SSO URL entered in System Console (#3763) 2016-08-08 14:30:33 -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
Christopher Speller
5e2b4d1282 Fixing build failure caused by dependancies updating 2016-08-07 10:01:17 -04:00
Mattermost Build
78d853212b Bumping version to: 3.3.0-rc1 2016-08-04 21:31:42 +00: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
MARUYAMA Takayuki
953b14ab22 Fix garbled mail subject (#3694) 
* Fix garbled mail subject

* Notification email subject including full month
 2016-08-04 13:27:15 -04: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
Jason Blais
3b0c743052 Update NOTICE.txt for v3.3 (#3739) 2016-08-04 08:38:02 -08: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
Asaad Mahmood
35cdc8f843 PLT-3737 - Fixing header popover behaviour (#3738) 2016-08-04 11:44:09 -04:00
Joram Wilander
0184d6059b PLT-3506 Added flagged posts functionality (#3679) 
* 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 aaa05632c5.

* Fixing the icon in search

* Help text and white space improvements (#3730)

* Updatng help text and some white spacing.

* Updating help text
 2016-08-04 10:38:09 -05:00
Joram Wilander
9b50b50283 Hardcode preset OAuth2 endpoints when saving the config from the System Console (#3722) 2016-08-03 18:32:06 -05:00
Jason Blais
224575e099 Update help text for Google/Office 365 OAuth (#3725) 
* Update help text for Google/Office 365 OAuth

* Update en.json

* Change " to ' in .jsx

* Fix errors caused by "
 2016-08-03 18:30:11 -05:00
Christopher Speller
937a4e3087 Fixing typo in LDAP system console (#3727) 2016-08-03 18:29:34 -05:00
Harrison Healey
c79685b0bc PLT-3534 Changed special handling of internal links to only occur for permalinks and links to channels (#3731) 2016-08-03 18:28:38 -05:00
Harrison Healey
7b211f93a0 PLT-3419 Moving auditing and logs to the top of the system console sidebar (#3732) 2016-08-03 18:27:59 -05:00
enahum
5bc3cea6fe PLT-3484 OAuth2 Service Provider (#3632) 
* 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
 2016-08-03 13:19:27 -04:00
Harrison Healey
ea027c8de4 PLT-3728 Updated help text on integration pages (#3721) 2016-08-02 20:16:27 -08:00