Commit Graph

798 Commits

Author SHA1 Message Date
=Corey Hulen
b0a917bbc7 fixing unit test 2015-07-05 10:09:47 -08:00
=Corey Hulen
b968ef04a0 fixing unit test 2015-07-05 10:04:01 -08:00
=Corey Hulen
e01aea7825 fixing unit tests 2015-07-05 09:52:23 -08:00
=Corey Hulen
9261b1ec62 fixing timming test 2015-07-05 09:33:08 -08:00
=Corey Hulen
60f5350402 Fixing unit test 2015-07-05 09:27:00 -08:00
=Corey Hulen
5582a05909 Fixing unit test 2015-07-05 09:22:32 -08:00
=Corey Hulen
ed178457cd fixing unit tests 2015-07-05 09:13:06 -08:00
=Corey Hulen
ec2af296b2 fixing race condition in unit tests 2015-07-05 09:06:56 -08:00
=Corey Hulen
592d68cf41 Merge branch 'master' into mm-1391 2015-07-05 09:02:23 -08:00
=Corey Hulen
72bfc1ee2a adding mysql 5.6.17 2015-07-05 08:53:23 -08:00
=Corey Hulen
3a585bf471 adding mysql 5.6 2015-07-05 08:46:04 -08:00
=Corey Hulen
1a84f8da20 adding sql 5.6 2015-07-05 08:38:36 -08:00
=Corey Hulen
612286d969 adding sql 5.6 2015-07-05 08:31:54 -08:00
=Corey Hulen
df97f25c25 adding more unit tests 2015-07-05 08:28:22 -08: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
it33
5b59e38a21 Fixed and added links to process and forums 2015-07-03 11:01:08 -07:00
Joram Wilander
3a8059e477 Merge pull request #126 from rgarmsen2295/mm-1210
MM-1210 Added loading animation that is used while posts in a channel load
2015-07-02 20:09:16 -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
Christopher Speller
681d4d3b78 Merge pull request #125 from asaadmahmoodspin/master
MM-1319 - Copy link and background change
2015-07-02 17:21:15 -04:00
Asaad Mahmood
a3d521298a Fixing padding in sidebar dropdown 2015-07-18 01:54:56 +05:00
Asaad Mahmood
4f00ff1c24 Merge branch 'master' of https://github.com/mattermost/platform 2015-07-18 01:52:48 +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
6e1d766d1d Merge pull request #124 from asaadmahmoodspin/master
Minor fixes to mattermost UI
2015-07-02 12:33:13 -08: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
Corey Hulen
ede7d376f2 Merge pull request #120 from mattermost/get-teammate-fix
fix getDirectTeammate so that if teammate is the second id it doesn't return null
2015-07-02 09:59:01 -08: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
Christopher Speller
4adecf8198 Merge pull request #117 from nickago/MM-1308
MM-1308 Changed offline timeout to 1 mintue
2015-07-02 07:55:35 -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