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

  • 6e1d766d1d Merge pull request #124 from asaadmahmoodspin/master Corey Hulen 2015-07-02 12:33:13 -08:00
  • 1005dfb8e4 Updating margins Asaad Mahmood 2015-07-18 01:19:53 +05:00
  • dafc49dcae Minor fixes to mattermost UI Asaad Mahmood 2015-07-18 01:09:02 +05:00
  • a3db8e83f6 Merge pull request #123 from asaadmahmoodspin/mm-1426 Corey Hulen 2015-07-02 11:16:22 -08:00
  • 97c112c427 Changing var currentUser in post_right Asaad Mahmood 2015-07-17 23:56:27 +05:00
  • 07601d6561 Changing var name from currentUser to currentUserCss Asaad Mahmood 2015-07-17 23:43:36 +05:00
  • f5c4cf10c4 Adding highlights and improving css for posts on responsive screens Asaad Mahmood 2015-07-17 23:39:09 +05:00
  • e233d0d2d2 Merge pull request #121 from rgarmsen2295/mm-1445 Corey Hulen 2015-07-02 10:40:51 -08:00
  • 74cfb65be1 Merge pull request #2 from rgarmsen2295/mm-1453 asaadmahmoodspin 2015-07-02 23:18:00 +05:00
  • 288bfbbd56 Merge branch 'master' of https://github.com/mattermost/platform into mm-1426 Asaad Mahmood 2015-07-17 23:10:54 +05:00
  • 764bd97bc7 Improving modal UI Asaad Mahmood 2015-07-17 23:10:10 +05:00
  • 665dff3f6d Improving channel notifications Asaad Mahmood 2015-07-17 22:09:25 +05:00
  • 30239d255a Improving image modals Asaad Mahmood 2015-07-17 22:06:53 +05:00
  • 138d0ea12b Adding border radius Asaad Mahmood 2015-07-17 21:07:53 +05:00
  • e46561339f MM-1426 - Updating UI Asaad Mahmood 2015-07-17 21:04:33 +05:00
  • 9fca35cad5 Added additional class to the markup indicating if the post came from the current user Reed Garmsen 2015-07-02 11:13:38 -07:00
  • ede7d376f2 Merge pull request #120 from mattermost/get-teammate-fix Corey Hulen 2015-07-02 09:59:01 -08:00
  • 801cac46a9 Changed valet title and description for clarity Reed Garmsen 2015-07-02 09:02:47 -07:00
  • 18629d8184 make loop simpler JoramWilander 2015-07-02 09:34:57 -04:00
  • 7b6fe252f1 fix getDirectTeammate so that if teammate is the second id it doesn't return null JoramWilander 2015-07-02 09:32:31 -04:00
  • bd9b038c00 Merge pull request #118 from nickago/MM-1363 Joram Wilander 2015-07-02 08:20:41 -04:00
  • 4adecf8198 Merge pull request #117 from nickago/MM-1308 Christopher Speller 2015-07-02 07:55:35 -04:00
  • 3757bc85fb Merge pull request #115 from nickago/MM-1425 Corey Hulen 2015-07-01 22:21:09 -08:00
  • c0de5c37f0 Merge pull request #114 from asaadmahmoodspin/master Corey Hulen 2015-07-01 22:20:53 -08:00
  • d3efefba1f Merge pull request #92 from nickago/MM-1151 Corey Hulen 2015-07-01 22:19:58 -08:00
  • 03d7fb1ff2 Merge pull request #90 from ralder/patch-1 Corey Hulen 2015-07-01 22:18:19 -08:00
  • 855f3d3630 Changed ordering of steps for upload to imporve asthetic nickago 2015-07-01 17:04:10 -07:00
  • 6f83b0fd2c Restricted profile picture uploads to just JPEGs nickago 2015-07-01 16:04:18 -07:00
  • 233502eea8 Changed offline timeout to 1 mintue nickago 2015-07-01 12:52:13 -07:00
  • fd310e382a Finally fixed the git weirdness nickago 2015-07-01 12:41:36 -07:00
  • c15bc9ad94 Improving targeting for row content Asaad Mahmood 2015-07-01 23:37:50 +05:00
  • 64c8856565 Just arranging the css more properly Asaad Mahmood 2015-07-01 23:36:51 +05:00
  • 494781d3cc Fixing height for content Asaad Mahmood 2015-07-01 23:30:41 +05:00
  • d47c86b921 Removed a change originally made for a prior fix tactic nickago 2015-07-01 11:14:18 -07:00
  • 0967e1fd01 Fixed click response nickago 2015-07-01 11:08:55 -07:00
  • 26560b5fc6 Inital attempt at active element checking nickago 2015-07-01 09:53:32 -07:00
  • 27eeabafe0 Facelifted "direct message" to "private message" nickago 2015-07-01 09:48:39 -07:00
  • 42c7fbaa92 Fixing css issues in IE, adding doctype to html files Asaad Mahmood 2015-07-01 20:37:27 +05:00
  • 5e204030ff Merge pull request #62 from jedisct1/authenticated-encryption Corey Hulen 2015-06-30 20:17:32 -08:00
  • 75c1938077 Merge pull request #110 from nickago/MM-1430 Corey Hulen 2015-06-30 19:46:25 -08:00
  • 1200f76484 Merge pull request #102 from nickago/MM-1328 Corey Hulen 2015-06-30 19:44:38 -08:00
  • fd3dc5c5e5 Merge pull request #111 from rgarmsen2295/mm-1305 Joram Wilander 2015-06-30 18:09:17 -04:00
  • 71d0a9472f Removed unnecessary loop copying Reed Garmsen 2015-06-30 15:00:57 -07:00
  • ae77db2145 Changed keyword logic to use arrays rather than maps to remove highlighting of js object properties like constructor and __proto__ Reed Garmsen 2015-06-30 12:30:11 -07:00
  • 018f6d96ba Aligned front end and back end domain requirements nickago 2015-06-30 12:08:53 -07:00
  • bcc31b714b Added the ability to have hashtags with dashes in them nickago 2015-06-30 11:56:55 -07:00
  • 7a7be75e74 Merge pull request #109 from nickago/MM-1289 Christopher Speller 2015-06-30 14:06:00 -04:00
  • aa023c8b08 Merge pull request #108 from rgarmsen2295/mm-1309 Christopher Speller 2015-06-30 14:03:23 -04:00
  • a00b4e00ad Merge pull request #106 from mattermost/mm-1119 Joram Wilander 2015-06-30 11:58:22 -04:00
  • 4022ab5ce0 Added extra precaution to avoid null error nickago 2015-06-30 07:59:31 -07:00
  • ab154d50ea MM-1289 Now sorts users in lexigraphical order in extra members popover nickago 2015-06-30 07:47:46 -07:00
  • c1d1386122 Fixed grammmatical issue in error message Reed Garmsen 2015-06-30 07:46:43 -07:00
  • ae21685e35 Merge pull request #107 from mattermost/revert-91-MM-1289 Christopher Speller 2015-06-30 10:24:15 -04:00
  • 3943d6a209 Revert "MM-1289 Sorted the channel members popover lexigraphically" Christopher Speller 2015-06-30 10:23:46 -04:00
  • 8be4df00b4 added mentioned username to default mention keys JoramWilander 2015-06-30 09:11:06 -04:00
  • f030476ff5 @all and @channel now highlight like other mentions JoramWilander 2015-06-30 09:06:10 -04:00
  • 495b0e4523 add default icon for non-user autocompletes JoramWilander 2015-06-30 08:42:08 -04:00
  • 236f7a9bd2 Merge pull request #101 from rgarmsen2295/mm-983 Christopher Speller 2015-06-30 08:07:13 -04:00
  • ae86eab289 Merge pull request #91 from nickago/MM-1289 Christopher Speller 2015-06-30 08:06:05 -04:00
  • 884df23881 Merge pull request #103 from nickago/MM-1293 Joram Wilander 2015-06-30 08:03:58 -04:00
  • 74081b7fdc Merge pull request #100 from asaadmahmoodspin/master Corey Hulen 2015-06-29 21:16:25 -08:00
  • 4d2ca8881b Merge pull request #98 from mattermost/mm-1199 Corey Hulen 2015-06-29 21:16:07 -08:00
  • 351068491e Changed the style of key-assignment to allow for more assured variance nickago 2015-06-29 17:19:00 -07:00
  • 6df00cadb5 Updated file display key to avoid child flattening nickago 2015-06-29 17:06:04 -07:00
  • e41e7a27cf Added semicolons nickago 2015-06-29 15:27:53 -07:00
  • 9afbc9c206 Sorted the channel members popover lexigraphically nickago 2015-06-28 16:36:19 -07:00
  • 0dd73fb9b3 Changed file preview removal from using dataset which is unsupported in ie10 to using the getAttribute method which is backwards and forwards compatible Reed Garmsen 2015-06-29 15:04:08 -07:00
  • 1e0161e4c6 MM-1268 - Updating button in email template Asaad Mahmood 2015-06-30 01:07:23 +05:00
  • 7f8c2a9c83 Merge branch 'master' of https://github.com/mattermost/platform Asaad Mahmood 2015-06-30 01:07:00 +05:00
  • e6b5bdef82 Merge pull request #99 from rgarmsen2295/mm-1303 Joram Wilander 2015-06-29 15:21:51 -04:00
  • 2d3ef0b051 @all and @channel now auto-complete JoramWilander 2015-06-29 15:20:49 -04:00
  • 5a1562cafb Merge pull request #51 from rgarmsen2295/mm-1287 Corey Hulen 2015-06-29 11:08:42 -08:00
  • 7b7e73fb92 added team-wide and channel-wide mentions JoramWilander 2015-06-29 14:37:59 -04:00
  • 6cfccf63d5 Changed invite email to reflect the sender's status in the team (e.g. admin v.s. plain member) Reed Garmsen 2015-06-29 09:42:12 -07:00
  • fce4ad42cb Merge branch 'master' of https://github.com/mattermost/platform Asaad Mahmood 2015-06-29 20:38:02 +05:00
  • ba998db099 update unit tests for default channels JoramWilander 2015-06-29 11:14:12 -04:00
  • 72d54e427c add intro text specific to off-topic channel JoramWilander 2015-06-29 10:31:56 -04:00
  • d00f90d10c new users now join off-topic defaultly JoramWilander 2015-06-29 10:24:45 -04:00
  • cebb4bef84 move default channel creation to seperate func and add off-topic JoramWilander 2015-06-29 09:07:13 -04:00
  • 0792eb18d5 Merge pull request #49 from mattermost/mm-1316 Joram Wilander 2015-06-29 08:14:02 -04:00
  • 366557b101 rebase touch-ups JoramWilander 2015-06-29 08:10:59 -04:00
  • a8089fec3a fixed CSS indenting JoramWilander 2015-06-22 14:52:56 -04:00
  • ffe1e36a55 make channel notifications modal visible in mobile mode JoramWilander 2015-06-22 14:51:20 -04:00
  • d090f5698a update etag version JoramWilander 2015-06-22 14:38:35 -04:00
  • c3ebd3e6be updated channel unit test JoramWilander 2015-06-22 14:35:34 -04:00
  • 5ebeaffe64 fix more indenting JoramWilander 2015-06-22 14:27:35 -04:00
  • b3168a6db8 fix indenting JoramWilander 2015-06-22 14:27:01 -04:00
  • 2b4888d062 fixes mm-1316 improves channel notifications UI and updates channellist etag JoramWilander 2015-06-22 14:23:59 -04:00
  • afb62bb40a Merge pull request #93 from rgarmsen2295/mm-1317 Joram Wilander 2015-06-29 07:43:19 -04:00
  • bcc48ae210 Merge pull request #87 from asaadmahmoodspin/settings-ui Joram Wilander 2015-06-29 07:42:06 -04:00
  • a1448a4e26 Merge pull request #79 from asaadmahmoodspin/master Joram Wilander 2015-06-29 07:41:44 -04:00
  • e621950364 Removed test code Reed Garmsen 2015-06-28 19:38:19 -07:00
  • 2cd5f3629f Fixed typo in team domain look-up page Reed Garmsen 2015-06-28 19:25:39 -07:00
  • ce74e4a728 fix pr #82 mention list inside modal ralder 2015-06-29 01:39:31 +03:00
  • bf8511fa47 Merge pull request #83 from ralder/fix-broken-mailto-user-popover Corey Hulen 2015-06-27 21:50:30 -08:00
  • acc809ca88 Merge pull request #82 from ralder/fix-mentions-dropdown Corey Hulen 2015-06-27 21:50:03 -08:00
  • e1714eaa3f Updating settings UI Asaad Mahmood 2015-06-28 04:18:24 +05:00
  • 86f774e1b0 Merge branch 'master' of https://github.com/mattermost/platform Asaad Mahmood 2015-06-28 04:10:55 +05:00
  • b1c3bd37ad Merge pull request #66 from adamenger/patch-1 Corey Hulen 2015-06-27 06:08:16 -04:00
  • 5ff8b54920 Merge pull request #59 from haikoschol/master Corey Hulen 2015-06-27 06:07:47 -04:00