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

70 Коммитов

Автор SHA1 Сообщение Дата
Christopher Speller
14510ce194 Adding webpack code splitting (#3377) 2016-06-22 10:30:01 -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
6f490b49c2 PLT-3254 Javascript error and can't login with Spanish Client language (#3298) 2016-06-09 11:12:32 -04: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
Joram Wilander
afdbe785d4 Up the max preference store listeners (#3273) 2016-06-06 16:33:29 -04:00
Joram Wilander
c0d1b8fbb9 System messages trigger notifications when user is mentioned (#3235) 2016-06-06 14:29:10 -04:00
David Lu
26ec73d5d2 Added error when both session and local storage are unusable (#3263) 2016-06-06 13:52:57 -04:00
Joram Wilander
1e245f19c7 PLT-3114 Moved preview collapse out of pre-release features (#3206)
* Added user setting to auto collapse image previews

* Added slash commands for collapsing/expanding image previews

* Added translation strings for collapse setting

* Add default props for preview collapse setting
2016-06-06 10:41:54 -07:00
David Lu
2c42294bbc PLT-3101 Added message history (#3205)
* Added message history

* Minor logical changes

* Fixed indexes resetting

* Fixed double messages

* Fixed resetting main history when RHS opened
2016-06-06 13:01:35 -04:00
enahum
6cee1f87f2 PLT-2990 Clicking on a desktop notification from another team opens the team (#3253) 2016-06-06 09:46:09 -04:00
David Lu
cc4d23e276 added ctrlSend checking (#3196) 2016-06-05 03:23:07 -03:00
David Lu
9509398d32 PLT-2962 Added channel switcher modal (#3216)
* Added channel switcher modal

* Fixed typos

* Added handling for duplicate channels
2016-06-02 19:45:38 -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
Harrison Healey
12f6593727 PLT-2643 Fixed asynchronous autocomplete incorrectly replacing text (#3167)
* Allowed different suggestions to match different text. Added a Suggestion base component. Improved text replacement used when filling in suggestions

* Fixed formatting
2016-05-31 16:14:28 -04:00
Joram Wilander
e23084ba1d Reset channel top visibility correctly to fix intro message after tutorial (#3159) 2016-05-31 10:52:55 -04:00
Joram Wilander
0dfac9875e Add license expiry messages (#3153) 2016-05-30 09:59:53 -04:00
Joram Wilander
6399a94ce2 PLT-2672 Refactored posts view with caching (#3054)
* Refactored posts view to use view controller design

* Add post view caching

* Required updates after rebase

* Fixed bug where current channel not set yet was causing breakage
2016-05-27 16:01: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
Joram Wilander
6fecfcc7ca Refactor login, claim and create_team into views and add actions (#3110) 2016-05-26 09:46:18 -04:00
Corey Hulen
7b2538fc6c PLT-2952 fixing preview mode error message (#3113) 2016-05-26 07:54:49 -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
Harrison Healey
02576f3d59 PLT-1909 Fixed error rendering pending posts (#3041)
* Fixed error caused by checking if a post is a system message

* Fixed trying to edit system posts when using the up arrow hotkey
2016-05-18 11:15:17 -04:00
Harrison Healey
fd53e3b786 PLT-2257 Reorganized System Console (#3003)
* Reorganized system console

* Fixed the names of some components

* Fixed timestamp for BrandImageSetting

* Fixed merge issues

* Updated push notification settings to match master branch

* Removed top level setting pages and moved enable Gitlab/LDAP settings onto their respective pages

* Re-added restrictDirectMessage setting to system console

* Re-added email connection test and fixed some margins

* Fixed ESLint errors

* Renamed Authentication > Onboarding to Authentication > Email in the system console

* Renamed Customization > Whitelabeling to Customization > Custom Branding in System Console

* Re-added EnableOpenServer to system console
2016-05-17 07:21:39 -04:00
Joram Wilander
34780f3aea Refresh login page if server version of client doesn't match browser version of client (#3004) 2016-05-16 16:09:37 -07:00
Christopher Speller
d1efb66ad7 Merge branch 'release-3.0' 2016-05-12 12:11:02 -04:00
Harrison Healey
d9f724f959 PLT-2927/PLT-2924 Fixing issues with integration lists (#2974)
* Changed IntegrationStore to store integrations by team

* Fixed regenerating a command's token not causing the UI to update

* Re-added IntegrationStore.hasReceived methods
2016-05-12 11:30:53 -04:00
Christopher Speller
4b260b761a Updating client dependancies and ESLint (#2954)
* Updating client dependancies

* Fixing eslint errors with updates

* Updating eslint
2016-05-12 07:50:53 -04:00
Corey Hulen
6c75662b82 PLT-2697 Fixing team admins (#2900)
* PLT-2697 Fixing team admins

* Fixing eslint error

* Fixing loc issues

* Fixing func

* Fixing func
2016-05-06 14:28:22 -04: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
Harrison Healey
d2ddf40f56 PLT-2600/PLT-2770 Added Get Public Link modal and added new API for public file links (#2892)
* Switched public file links to use a GetLinkModal

* Separated getFile and the new getPublicFile api calls
2016-05-05 16:35:03 -04:00
Christopher Speller
274a2a58f0 Performance improvments (#2869) 2016-05-04 10:10:19 -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
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
Harrison Healey
f1ddbc4e8b Fixed PostStore to not return deleted posts when attempting to edit (#2839) 2016-05-02 09:58:27 -04:00
Joram Wilander
65a2427b90 Update {user} is typing.. based on display name setting (#2817) 2016-04-28 07:55:07 -07:00
Joram Wilander
7695cbd1b4 Add websocket event and cache invalidation for deleting channels (#2807) 2016-04-27 16:05:39 -04:00
Christopher Speller
fa807d8e43 Fixing permalinks to channels your not a memeber of (#2805) 2016-04-27 16:02:58 -04:00
Corey Hulen
2e5617c29b PLT-2057 User as a first class object (#2648)
* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding client side unit test

* Cleaning up the clint side tests

* Fixing msg

* Adding more client side unit tests

* Adding more using tests

* Adding last bit of client side unit tests and adding make cmd

* Fixing bad merge

* Fixing libraries

* Updating to new client side API

* Fixing borken unit test

* Fixing unit tests

* ugg...trying to beat gofmt

* ugg...trying to beat gofmt

* Cleaning up remainder of the server side routes

* Adding inital load api

* Increased coverage of webhook unit tests (#2660)

* Adding loading ... to root html

* Fixing bad merge

* Removing explicit content type so superagent will guess corectly (#2685)

* Fixing merge and unit tests

* Adding create team UI

* Fixing signup flows

* Adding LDAP unit tests and enterprise unit test helper (#2702)

* Add the ability to reset MFA from the commandline (#2706)

* Fixing compliance unit tests

* Fixing client side tests

* Adding open server to system console

* Moving websocket connection

* Fixing unit test

* Fixing unit tests

* Fixing unit tests

* Adding nickname and more LDAP unit tests (#2717)

* Adding join open teams

* Cleaning up all TODOs in the code

* Fixing web sockets

* Removing unused webockets file

* PLT-2533 Add the ability to reset a user's MFA from the system console (#2715)

* Add the ability to reset a user's MFA from the system console

* Add client side unit test for adminResetMfa

* Reorganizing authentication to fix LDAP error message (#2723)

* Fixing failing unit test

* Initial upgrade db code

* Adding upgrade script

* Fixing upgrade script after running on core

* Update OAuth and Claim routes to work with user model changes (#2739)

* Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740)

* Fixing team invite ldap login call (#2741)

* Fixing bluebar and some img stuff

* Fix all the different file upload web utils (#2743)

* Fixing invalid session redirect (#2744)

* Redirect on bad channel name (#2746)

* Fixing a bunch of issue and removing dead code

* Patch to fix error message on leave channel (#2747)

* Setting EnableOpenServer to false by default

* Fixing config

* Fixing upgrade

* Fixing reported bugs

* Bug fixes for PLT-2057

* PLT-2563 Redo password recovery to use a database table (#2745)

* Redo password recovery to use a database table

* Update reset password audits

* Split out admin and user reset password APIs to be separate

* Delete password recovery when user is permanently deleted

* Consolidate password resetting into a single function

* Removed private channels as an option for outgoing webhooks (#2752)

* PLT-2577/PLT-2552 Fixes for backstage (#2753)

* Added URL to incoming webhook list

* Fixed client functions for adding/removing integrations

* Disallowed slash commands without trigger words

* Fixed clientside handling of errors on AddCommand page

* Minor auth cleanup (#2758)

* Changed EditPostModal to just close if you save without making any changes (#2759)

* Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756)

* Fixed url in channel info modal (#2755)

* Fixing reported issues

* Moving to version 3 of the apis

* Fixing command unit tests (#2760)

* Adding team admins

* Fixing DM issue

* Fixing eslint error

* Properly set EditPostModal's originalText state in all cases (#2762)

* Update client config check to assume features is defined if server is licensed (#2772)

* Fixing url link

* Fixing issue with websocket crashing when sending messages to different teams
2016-04-21 22:37:01 -07:00
Joram Wilander
49ab8b2161 Add custom branding functionality (#2667) 2016-04-11 13:45:03 -04:00
Harrison Healey
cf72de283c Removed debug code from IntegrationStore 2016-04-05 09:43:26 -04:00
Harrison Healey
b3edd32aee PLT-1750 Moved slash commands to backstage
* Added slash commands to InstalledIntegrations page

* Reset installed integration type filter if there is no longer any integrations of the selected type

* Added pages to backstage to add slash commands

* Cleaned up internationalization for slash commands

* Added ability to regen slash command tokens from backstage

* Removed Integrations tab from UserSettings
2016-04-05 09:29:01 -04:00
Christopher Speller
5f3111e880 Fxing some channel changing issues 2016-04-04 11:09:59 -04:00
Christopher Speller
3ccc0f814a Fixing reply from permalinks 2016-03-31 15:37:50 -04:00
Harrison Healey
307c16df5f Fixed errors when joining a channel that doesn't exist yet 2016-03-31 11:10:57 -04:00