Commit Graph

196 Commits

Author SHA1 Message Date
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
cbfc85fde2 Added import statement to styles.scss 2015-07-02 14:54:33 -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
a3d521298a Fixing padding in sidebar dropdown 2015-07-18 01:54:56 +05:00
Asaad Mahmood
ea1ef222b7 MM-1319 - Copy link and background change 2015-07-18 01:52:37 +05:00
Asaad Mahmood
1005dfb8e4 Updating margins 2015-07-18 01:19:53 +05:00
Asaad Mahmood
dafc49dcae Minor fixes to mattermost UI 2015-07-18 01:09:02 +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
Asaad Mahmood
f5c4cf10c4 Adding highlights and improving css for posts on responsive screens 2015-07-17 23:39:09 +05:00
Corey Hulen
e233d0d2d2 Merge pull request #121 from rgarmsen2295/mm-1445
MM-1445 Changed valet title and description for clarity
2015-07-02 10:40:51 -08: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
288bfbbd56 Merge branch 'master' of https://github.com/mattermost/platform into mm-1426 2015-07-17 23:10:54 +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
Asaad Mahmood
30239d255a Improving image modals 2015-07-17 22:06:53 +05:00
Asaad Mahmood
138d0ea12b Adding border radius 2015-07-17 21:07:53 +05:00
Asaad Mahmood
e46561339f MM-1426 - Updating UI 2015-07-17 21:04:33 +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
JoramWilander
18629d8184 make loop simpler 2015-07-02 09:34:57 -04:00
JoramWilander
7b6fe252f1 fix getDirectTeammate so that if teammate is the second id it doesn't return null 2015-07-02 09:32:31 -04: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
Corey Hulen
c0de5c37f0 Merge pull request #114 from asaadmahmoodspin/master
Fixing css issues in IE, adding doctype to html files
2015-07-01 22:20:53 -08:00
Corey Hulen
d3efefba1f Merge pull request #92 from nickago/MM-1151
MM-1151 clickable search results
2015-07-01 22:19:58 -08:00
Corey Hulen
03d7fb1ff2 Merge pull request #90 from ralder/patch-1
fix pr #82 bug mention list inside modal
2015-07-01 22:18:19 -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
Asaad Mahmood
c15bc9ad94 Improving targeting for row content 2015-07-01 23:37:50 +05:00
Asaad Mahmood
64c8856565 Just arranging the css more properly 2015-07-01 23:36:51 +05:00
Asaad Mahmood
494781d3cc Fixing height for content 2015-07-01 23:30:41 +05: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
Asaad Mahmood
42c7fbaa92 Fixing css issues in IE, adding doctype to html files 2015-07-01 20:37:27 +05:00
Corey Hulen
75c1938077 Merge pull request #110 from nickago/MM-1430
MM-1430 Added the ability to have hashtags with dashes in them
2015-06-30 19:46:25 -08:00
Corey Hulen
1200f76484 Merge pull request #102 from nickago/MM-1328
MM-1328 Now limits domain to just alphanumeric
2015-06-30 19:44:38 -08:00
Reed Garmsen
71d0a9472f Removed unnecessary loop copying 2015-06-30 15:00:57 -07:00
Reed Garmsen
ae77db2145 Changed keyword logic to use arrays rather than maps to remove highlighting of js object properties like constructor and __proto__ 2015-06-30 12:30:11 -07:00
nickago
018f6d96ba Aligned front end and back end domain requirements 2015-06-30 12:08:53 -07:00
nickago
bcc31b714b Added the ability to have hashtags with dashes in them 2015-06-30 11:57:57 -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