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

773 Коммитов

Автор SHA1 Сообщение Дата
Harrison Healey
4e16ea32e3 Fixed highighting at all mentions when enabled (#3606) 2016-07-18 11:12:38 -04:00
Harrison Healey
b353cc2cab Added a space before all entries in @mention autocomplete (#3605) 2016-07-18 11:12:01 -04:00
Harrison Healey
80726bde82 Sorted channels by name if their display_name is equal (#3607) 2016-07-18 11:11:28 -04:00
Joram Wilander
c0ab2636d6 PLT-2241 Refactored statuses into a more real-time system (#3573)
* Refactored statuses into a more real-time system

* Updated package.json with correct commit and fixed minor bug

* Minor updates to statuses based on feedback

* When setting status online, update only LastActivityAt if status already exists
2016-07-18 11:10:03 -04:00
David Lu
180adc79af updated RHS upon profile picture save (#3604) 2016-07-18 09:31:06 -04:00
Harrison Healey
f7b3731b2b Merge branch 'release-3.2' into 'master' 2016-07-15 12:26:32 -04:00
Christopher Speller
942ae4c527 Cleaning up old export code (#3601) 2016-07-15 11:20:39 -04:00
Harrison Healey
b339b5c982 Fixed file upload overlay not showing up on Edge (#3600) 2016-07-15 11:20:29 -04:00
Christopher Speller
b6c4d84685 Updating client dependancies (#3594) 2016-07-15 10:43:43 -04:00
Harrison Healey
500b2dce10 Fixed input handlers used by Textbox and SuggestionBox components to properly update when typing quickly (#3598) 2016-07-15 10:37:51 -04:00
Harrison Healey
47535ed0c7 Fix text fields in team settings modal to better allow quick typing in IE11 (#3599) 2016-07-15 10:18:23 -04:00
Christopher Speller
8936f65c90 Improving caching of static assets (#3591) 2016-07-15 08:57:52 -04:00
Christopher Speller
b5c5744bc7 Updating ESLint (#3597) 2016-07-15 07:49:57 -04:00
lfbrock
491593b285 Update incorrect Google API key help text (#3595)
* Update Youtube API key help text

* Update en.json
2016-07-14 14:52:05 -08:00
David Lu
bd12520b44 added channel header to view channel info modal (#3584) 2016-07-14 11:57:49 -08:00
David Lu
34077a407b made /shortcuts separate for mac (#3571) 2016-07-14 11:57:06 -08:00
David Lu
0b200cc924 PLT-3266 Added channel header to create channel modal (#3559)
* Added channel header to create channel modal

removed React FindDOMNode

* made css changes
2016-07-14 11:56:49 -08:00
Asaad Mahmood
70283c20f6 PLT-3508/PLT-3516/PLT-3558/PLT-3570/PLT-3497 Multiple UI Improvements (#3553)
* PLT-3627 - Fixing spacing in RHS

* PLT-3516 - Fixing errors in backstage

* PLT-3558 - Fixing system console menu on small screens

* PLT-3570 - Fixing account settings sidebar truncating issue

* PLT-3497 - Moving see other themes link

* Removing formatted message import from premade theme chooser
2016-07-14 11:56:38 -08:00
Harrison Healey
caabfbcdd5 PLT-2992 Added the ability to use different themes for each team (#3411)
* Cleaned up user_settings_theme.jsx and import_theme_modal.jsx

* Made ImportThemeModal use a callback to return the theme to the user settings modal instead of saving it directly

* Moved user theme from model to preferences

* Added serverside API to delete preferences TODO update package with client stuff

* Changed constants.jsx so that Preferences and ActionTypes can be imported on their own

* Updated ThemeProps migration code to properly rename solarized code themes

* Fixed warnings thrown by AppDispatcher

* Added clientside UI to support team-specific themes

* Removed debugging code from test

* Fixed setting a user's theme when they haven't set their theme before
2016-07-14 10:08:36 -04:00
David Lu
8e810bc2eb PLT-3153 Converted slash command triggers to lowercase on save (#3577)
* Converted slash command triggers to lowercase on save

* Made slash commands case insensitive
2016-07-14 10:05:25 -04:00
samogot
9b9facd3d2 PLT-3366 Holding down the ALT key and clicking on a message adds a new messages indicator (squashed) (#3374) 2016-07-14 08:19:27 -04:00
David Lu
6abc9601be PLT-3192 EE: Restricted site name to 30 characters (#3560)
* Restricted site name to 30 characters

* Added maxlength to TextSetting
2016-07-14 08:18:56 -04:00
Harrison Healey
4c8ba1f5a2 Change view image modal loading text to be visible (#3581) 2016-07-14 08:17:09 -04:00
Corey Hulen
e929a222c2 PLT-3017 fixing iOS blank rendering (#3586) 2016-07-13 15:48:02 -08:00
David Lu
e1a14ac4ae Hide build number if it is the same as the version number in the about dialog (#3585) 2016-07-13 15:28:59 -08:00
David Lu
284ee12b22 added username to system console users list (#3566) 2016-07-13 09:02:46 -08:00
Harrison Healey
7c34ea9b8c Highlight hashtags containing search text (#3568) 2016-07-13 09:00:28 -08:00
Joram Wilander
006fc6c253 Fixes reading wrong websocket message property (#3580) 2016-07-13 12:55:20 -04:00
Corey Hulen
d2df385f41 PLT-3618 fixing error when team member removed on system console (#3569) 2016-07-13 07:27:31 -04:00
Corey Hulen
d02b890150 Fixes javascript error with missing func (#3570) 2016-07-13 07:27:05 -04:00
enahum
ab52700aaa PLT-3624 quick fix remove SAML certificates without saving (#3555) 2016-07-12 16:10:04 -04:00
Harrison Healey
caef414abe PLT-3631 Properly update PostViewController when emojis change (#3565)
* Properly remove custom emojis from clientside store

* Properly update PostViewController when emojis change
2016-07-12 16:06:03 -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
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
Harrison Healey
e10a576b62 Always allow system admins to see the Integrations sidebar (#3536) 2016-07-11 08:37:26 -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
enahum
968e8b04e1 daily translations 20160708 (#3533) 2016-07-08 12:27:44 -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
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