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

345 Коммитов

Автор SHA1 Сообщение Дата
Joram Wilander
1e7e6687e3 Use correct column type for Postgres TriggerWhen column (#3770) 2016-08-09 16:00:34 -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
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
Joram Wilander
0a71d2a111 Use correct postgres column type for TriggerWhen column (#3716) 2016-08-02 15:49:57 -04:00
Pierre Rudloff
564dffec35 Add option to trigger outgoing webhook if first word starts with trigger word (#3611) 2016-07-26 08:04:28 -04:00
Corey Hulen
946302d9a2 PLT-3691 Fixing mobile session (#3652)
* PLT-3691 Fixing mobile session

* Fixing unit tests
2016-07-21 12:36:11 -04:00
Joram Wilander
bfa04c0ab0 PLT-2408 Adds here mention for online users (#3619)
* Added @here mention that notifies online users

* Fixed existing race condition that would sometime cause clients to miss mention count changes

* Added missing localization strings

* Prevent @here from mentioning the user who posted it
2016-07-21 10:00:09 -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
Christopher Speller
942ae4c527 Cleaning up old export code (#3601) 2016-07-15 11:20:39 -04:00
Harrison Healey
a04a984424 Fix porting theme to preferences so that it works for users who never set their theme (#3592) 2016-07-14 12:50:53 -04: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
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
Corey Hulen
294981d4a3 PLT-3547 fixing caching issue with direct profiles (#3567) 2016-07-14 08:18:18 -04:00
Christopher Speller
804bfd3b02 Fixing bug in inital load returning team member objects that had been deleted. (#3554) 2016-07-13 07:39:14 -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
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
ff5b429eb5 PLT-3429 "Site Statistics" graphs do not always have the same start date (#3480) 2016-07-05 12:02:24 -04:00
enahum
2305b2597f PLT-3456 Fix Errors while starting the server (#3445)
* PLT-3456 AppErrors that are triggered before translations are loaded crash server or produce bad error messages.

* Fixing tests
2016-07-04 09:30:57 -04:00
David Lu
0485c5f64e Added check for code theme (#3367) 2016-06-20 09:20:19 -06:00
Joram Wilander
f6fc4bdbdb Update error message when trying to switch account with a duplicate email (#3332) 2016-06-15 08:02:07 -04:00
Joram Wilander
8f87e60231 Fix bad condition on hiding email addresses and update user etag to include privacy settings (#3327) 2016-06-14 12:12:46 -04:00
Harrison Healey
a0cc913b85 PLT-3143 Added serverside code for custom Emoji (#3311)
* Added model objects for emoji

* Added database tables for emoji

* Added settings for custom emoji

* Added serverside APIs and unit tests for custom emoji

* Added additional validation to catch duplicate emoji names earlier on

* Added additional validation to prevent users from adding emoji as another user
2016-06-14 07:38:19 -06:00
Joram Wilander
68c2b070da Auto join teams if coming from team sign-up page to login for GitLab (#3284) 2016-06-07 17:43:06 -04:00
Harrison Healey
384d0eb245 PLT-2559 Always return successful when trying to join a channel that the user is already a member of (#3265)
* Added unit tests for SqlChannelStore.GetMember

* Fixed api routes for accessing channels by name when the name includes an underscore

* Changed join channel API to always return successful when the user is already a member of the channel
2016-06-06 13:03:56 -04:00
Joram Wilander
971149d2b2 Don't allow users to be added to a channel they are not in the team of (#3246) 2016-06-04 10:52:25 -04:00
Christopher Speller
ea3342aa6c Adding LDAP Syncronization (#3219) 2016-06-03 09:33:59 -04: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
Thomas Balthazar
c226cabc04 PLT-2170 Send payload in application/json for outgoing webhooks (#3160)
* Send payload in application/json for outgoing webhooks

The Add outgoing webhook UI now has a 'Content-Type' field that allows
to choose between application/x-www-form-urlencoded and
application/json. All outgoing webhooks created before this change will
be considered as x-www-form-urlencoded. There's also a minor change in
the way the outgoing webhook summary is displayed: the 'Callback URLs'
label was missing.

* Fix JS formatting errors

* Increase ContentType field length to 128
2016-05-31 10:51:28 -04: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
rompic
20302c6953 fixed type speical -> special (#3052) 2016-05-25 08:19:54 -04:00
Christopher Speller
4ae7128ecb Revert "PLT-1800 Load server side locale from the config.json (#3076)"
This reverts commit 34beaa569b.
2016-05-24 10:39:56 -04:00
enahum
34beaa569b PLT-1800 Load server side locale from the config.json (#3076)
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics
2016-05-24 08:36:27 -04:00
Christopher Speller
8fa582dd83 Filtering colons from search to prevent postgres error (#3075) 2016-05-23 09:56:39 -07:00
Christopher Speller
edd453c6cd Merge branch 'release-3.0' 2016-05-17 17:51:42 -04:00
Corey Hulen
123bfad69c Fixing LDAP issue with Postgres (#3033) 2016-05-17 15:52:10 -04:00
Joram Wilander
1f609e9cf7 Check team member instead of session for team admin role when updating/deleting channels (#3007) 2016-05-16 12:55:22 -04:00
Corey Hulen
9d94869cc6 Fixing issue with missing user (#2989) 2016-05-12 18:36:30 -07:00
Corey Hulen
3928535456 PLT-2905 fixing upgrade of SSO accounts (#2962)
* PLT-2905 fixing upgrade of SSO accounts

* Fixing multiple Auths mapped to different emails
2016-05-11 14:04:30 -04:00
Joram Wilander
07126101d3 Recent mention searches now OR terms instead of AND (#2931) 2016-05-09 09:00:08 -07:00
Joram Wilander
0cfcf5c5de Add separator between DMs on your team and not (#2910) 2016-05-06 12:08:58 -04:00
Joram Wilander
d75cb02948 Multiple cross-team functionality fixes (#2902) 2016-05-06 08:06:34 -04:00
Corey Hulen
6611229cd7 PLT-2707 Adding option to show DM list from all of server (#2871)
* PLT-2707 Adding option to show DM list from all of server

* Fixing loc
2016-05-04 09:31:42 -04:00
Christopher Speller
5d7e34c94b Fixing ldap ability to modify user fields (#2868) 2016-05-03 12:27:00 -07:00
Park Daesun
d4a708ce19 Fix incorrect postgres keys. (#2855)
user_test.go test has errors because incorrect postgres keys.

[2016/05/03 10:19:15 KST] [EROR] /api/v3/users/create:SqlUserStore.Save code=500 rid=6h5gz1fuxids9ytzimzbgwno3e uid= ip=::1 We couldn't save the account. [details: user_id=3o8aod7uapnxzmngn3rz1rm48r, pq: duplicate key value violates unique constraint "users_email_key"]
--- FAIL: TestCreateUser (0.12s)
	user_test.go:59: : We couldn't save the account., user_id=3o8aod7uapnxzmngn3rz1rm48r, pq: duplicate key value violates unique constraint "users_email_key"

[2016/05/03 10:26:06 KST] [EROR] /api/v3/users/create:SqlUserStore.Save code=500 rid=tetdakekgffzu8muhrrxuzc9ae uid= ip=::1 We couldn't save the account. [details: user_id=izifcscu5igpzb48ey1gmi5wjw, pq: duplicate key value violates unique constraint "users_username_key"]
--- FAIL: TestCreateUser (0.12s)
	user_test.go:67: : We couldn't save the account., user_id=izifcscu5igpzb48ey1gmi5wjw, pq: duplicate key value violates unique constraint "users_username_key"
2016-05-03 12:26:36 -07:00
Harrison Healey
87989b8afd PLT-2258 Unified login screen and related APIs (#2820)
* Unified login screen and related APIs

* Refactored login API call to be less convoluted

* Removed LDAP login prompt from invite process

* Fixed existing LDAP users being able to log in if LDAP was configured, but disabled

* Gofmt

* Future proofed login API

* Updated login APIs based on feedback

* Added additional auditing to login API

* Actually removed loginById
2016-05-03 14:10:36 -04:00
Park Daesun
e3f254c3be Fix the EmailVerified column value from '1' to true (#2843)
EmailVerified column type is bool.
but these queries were a string type and a number type.
this is ok in Mysql but cause errors in Postgresql.

like this(user_test.go:970).

```
[2016/05/02 23:20:47 KST] [EROR] /api/v3/users/reset_password:SqlUserStore.UpdatePassword code=500 rid=ezj4agkewibjzni3ptybq5knbh uid=9z53qbkxj7nq9m8r8jbb47enzr ip=::1 We couldn't update the user password [details: id=8bymugax77yhfff9zj4frthapc, pq: column "emailverified" is of type boolean but expression is of type integer]
--- FAIL: TestResetPassword (0.90s)
user_test.go:970: : We couldn't update the user password, id=8bymugax77yhfff9zj4frthapc, pq: column "emailverified" is of type boolean but expression is of type integer
```
2016-05-02 11:08:48 -07:00