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

151 Коммитов

Автор SHA1 Сообщение Дата
Asaad Mahmood
235beeb829 Merge branch 'master' of https://github.com/asaadmahmoodspin/platform 2015-07-08 22:40:28 +05:00
Christopher Speller
450821bcba Merge pull request #148 from hmhealey/mm1488
MM-1488 Changed code to dismiss mention list to not trigger when you click on the list itself
2015-07-08 09:01:17 -04:00
hmhealey
809cc9f6f3 Changed code to dismiss mention list to not trigger when you click on the list itself 2015-07-07 17:44:32 -04:00
Reed Garmsen
ff4b94f02b Small changes and code clean-up 2015-07-07 13:18:10 -07:00
Reed Garmsen
91511281c5 Changed loading logic for retrieving more channels to allow for loading animation to be inserted into the More... menu that allows you to join more channels while waiting for the list of channels to load 2015-07-07 13:10:11 -07:00
Reed Garmsen
daaf331eb5 Changed textarea resizeability from being a blanket statement to everything to only the ones with issues 2015-07-07 12:04:36 -07:00
Christopher Speller
982c9eeceb Merge pull request #134 from nickago/MM-1313
Mm 1313 Made the typing notification more responsive/accurate
2015-07-07 08:30:56 -04:00
Corey Hulen
b418f4cd62 Merge pull request #135 from asaadmahmoodspin/master
MM-1461 - Updating Mattermost UI
2015-07-06 13:58:38 -08:00
Corey Hulen
8f48d63959 Merge pull request #133 from nickago/MM-794
MM-794 Force the extra info to update asych on user creation
2015-07-06 13:57:57 -08:00
Corey Hulen
5bdc7f3762 Merge pull request #132 from mattermost/mm-1250
fixes mm-1250 mention highlights should now align in textbox
2015-07-06 13:57:29 -08:00
nickago
83e4d3fb9c Changed socket event to a props based change 2015-07-06 12:37:42 -07:00
Asaad Mahmood
f51cc73aaf MM-1461 - Updating Mattermost UI 2015-07-06 23:18:23 +05:00
nickago
8ac5f22337 Typing notification disappears when message is sent 2015-07-06 08:43:45 -07:00
nickago
0b71537ff0 Typing notifier resets on channel change 2015-07-06 08:14:42 -07:00
Reed Garmsen
e9bec9600d Fixed copy-paste error in code 2015-07-06 07:47:11 -07:00
Reed Garmsen
4ac07f4347 Fixed not being able to open channel notifications settings menu in IE10 2015-07-06 07:39:22 -07:00
nickago
7c95df2766 Force the extra info to update asych 2015-07-06 06:40:55 -07:00
Joram Wilander
4a3003c0dc Merge pull request #116 from nickago/MM-1341
MM-1341 mention auto-complete now goes away if you move off it's specific textbox
2015-07-03 15:05:33 -04:00
Reed Garmsen
1a1b29ee6c Restructured logic to flow more naturally and be cleaner 2015-07-02 16:38:34 -07:00
Reed Garmsen
483b37a64f Added logic for loading animation to appear when posts have yet to be loaded. Added markup necessary for loading animation css. Removed a file that was no longer needed for the design. 2015-07-02 14:54:33 -07:00
Reed Garmsen
d5d9481c0f Added new files for adding new loading animation 2015-07-02 14:54:33 -07:00
Asaad Mahmood
ea1ef222b7 MM-1319 - Copy link and background change 2015-07-18 01:52:37 +05:00
Corey Hulen
a3db8e83f6 Merge pull request #123 from asaadmahmoodspin/mm-1426
MM-1426 - Updating UI
2015-07-02 11:16:22 -08:00
Asaad Mahmood
97c112c427 Changing var currentUser in post_right 2015-07-17 23:56:27 +05:00
Asaad Mahmood
07601d6561 Changing var name from currentUser to currentUserCss 2015-07-17 23:43:36 +05:00
asaadmahmoodspin
74cfb65be1 Merge pull request #2 from rgarmsen2295/mm-1453
MM-1453 Added additional class to the markup indicating if the post came from the current user
2015-07-02 23:18:00 +05:00
Asaad Mahmood
764bd97bc7 Improving modal UI 2015-07-17 23:10:10 +05:00
Asaad Mahmood
665dff3f6d Improving channel notifications 2015-07-17 22:09:25 +05:00
Reed Garmsen
9fca35cad5 Added additional class to the markup indicating if the post came from the current user 2015-07-02 11:13:38 -07:00
Reed Garmsen
801cac46a9 Changed valet title and description for clarity 2015-07-02 09:02:47 -07:00
Joram Wilander
bd9b038c00 Merge pull request #118 from nickago/MM-1363
Mm 1363 Limit uploads to only JPEGs for profile pictures
2015-07-02 08:20:41 -04:00
Corey Hulen
3757bc85fb Merge pull request #115 from nickago/MM-1425
MM-1425 Facelifted "direct message" to "private message"
2015-07-01 22:21:09 -08:00
nickago
855f3d3630 Changed ordering of steps for upload to imporve asthetic 2015-07-01 17:04:10 -07:00
nickago
6f83b0fd2c Restricted profile picture uploads to just JPEGs 2015-07-01 16:04:18 -07:00
nickago
fd310e382a Finally fixed the git weirdness 2015-07-01 12:41:36 -07:00
nickago
d47c86b921 Removed a change originally made for a prior fix tactic 2015-07-01 11:14:18 -07:00
nickago
0967e1fd01 Fixed click response 2015-07-01 11:08:55 -07:00
nickago
26560b5fc6 Inital attempt at active element checking 2015-07-01 09:53:32 -07:00
nickago
27eeabafe0 Facelifted "direct message" to "private message" 2015-07-01 09:48:39 -07:00
nickago
018f6d96ba Aligned front end and back end domain requirements 2015-06-30 12:08:53 -07:00
Christopher Speller
7a7be75e74 Merge pull request #109 from nickago/MM-1289
Mm 1289 Now sorts extra channel members lexigraphically
2015-06-30 14:06:00 -04:00
Christopher Speller
aa023c8b08 Merge pull request #108 from rgarmsen2295/mm-1309
MM-1309 Fixed grammmatical issue in error message
2015-06-30 14:03:23 -04:00
Joram Wilander
a00b4e00ad Merge pull request #106 from mattermost/mm-1119
fixes mm-1119 adds @all and @channel mention capabilites
2015-06-30 11:58:22 -04:00
nickago
4022ab5ce0 Added extra precaution to avoid null error 2015-06-30 07:59:31 -07:00
nickago
ab154d50ea MM-1289 Now sorts users in lexigraphical order in extra members popover 2015-06-30 07:47:46 -07:00
Reed Garmsen
c1d1386122 Fixed grammmatical issue in error message 2015-06-30 07:46:43 -07:00
Christopher Speller
3943d6a209 Revert "MM-1289 Sorted the channel members popover lexigraphically" 2015-06-30 10:23:46 -04:00
JoramWilander
495b0e4523 add default icon for non-user autocompletes 2015-06-30 08:42:08 -04:00
Christopher Speller
236f7a9bd2 Merge pull request #101 from rgarmsen2295/mm-983
MM-983 Fixed file preview removal in IE10
2015-06-30 08:07:13 -04:00
Christopher Speller
ae86eab289 Merge pull request #91 from nickago/MM-1289
MM-1289 Sorted the channel members popover lexigraphically
2015-06-30 08:06:05 -04:00