Commit graph

836 commits

Author SHA1 Message Date
Corey Hulen
b7e7474a5e Fixing invalid session (#3463) 2016-07-01 11:57:17 -08:00
Harrison Healey
74f86da822 Revert "Moved file attachments to be stored in data/channels instead of data/teams/ID/channels (#3416)" (#3461)
This reverts commit ed75dfc6c0.
2016-06-30 10:53:36 -08:00
David Lu
1c8962cf99 enabled team creation for sysadmins (#3433) 2016-06-30 08:43:46 -04:00
Joram Wilander
b97b3ae617 EE: Add the ability to restrict the user roles that can send team invites (#3442) 2016-06-29 14:16:17 -04:00
Corey Hulen
b63f61fe7d PLT-3440 (#3440) 2016-06-29 08:16:20 -04:00
Christopher Speller
6c5a8be6bf Implementing server side of LDAP sync now button (#3430) 2016-06-28 16:11:33 -08:00
Christopher Speller
422e12c364 Changing email notifications to use permalinks (#3399) 2016-06-28 14:44:37 -04:00
Harrison Healey
ed75dfc6c0 Moved file attachments to be stored in data/channels instead of data/teams/ID/channels (#3416) 2016-06-28 14:44:06 -04:00
Thiyagaraj Krishna
11afa405ba Email check shouldn't be case-sensitive #3349 (#3350)
Email address "allowed domains" check appears to be case-sensitive #3349
2016-06-27 08:08:16 -04:00
enahum
944966f7d1 PLT-3415 Fix Sending Test email fails with error (#3396) 2016-06-22 09:32:39 -04:00
Joram Wilander
5f176e4974 Make sure profile is not nil when assigning in sendNotifications (#3395) 2016-06-21 23:05:54 -04:00
enahum
e6fcea8459 PLT-3261 Fix Can't create a team with GitLab if the email domain is restricted (#3379) 2016-06-21 05:49:48 -08:00
Joram Wilander
878465b528 Only check team Id in getChannel for non-DMs (#3382) 2016-06-20 15:39:13 -06:00
David Lu
dbcf8572e5 Fixed @all not working as intended (#3335) 2016-06-15 08:13:47 -04:00
Corey Hulen
c7e9f3cb1b PLT-3264 remove session cookie when switching accounts (#3341) 2016-06-15 08:10:22 -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
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
David Lu
661f221727 Made error message clearer (#3318) 2016-06-14 08:59:55 -04:00
JoramWilander
5af526c259 Merge branch 'release-3.1'
Conflicts:
	webapp/components/create_comment.jsx
2016-06-13 15:29:24 -04:00
Martin Schenck
24a2805456 PLT-2058 Debugging incoming web hook content (#3150)
* PLT-2058 Debugging incoming web hook content

This change debugs contents of incoming webhooks using l4g.

The problem is that in order to debug the request body, it neads to be
read. And a Reader can only be read once. Hence, the body is only read
for Debugging if it is actually enabled. Furthermore, a new reader is
created from the content of the old reader in order for the rest of the
method to work as usual (with or without debugging).

The debug statement is wrapped in a closure, so that the content is
only copied if Debug is actually enabled.

It is not possible to return `(string, string)` from the closure to
`l4g.Debug()`. That is the reason the debugging is not done with `=%v`,
but the translations strings end with a space.

I tested the change with a `application/json` HTTP header as well as
`payload=`

The debug method is extracted into util/log.go in order to be re-usable
for debugging `io.Reader`

* Added a config flag to turn off incoming webhook debugging

Setting `EnableWebhookDebugging` to false in the `config.json` will
disable the printing of the content of incoming webhooks to the console

* Defaulting webhook debugging to true

* Added the setting of debugging incoming webhooks to the system console
2016-06-10 09:59:24 -04:00
Thomas Balthazar
252d1c7e98 CLI: invite user by email - missing siteURL in email (#3297) 2016-06-10 07:59:20 -04: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
Joram Wilander
c0d1b8fbb9 System messages trigger notifications when user is mentioned (#3235) 2016-06-06 14:29:10 -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
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
enahum
6cee1f87f2 PLT-2990 Clicking on a desktop notification from another team opens the team (#3253) 2016-06-06 09:46:09 -04:00
enahum
6ab893dcba PLT-2939 Fix Default slash command icon is invalid (#3250) 2016-06-06 08:59:19 -04:00
Christopher Speller
919eea73b6 LDAP users should not be subject to password guess limits or email verification (#3245) 2016-06-05 03:38:36 -03:00
David Lu
f3825ba766 PLT-2994 Added @all (#3233)
* Added @all

* Uncomment @all server side
2016-06-04 14:21:50 -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
Joram Wilander
8165f5d91f PLT-3131 Add slash command for sending email invites (#3218)
* Add slash command for sending email invites

* Add response for empty message and trim commas

* Check for @ in email addresses before sending

* Update invite people error message
2016-06-02 19:39:23 -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
Joram Wilander
0788e83647 Close HTTP response bodies properly in golang driver (and some api functions) (#3217) 2016-06-02 12:40:34 -07:00
Joram Wilander
3ce6dfc71e Allow system admins to update and delete channels (#3161) 2016-06-01 13:04:06 -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
8563fbc41e Add a wait condition in outgoing webhook test to prevent race condition (#3177) 2016-05-31 12:56:15 -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
Joram Wilander
8f984771ae Send websocket event for system message posts (#3162) 2016-05-31 10:45:45 -04:00
Khoa Lê
397e0a3f68 PLT-2061 Include FULL PATH in logs when referring to a directory (#3170) 2016-05-31 10:35:08 -04:00
Joram Wilander
d2aacdbb07 Don't allow gitlab users to activate mfa (#3125) 2016-05-27 08:36:53 -07:00
David Lu
0d0734ac98 Added duplicated trigger validation (#3124) 2016-05-27 08:35:55 -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
Thomas Balthazar
934ff34ccb Send Post ID in webhooks (#3120) 2016-05-26 11:37:54 -04:00
David Lu
6bd9996daf Made message command for all users (#3122) 2016-05-26 10:03:06 -04:00
Corey Hulen
56cca6be7c PLT-2976 Adding checkout for missing SMTP server when testing email connection (#3115)
* PLT-2976 Adding checkout for missing SMTP server when testing email connection

* Fixing unit test
2016-05-26 07:55:37 -04:00
rompic
20302c6953 fixed type speical -> special (#3052) 2016-05-25 08:19:54 -04:00