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

45 Коммитов

Автор SHA1 Сообщение Дата
Joram Wilander
ccf9778520 Clear search term before displaying flagged posts (#3802) 2016-08-16 14:52:56 -04:00
David Lu
ef33f3fcd1 PLT-3005 Added confirmation screen to integrations (#3747) 2016-08-15 11:10:31 -04:00
enahum
fdd7962d42 PLT-3869 Fix set default language when user logs out (#3796) 2016-08-15 09:21:12 -04:00
David Lu
bb0b895bad Removed /shortcuts from mobile (#3753) 2016-08-11 10:32:41 -04: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
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 aaa05632c5d9eda35a048300a5bd7e99584c5b58.

* 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
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
c4a3118e9f PLT-3408 Add SiteURL to config.json (#3692)
* 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
2016-08-02 16:37:09 -04:00
Joram Wilander
a88ff1b64d Fix console error when receiving a new message in the system console or on another team (#3688) 2016-07-28 08:41:17 -04:00
Joram Wilander
199c55b566 Only get channels and posts on WebSocket connect if team is set (#3684) 2016-07-27 09:53:49 -04:00
Joram Wilander
d1de884845 Fix RHS not closing when thread is deleted by another user (#3641) 2016-07-20 17:34:25 -04:00
Christopher Speller
1641370fbe Moving javascript driver back to platform (#3613) 2016-07-19 10:16:44 -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
34077a407b made /shortcuts separate for mac (#3571) 2016-07-14 11:57:06 -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
Joram Wilander
006fc6c253 Fixes reading wrong websocket message property (#3580) 2016-07-13 12:55:20 -04:00
Corey Hulen
d02b890150 Fixes javascript error with missing func (#3570) 2016-07-13 07:27:05 -04:00
Joram Wilander
ad343a0f4a Added infrastructure for basic WebSocket API (#3432) 2016-07-12 09:36:27 -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
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
Joram Wilander
6c33350f5c On receive of a comment that we don't have the thread for, acquire the thread (#3490) 2016-07-06 08:48:00 -04:00
Joram Wilander
a65f1fc266 Do not clear the more direct messsages list on every open (#3485) 2016-07-05 11:32:37 -04:00
Corey Hulen
b63f61fe7d PLT-3440 (#3440) 2016-06-29 08:16:20 -04:00
Eric Sethna
48ea4bc6f6 Update permalink error message (#3427)
* Clarify permalink error message

* Clarify permalink error message en.json

* Update global_actions.jsx

* Update en.json
2016-06-28 15:11:50 -04:00
Christopher Speller
14510ce194 Adding webpack code splitting (#3377) 2016-06-22 10:30:01 -04:00
Park Daesun
ca138883ab Remove the unnecessary comma (#3351)
It is not error, but It is unnecessary
2016-06-16 09:19:47 -08:00
David Lu
804705e0c5 Fixed DM channels not opening (#3336) 2016-06-15 08:01:31 -04:00
Joram Wilander
1cfb35fd32 Fix channels showing up across teams when multiple teams open in same browser (#3329) 2016-06-15 08:00:55 -04:00
JoramWilander
5af526c259 Merge branch 'release-3.1'
Conflicts:
	webapp/components/create_comment.jsx
2016-06-13 15:29:24 -04:00
enahum
18c53e03eb PLT-3221 Remove async call to get posts when creating a comment and editing a post (#3300)
PLT-3203 Commenting on the RHS while in permalink view makes the message not show up in the RHS
2016-06-09 11:28:57 -07:00
enahum
3a6694cc6b PLT-3203 Commenting on the RHS while in permalink view makes the message not show up in the RHS (#3282) 2016-06-07 17:43:36 -04:00
David Lu
2f7540e174 PLT-3028 Added CTRL+/ to show shortcuts (#3181)
* Added CTRL / to show shortcuts

* Simplified code
2016-06-02 19:43:00 -03:00
enahum
159953050a PLT-1800 Load server side locale from the config.json (#3202)
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics

* Fix localization on served locale file as plain/text

* Remove github.com/cloudfoundry/jibber_jabber as vendor dependency

* Fix get locale on login_controller
2016-06-02 12:47:26 -07:00
Christopher Speller
786e4dce7d Revert "PLT-1800 Load server side locale from the config.json" (#3201) 2016-06-01 11:56:27 -04:00
enahum
b00a60ab71 PLT-1800 Load server side locale from the config.json (#3135)
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics

* Fix localization on served locale file as plain/text

* Remove github.com/cloudfoundry/jibber_jabber as vendor dependency
2016-06-01 08:56:13 -04:00
Joram Wilander
7be2a05cf5 Allow clearing direct messages across team based on channel view events (#3176) 2016-06-01 08:54:31 -04:00
Joram Wilander
0dfac9875e Add license expiry messages (#3153) 2016-05-30 09:59:53 -04:00
David Lu
ca9f348be6 Changed channel navigation (#3142) 2016-05-27 14:52:19 -04:00
JoramWilander
6f8d4a18ee Merge branch 'release-3.0' 2016-05-27 14:38:41 -04:00
Joram Wilander
5ff85df9e9 Display error correctly on ldap to email claim page (#3129) 2016-05-27 08:37:16 -07:00
Christopher Speller
ec7a273550 Revert "PLT-1800 Load server side locale from the config.json" (#3133) 2016-05-27 09:01:35 -04:00
enahum
a2c183f401 PLT-1800 Load server side locale from the config.json (#3092)
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics

* Fix localization on served locale file as plain/text
2016-05-27 08:25:37 -04:00
Joram Wilander
6fecfcc7ca Refactor login, claim and create_team into views and add actions (#3110) 2016-05-26 09:46:18 -04:00