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

1947 Коммитов

Автор SHA1 Сообщение Дата
Reed Garmsen
596e76d404 Fixed issue with uploading files from RHS when trying to upload after opening the RHS and then switching channels 2015-08-12 12:34:08 -07:00
Reed Garmsen
6f091f0f6d Added check to make sure files are not strings 2015-08-12 12:29:57 -07:00
Reed Garmsen
9f9d93e613 Switched to using the jquery-dragster library to implement more consistent drag and drop support, rather than using the inconsistent html5 implementation 2015-08-12 12:29:57 -07:00
Reed Garmsen
9baafdb372 Changed structure to keep code contained to file_upload.jsx 2015-08-12 12:29:57 -07:00
Reed Garmsen
81d7599f75 Working on adding overlays for file drag and drop 2015-08-12 12:29:57 -07:00
Reed Garmsen
1fa436b4f9 Users can now drop files into the center pane or the rhs respectively to upload images and other files 2015-08-12 12:29:57 -07:00
Reed Garmsen
9bbeef208f Added handlers for dragging and dropping files onto the center pane or RHS 2015-08-12 12:24:22 -07: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
nickago
d53827cce3 Added non-default reliant behavior to initial scroll on mount 2015-08-12 10:35:50 -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
nickago
ec370604ac Removed usused variable 2015-08-12 09:40:47 -07:00
nickago
d36c1de941 Changed the default for update to hold your position in the list 2015-08-12 09:38:10 -07:00
nickago
f614249dd3 Removed personal debugging code and notes 2015-08-12 09:28:54 -07:00
nickago
6028d013d6 Added case for window resize and cleaned up function 2015-08-12 09:28:54 -07:00
nickago
3d492bf450 Completely rehauled scrolling system, finished base implementation 2015-08-12 09:28:54 -07:00
nickago
41248959c8 Filled out comments for post list 2015-08-12 09:28:54 -07:00
nickago
505865311e Further added comments and split up if statments to make it more readable 2015-08-12 09:28:54 -07:00
nickago
f9070177c1 Added more comments and did cosmetic refactoring to understand code easier 2015-08-12 09:28:54 -07:00
nickago
ea4250bbbc Added comments to confusing post list method 2015-08-12 09:28:54 -07: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
nickago
da46180131 Fixed camelCase typos 2015-08-11 13:55:46 -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
f61e093b53 Cosmetic refactoring and removing no-op condition of set state 2015-08-11 13:33:08 -07:00
nickago
e01cae5c09 access history and activity log closing re-opens user settings in correct state 2015-08-11 13:33:08 -07: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