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

1567 Коммитов

Автор SHA1 Сообщение Дата
nickago
602bcc4f38 Moved controlling CSS into post list so it always shows up 2015-08-17 13:23:58 -07:00
Joram Wilander
996f0d79a7 Merge pull request #386 from mattermost/revert-372-MM-1640
Revert "Mm 1640 Fixed odd scrolling issues on channel refresh"
2015-08-17 11:38:08 -04:00
Joram Wilander
646214b49b Revert "Mm 1640 Fixed odd scrolling issues on channel refresh" 2015-08-17 11:35:30 -04:00
Christopher Speller
1c65fe1f84 Merge pull request #372 from nickago/MM-1640
Mm 1640 Fixed odd scrolling issues on channel refresh
2015-08-17 09:44:27 -04:00
Joram Wilander
738e53af95 Merge pull request #369 from nickago/MM-1703
MM 1703 Closing access history or activity log returns user to security menu
2015-08-17 09:37:16 -04:00
Joram Wilander
2fbc92af10 Merge pull request #379 from asaadmahmoodspin/mm-1854
mm-1858 - Truncating and adding tooltips to file names
2015-08-17 09:30:53 -04:00
Joram Wilander
e5a3817488 Merge pull request #384 from mattermost/it33-patch-1
Added missing "is"
2015-08-17 07:40:12 -04:00
it33
18261deee3 Added missing "is" 2015-08-15 08:25:28 -07:00
nickago
dd8b0acc57 cosmetic refactoring 2015-08-14 14:01:27 -07:00
Asaad Mahmood
5f068109a7 Fixing style guide issues 2015-08-15 01:30:20 +05:00
Asaad Mahmood
8f9f4810a5 Using variables efficiently 2015-08-15 01:17:26 +05:00
Christopher Speller
9036dd99aa Merge pull request #382 from mattermost/revert-360-mm-375d
Revert "MM-375 Adds text formatting features using a modified version…
2015-08-14 15:13:04 -04:00
Christopher Speller
26a8e19a35 Revert "MM-375 Adds text formatting features using a modified version of the marked js library" 2015-08-14 15:03:32 -04:00
nickago
6c78ec3439 Changed timeout code to event based 2015-08-14 09:58:12 -07:00
nickago
156682e3de Changed user_settings1 to user_settings and removed vestigial css 2015-08-14 09:29:15 -07:00
nickago
5c1bead36a cosmetic refactoring 2015-08-14 09:09:39 -07:00
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
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