Commit Graph

1538 Commits

Author SHA1 Message Date
Asaad Mahmood
9a4a1c5f96 Initialising trimmedFilename variable 2015-08-14 19:38:01 +05:00
Asaad Mahmood
67dc6e60f3 mm-1858 - Truncating and adding tooltips to file names in thumbnail details 2015-08-14 19:36:58 +05:00
Joram Wilander
b9aef9f2a6 Merge pull request #360 from rgarmsen2295/mm-375d
MM-375 Adds text formatting features using a modified version of the marked js library
2015-08-14 09:28:24 -04:00
Christopher Speller
92c4df5b10 Merge pull request #370 from hmhealey/mm1812
MM-1812 Provide warnings on team invite screens when email is disabled
2015-08-14 08:48:24 -04:00
Christopher Speller
a8930cbabe Merge pull request #365 from mattermost/mm-1700
MM-1700 don't pull all channel data all the time
2015-08-14 08:35:19 -04:00
hmhealey
8fc4456213 Removed isEmailEnabledSynchronous and switched the email disabled warnings to use ConfigStore 2015-08-13 13:23:56 -04:00
hmhealey
ca919538cc Added ConfigStore that is populated from the server 2015-08-13 13:01:21 -04:00
Joram Wilander
b1d37e9c38 Merge pull request #371 from nickago/MM-1229
MM-1229 Mobile client display public link in same tab instead of new tab
2015-08-13 11:52:29 -04:00
nickago
2dfc9206f3 Added cosmetic refactoring 2015-08-13 08:28:35 -07:00
JoramWilander
2485b87b28 removed underscores from function names in channel_store 2015-08-13 08:00:10 -04:00
Harrison Healey
6d9e715e26 Merge pull request #368 from nickago/MM-1911
MM 1911 Added support for .jpeg in addition to .jpg
2015-08-12 17:34:30 -04:00
Joram Wilander
eb3ca46982 Merge pull request #373 from nickago/MM-1868
MM-1868 Changed wording for broader definition of what is previewed
2015-08-12 15:21:58 -04:00
Reed Garmsen
41e74860d8 Cosmetic refactoring of the notifyMe function in utils.jsx and removed unnecessary files 2015-08-12 11:19:42 -07:00
Reed Garmsen
5a58fc41c2 Minor change to bold and italic parsing to be more similar to code parsing 2015-08-12 11:19:42 -07:00
Reed Garmsen
e02883baf2 Cosmetic refactoring of post_body.jsx 2015-08-12 11:19:42 -07:00
Reed Garmsen
23a331f933 Cosmetic refactoring of textToJsx function 2015-08-12 11:19:42 -07:00
Reed Garmsen
d293bc0b79 Implemented basic text formatting package using a modfied version of the marked js library. Supports *bold*, _italics_, and code 2015-08-12 11:19:42 -07:00
nickago
d7c07d07d0 Changed Image to File since we preview files 2015-08-12 10:57:16 -07:00
Joram Wilander
95e6626f9f Merge pull request #367 from mattermost/mm-1884
MM-1184 Updating dockerfiles for latest master and osx
2015-08-12 13:31:29 -04:00
Joram Wilander
af17764561 Merge pull request #363 from mattermost/travis-s3-deploy
Adding S3 deployment to travis ci
2015-08-12 13:31:11 -04:00
Joram Wilander
b50ba05626 Merge pull request #366 from nickago/MM-1914
MM-1914 Fixed typo
2015-08-12 11:19:35 -04:00
nickago
7a355d2f2e Fixed typo 2015-08-12 08:05:52 -07:00
nickago
1415560d52 get public link now displays in the same window pane on mobile, but in a new tab on desktop. Also added proptypes 2015-08-11 14:58:43 -07:00
hmhealey
d35065d6fd Reformatted code to match the style guide 2015-08-11 16:53:15 -04:00
hmhealey
37909f52ad Disabled the invite members dialog when email is disabled on the server 2015-08-11 16:53:15 -04:00
hmhealey
e27ba7454d Disabled the invite email portion of the team setup when email is disabled on the server 2015-08-11 16:53:15 -04:00
hmhealey
3f5993eedf Added initial api to allow clientside code to query serverside configuration 2015-08-11 16:53:15 -04:00
nickago
51e63ced93 Cosmetic refactoring 2015-08-11 13:07:16 -07:00
nickago
fe0b055981 Added server side validation of jpegs as images 2015-08-11 12:19:23 -07:00
nickago
a60d774634 Added jpeg's to list of image types 2015-08-11 11:49:13 -07:00
Christopher Speller
083433dc0f Updating dockerfiles to allow for previewing of latest master and fixing local docker build so it works on osx 2015-08-11 14:07:35 -04:00
nickago
8633c477c8 Fixed typo 2015-08-11 10:54:29 -07:00
JoramWilander
0178b178e5 merge fix 2015-08-11 12:20:49 -04:00
JoramWilander
f03e182801 switch to channel after creation 2015-08-11 12:14:58 -04:00
JoramWilander
4127c2b258 format channel_store to more closely match style guide and sort channels in channel store over sidebar 2015-08-11 12:14:58 -04:00
JoramWilander
e52405f47a don't refresh page on channel creation and ignore case when sorting channels in sidebar 2015-08-11 12:14:58 -04:00
JoramWilander
1692fca1c3 update rename channel modal to not refresh page on channel name change 2015-08-11 12:14:58 -04:00
JoramWilander
3f38c21796 fixed channel counts etag to only update when appropriate 2015-08-11 12:11:35 -04:00
JoramWilander
cb17851e2d fix channelIdWithCountAndUpdateAt naming to be proper camel case 2015-08-11 12:11:35 -04:00
JoramWilander
963ca03727 change getChannel api service to not register as user activity 2015-08-11 12:11:35 -04:00
JoramWilander
ca4d0c68af add etag cache testing to api GetChannelCounts unit test 2015-08-11 12:11:35 -04:00
JoramWilander
3d0133b5e8 added api unit test for GetChannelCounts 2015-08-11 12:11:35 -04:00
JoramWilander
9f57ed5bf1 added store unit test for GetChannelCounts 2015-08-11 12:11:35 -04:00
JoramWilander
4ec76e059c incorporate channel updateAt into channel counts and pull channel data on channel update 2015-08-11 12:11:35 -04:00
JoramWilander
6c0fefad15 added getChannelCounts service and refactored the client to more intelligently pull channel data 2015-08-11 12:11:35 -04:00
JoramWilander
1c0ee4d2f6 added getChannel api service and use that over getChannels where appropriate on client 2015-08-11 12:09:54 -04:00
Christopher Speller
4c7cdb20f0 Merge pull request #359 from hmhealey/mm1770
MM-1770 Add the ability to cancel in-progress file uploads
2015-08-11 12:08:08 -04:00
Christopher Speller
d72d356cbc Merge pull request #354 from nickago/MM-1598
MM-1598 Left and right arrow keys now scroll through pictures/files in preview mode
2015-08-11 12:06:28 -04:00
Christopher Speller
a386bb9293 Merge pull request #353 from hmhealey/mm401
MM-401 Add indicators to the sidebar for offscreen unread channels
2015-08-11 12:05:46 -04:00
Christopher Speller
bffc37be13 Merge pull request #350 from nickago/MM-1684
MM-1684 Refactored code to remove errors on startup
2015-08-11 12:05:20 -04:00