Commit Graph

1222 Commits

Author SHA1 Message Date
=Corey Hulen
4244990bf1 Merge branch 'master' into mm-1355 2015-07-29 01:39:43 -08:00
=Corey Hulen
9677a9f717 Fixes mm-1355 adds rate limiting apis 2015-07-29 01:26:10 -08:00
Corey Hulen
d222f6c7a3 Merge pull request #264 from asaadmahmoodspin/mm-1732
mm-1732 - Decreasing font size for footer in emails
2015-07-28 11:05:58 -08:00
Joram Wilander
b15bda8328 Merge pull request #270 from mattermost/mm-1763
MM-1763 update our postgresql index check to work with 9.2.4+ versions of postgresql
2015-07-28 12:58:47 -04:00
JoramWilander
c45cf5514f update our postgresql index check to work with 9.2+ versions of postgresql 2015-07-28 12:42:17 -04:00
Asaad Mahmood
2bfe9eea56 MM-1730 - Updating logo in emails 2015-07-28 20:41:24 +05:00
Christopher Speller
2602f3b49e Merge pull request #255 from hmhealey/mm1682
MM-1682 Allow files without file extensions to be attached to messages
2015-07-28 11:14:16 -04:00
Asaad Mahmood
0749d53186 mm-1732 - Decrease font size for footer in emails 2015-07-28 19:58:29 +05:00
hmhealey
892fe2b7b6 Added non-capturing group to regex used for matching local file urls 2015-07-28 10:10:44 -04:00
hmhealey
1842868410 Display thumbnails for files without file extensions 2015-07-28 10:07:11 -04:00
hmhealey
d8e9b7c8e4 Allow users to download file attachments with names that don't include a file extension 2015-07-28 10:07:11 -04:00
hmhealey
fbb2477643 Allow files without extensions to be uploaded as attachments to posts 2015-07-28 10:07:10 -04:00
Christopher Speller
ec2e61bc55 Merge pull request #253 from nickago/MM-1654
MM-1654 Anti-clickjacking measures
2015-07-28 10:03:10 -04:00
Joram Wilander
94b905aff5 Merge pull request #260 from rgarmsen2295/mm-1724
MM-1724 Changed title of Active Devices to Active Sessions and added help text explaining Active Sessions
2015-07-28 09:54:17 -04:00
Joram Wilander
3a29713537 Merge pull request #262 from mattermost/it33-patch-1
Removed version number from dev build README
2015-07-28 08:53:48 -04:00
Christopher Speller
de07cdaf29 Merge pull request #239 from nickago/MM-1295
MM-1295 Removal from a channel occurs in real time
2015-07-28 08:49:29 -04:00
Christopher Speller
432e96f52c Merge pull request #257 from mattermost/mm-1502
Fixes mm-1502 changing session age to 30 days
2015-07-28 08:31:23 -04:00
it33
883d303be5 Removed version number from dev build README 2015-07-27 22:32:47 -07:00
Reed Garmsen
539a05a6bd Changed title of Active Devices to Active Sessions; added help text explaining Active Sessions 2015-07-27 17:13:53 -07:00
nickago
ce2cf5b4e8 Limited the added headers to only non-api calls 2015-07-27 14:39:55 -07:00
Corey Hulen
d24e3db020 Merge pull request #251 from asaadmahmoodspin/master
Ui Updates to signup flow
2015-07-27 13:30:50 -08:00
Joram Wilander
d9f7d43e96 Merge pull request #254 from hmhealey/mm1674
MM-1674 Replaced call to String.prototype.startsWith which only works in browsers that support ES6
2015-07-27 17:27:44 -04:00
Corey Hulen
a6427d99f7 Merge pull request #258 from mattermost/mm-1745
MM-1754 fixes unread channels showing as read and forever new message indicator
2015-07-27 13:15:45 -08:00
nickago
da6d3556e8 Changed from Jquery style modal modification to using browserStore 2015-07-27 14:07:23 -07:00
nickago
2d8b81170b Added precautions to avoid incorrect data display to the user by clearing modal after every close 2015-07-27 14:07:23 -07:00
nickago
ed70db1861 When user is removed, a modal appears, which on closing redirects the
user to town square.
2015-07-27 14:07:23 -07:00
nickago
c9459feb59 When removed from a channel, user is sent back to town square and that
channel is removed from their sidebar
2015-07-27 14:07:23 -07:00
JoramWilander
e122b31db1 fixes some database queries that broke with postgres, fixes the unread/new mesasge issues 2015-07-27 17:04:44 -04:00
Joram Wilander
62db88ed45 Merge pull request #248 from hmhealey/mm1494
MM-1494 Change Makefile to use local dependencies, update nfnt/resize library, and change image rescaling to use Lanczos3
2015-07-27 15:33:16 -04:00
Joram Wilander
5a7dacf6f2 Merge pull request #246 from rgarmsen2295/mm-1657
MM-1657 Removes tag highlighting for mentions
2015-07-27 15:32:22 -04:00
=Corey Hulen
4a28e6c5dc Fixes mm-1502 changing session age to 30 days 2015-07-27 11:30:10 -08:00
hmhealey
a3cbe598fb Replaced instance of String.prototype.startsWith which only works in browsers that support ES6 2015-07-27 15:01:15 -04:00
Corey Hulen
81e55eb57c Merge pull request #245 from nickago/MM-1662
MM-1662 Added support for png profile pictures
2015-07-27 10:53:02 -08:00
nickago
18d160bec5 Centralized header additions and removed duplicate code 2015-07-27 08:29:08 -07:00
nickago
c0d225c6d8 Removed ability to place MM in an iframe 2015-07-24 13:50:56 -07:00
Asaad Mahmood
5b7ae4f864 Ui Updates to signup flow 2015-07-25 01:29:49 +05:00
Reed Garmsen
b27562cedc Removed vestige textdiv code that is also no longer necessary due to removing the mention tags 2015-07-24 13:03:58 -07:00
hmhealey
7355fe578c Reverted accidental change to the Makefile that occurred while rebasing hmhealey/mm1494 branch 2015-07-24 13:50:02 -04:00
Joram Wilander
85ff151b71 Merge pull request #247 from nickago/MM-552
Mm 552 Enables email from a name instead of just an address
2015-07-24 12:50:34 -04:00
hmhealey
f85d37cfb8 Changed Makefile to just look for godep in the GOPATH to make the process simpler 2015-07-24 12:37:11 -04:00
hmhealey
2d91d4b9c6 Changed make cover to run godep go to match the rest of Makefile 2015-07-24 12:17:48 -04:00
Joram Wilander
1c7ff66d98 Merge pull request #249 from asaadmahmoodspin/master
Complete signup page UI changes
2015-07-24 12:14:47 -04:00
Asaad Mahmood
9c2d4d39cc Adding hint text for username back in 2015-07-24 21:04:11 +05:00
Asaad Mahmood
464158e0f2 Minor class changes 2015-07-24 20:50:48 +05:00
Joram Wilander
4f9c40e60b Merge pull request #226 from nickago/MM-1546
MM-1546 Clear error messages on modal close and channel switch
2015-07-24 11:40:42 -04:00
Asaad Mahmood
0996106d65 Complete signup page UI changes 2015-07-24 19:51:41 +05:00
nickago
22acb7b950 Set the 'From' field to include the FeedbackName from the config 2015-07-24 07:36:38 -07:00
hmhealey
4e2ca3d74d Fixed detection of godep when it doesn't exist on the path 2015-07-24 09:29:02 -04:00
hmhealey
49c50f9575 Change Makefile to use local copies of dependencies by running go through godep 2015-07-24 09:29:02 -04:00
hmhealey
a09f35bdcf Change image rescaling algorithm back to Lanczos3 now that it works correctly in all cases 2015-07-24 09:28:10 -04:00