enahum
34ec30e806
daily translations 20160712 ( #3557 )
2016-07-12 16:05:54 -04:00
Christopher Speller
4775631ed4
Revert "Login error messages fix ( #3525 )"
...
This reverts commit 2e513c8fd4
2016-07-12 15:18:25 -04:00
Christopher Speller
7c8654171e
Revert "Letting email not validated error message through login. Changing invalid credentials error. ( #3546 )"
...
This reverts commit 128e4f984a
2016-07-12 15:17:46 -04:00
Christopher Speller
7c5c1d99ac
Fixing accessing admin console without credentials ( #3558 )
2016-07-12 12:52:28 -04:00
Harrison Healey
954e251188
Merged release-3.2 into master
2016-07-12 10:52:43 -04:00
Harrison Healey
c377605906
Update en.json ( #3551 )
2016-07-12 10:09:09 -04:00
Christopher Speller
c976c2881c
Some improvments to password handling ( #3549 )
2016-07-12 10:09:04 -04:00
Christopher Speller
128e4f984a
Letting email not validated error message through login. Changing invalid credentials error. ( #3546 )
2016-07-12 10:08:54 -04:00
Joram Wilander
ad343a0f4a
Added infrastructure for basic WebSocket API ( #3432 )
2016-07-12 09:36:27 -04:00
Asaad Mahmood
06eacf30b9
PLT-3157 - Adding display width customisation to intro message ( #3521 )
...
* PLT-3157 - Adding display width customisation to intro message
* Fixing error
2016-07-12 08:02:30 -04:00
David Lu
3f0d6ee6a1
sorted channel switcher by handle ( #3547 )
2016-07-11 21:02:11 -04:00
enahum
4522fc6388
PLT-3536 Remove "Make Member" option fom "Manage Mamber" when member is System Admin ( #3550 )
2016-07-11 21:00:41 -04:00
Harrison Healey
9481a4f0ef
Merge release 3.2 into master ( #3548 )
...
* Bumping version to: 3.2.0-rc1
* PLT-2863 fixing bad merge that broke this PR (#3523 )
* PLT-2863 adding remove user from team
* PLT-2863 adding the client side UI
* Fixing trailing space
* Fixing reported issues
* Adding documentatino
* Switching to final javascript driver
* Fixing bad merge
* Fixing bad merge
* PLT-3538 Fix Login page doesn't show SAML option if gitlab is enabled (#3524 )
* Login error messages fix (#3525 )
* daily translations 20160708 (#3533 )
* Fixed permissions when getting a file attachment to use the correct user id (#3535 )
* PLT-3575 Fix Cannot upload certificates with .cer file extension on SAML (#3534 )
* PLT-3560 blocking adding to channel once user is removed (#3537 )
* Always allow system admins to see the Integrations sidebar (#3536 )
* Plt 3475 - Post control improvements (#3538 )
* Adding class to post when dropdown is active.
* plt-3475 - Post controls improvements
* daily translations 20160711 (#3544 )
2016-07-11 14:21:51 -04:00
enahum
d953051c06
daily translations 20160711 ( #3544 )
2016-07-11 10:00:39 -04:00
Jason Blais
1283f6936d
Add doc links to System Console > Integrations > Webhooks and Commands help text ( #3540 )
...
* Add links to docs
2016-07-11 09:54:12 -04:00
Asaad Mahmood
075383e190
Plt 3475 - Post control improvements ( #3538 )
...
* Adding class to post when dropdown is active.
* plt-3475 - Post controls improvements
2016-07-11 09:37:42 -04:00
Bob Uhl
a98082eb16
Correct grammar ( #3539 )
2016-07-11 08:55:44 -04:00
Harrison Healey
e10a576b62
Always allow system admins to see the Integrations sidebar ( #3536 )
2016-07-11 08:37:26 -04:00
Corey Hulen
dd99252278
PLT-3560 blocking adding to channel once user is removed ( #3537 )
2016-07-11 08:37:20 -04:00
enahum
ab831b88de
PLT-3575 Fix Cannot upload certificates with .cer file extension on SAML ( #3534 )
2016-07-08 17:03:38 -04:00
Harrison Healey
2d1c0924ee
Fixed permissions when getting a file attachment to use the correct user id ( #3535 )
2016-07-08 17:03:28 -04:00
enahum
968e8b04e1
daily translations 20160708 ( #3533 )
2016-07-08 12:27:44 -04:00
Christopher Speller
2e513c8fd4
Login error messages fix ( #3525 )
2016-07-08 09:17:14 -04:00
enahum
59d5ae40ab
PLT-3538 Fix Login page doesn't show SAML option if gitlab is enabled ( #3524 )
2016-07-08 09:17:07 -04:00
Corey Hulen
25385c8c2a
PLT-2863 fixing bad merge that broke this PR ( #3523 )
...
* PLT-2863 adding remove user from team
* PLT-2863 adding the client side UI
* Fixing trailing space
* Fixing reported issues
* Adding documentatino
* Switching to final javascript driver
* Fixing bad merge
* Fixing bad merge
2016-07-07 12:44:31 -04:00
Mattermost Build
3358d81fa7
Bumping version to: 3.2.0-rc1
2016-07-07 14:09:56 +00:00
lfbrock
21dc536c47
Update emoji-list.jsx ( #3520 )
...
* Update emoji-list.jsx
* Update en.json
* Update emoji_list.jsx
* Update en.json
* Update emoji_list.jsx
* Update en.json
2016-07-07 09:58:15 -04:00
David Lu
f2b1401680
Added getStateFromConfig ( #3517 )
2016-07-07 08:03:17 -04:00
Joram Wilander
df33348704
Fix javascript error when getting a nottification about a reply in a channel not loaded ( #3518 )
2016-07-07 08:02:17 -04:00
Asaad Mahmood
c1624af6d6
Submitting an improvement for the post control in consecutive messages ( #3519 )
2016-07-07 00:21:01 -08:00
Eric Sethna
2aec3a716b
Update NOTICE.txt with go-saml ( #3516 )
...
* Update NOTICE.txt with go-saml
* Update NOTICE.txt
2016-07-06 14:55:01 -08:00
David Lu
683f713319
PLT-1465 Added password requirements ( #3489 )
...
* Added password requirements
* added tweaks
* fixed error code
* removed http.StatusNotAcceptable
2016-07-06 14:54:54 -08:00
Corey Hulen
0c3c52b8d3
Adding unit tests ( #3515 )
2016-07-06 14:07:32 -08:00
Eric Sethna
5a61b8925b
Update NOTICE.txt for SAML ( #3514 )
2016-07-06 13:50:04 -08:00
Corey Hulen
d5f243dad6
PLT-2863 adding remove user from team ( #3429 )
...
* PLT-2863 adding remove user from team
* PLT-2863 adding the client side UI
* Fixing trailing space
* Fixing reported issues
* Adding documentatino
* Switching to final javascript driver
2016-07-06 13:40:59 -08:00
Asaad Mahmood
3eee51f74e
UI fix for errors in signup and login pages and adding space between buttons in the security tab ( #3512 )
...
* Fixing the errors style on login and signup pages
* Adding space between login options in the security section
2016-07-06 13:32:27 -08:00
Christopher Speller
31a0f65973
Adding sync now button to system console ( #3510 )
2016-07-06 13:17:37 -08:00
David Lu
7b6e8d788b
Added new segment analytics ( #3511 )
2016-07-06 13:16:53 -08:00
Harrison Healey
3ebc259f63
Added help text to integrations pages in backstage ( #3513 )
2016-07-06 12:40:40 -08:00
Harrison Healey
b114062c1b
PLT-3237 Update displayed config values in admin console after saving ( #3506 )
...
* Reloaded admin console data when settings are saved
* Fixed attempting to save an invalid config setting overwriting the stored config
2016-07-06 16:07:56 -04:00
Corey Hulen
b1520d0b94
PLT-3512 adding join/leave channel to the CLI ( #3498 )
...
* PLT-3512 adding join/leave channel to the CLI
* PLT-3512 adding list channels to the CLI
* PLT-3512 adding restore channel
* Adding make run-cli command
* Updating txt
* Fixing txt purposed by PMs
2016-07-06 14:11:21 -04:00
enahum
26c91e73fe
PLT-3225 Firefox: Channel header disappears after renaming a channel (fixed with channel switch) ( #3470 )
2016-07-06 10:08:22 -08:00
Harrison Healey
b157d6b1cf
Fixed system console sidebar shifting upwards on Firefox ( #3509 )
2016-07-06 14:06:16 -04:00
enahum
9d0f9169df
PLT-3502 Fix Team admins can't give "team admin" privilege to members ( #3499 )
2016-07-06 13:57:32 -04:00
Harrison Healey
1a3f952c56
PLT-3518/PLT-3519 Custom emoji followup ( #3507 )
...
* Fixed emoji list filter when full name or nickname are enabled
* Changed custom emoji list to only be visible if the user can create custom emoji
2016-07-06 13:52:28 -04:00
lfbrock
fd880ad047
Update ldap_settings.jsx ( #3508 )
...
* Update ldap_settings.jsx
Changed help text for consistency
* Update en.json
2016-07-06 13:35:35 -04:00
Joram Wilander
292705acdf
Add channel management permissions to mobile channel dropdown and clean up logic a bit ( #3505 )
2016-07-06 12:28:15 -04:00
Joram Wilander
ccbf06dca9
Updated pull request template ( #3504 )
2016-07-06 08:25:41 -08:00
Harrison Healey
2b60c96994
Changed EditChannelHeaderModal to only change it's displayed text when the user isn't editing it ( #3503 )
2016-07-06 08:25:26 -08:00
David Lu
f44dc649a9
updated text in select team ( #3478 )
2016-07-06 12:04:40 -04:00
