Commit Graph

847 Commits

Author SHA1 Message Date
Corey Hulen
f6e8b4f310 Merge pull request #143 from rgarmsen2295/mm-1416
MM-1416 Changed error message when adding a previously deleted channel to be better suited
2015-07-07 23:12:08 -08:00
Corey Hulen
817d9110b3 Merge pull request #137 from nickago/MM-1417
MM-1417 redirected channel name 404's to town square
2015-07-07 23:11:46 -08:00
Joram Wilander
66e97a56b0 Merge pull request #142 from asaadmahmoodspin/master
Minor UI upgrades
2015-07-07 15:51:03 -04:00
Joram Wilander
2be660f05d Merge pull request #139 from hmhealey/makefilegodeps
Change Makefile to look for godep in GOPATH instead of using a relative path
2015-07-07 15:04:21 -04:00
Asaad Mahmood
37fbd62a7c MM-1221 - Fixing scrolling issue in the RHS 2015-07-07 23:35:35 +05:00
Asaad Mahmood
4586767092 Updating background 2015-07-07 22:58:13 +05:00
Asaad Mahmood
69e5898f4b Merge branch 'master' of https://github.com/mattermost/platform 2015-07-07 22:57:57 +05:00
Christopher Speller
4e856c29b2 Merge pull request #138 from hmhealey/mm756
MM-756 Don't mark channels as unread after user joined/left messages
2015-07-07 13:36:05 -04:00
Asaad Mahmood
14f02b770b Merge branch 'master' of https://github.com/mattermost/platform 2015-07-07 20:16:14 +05:00
hmhealey
23e527978e Add a post type for user joined/left messages and don't flag a channel as unread when one of those is automatically posted 2015-07-07 11:00:29 -04:00
Christopher Speller
95b9f87288 Merge pull request #141 from hmhealey/profilepicture32bit
Fix an out of bounds exception when generating profile pictures on 32 bit installations
2015-07-07 08:44:29 -04: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
Reed Garmsen
f839b63496 Added new error message when trying to add a channel that was previously deleted as well as a corresponding unit test 2015-07-06 17:57:36 -07:00
Asaad Mahmood
73cb6904a1 Fixing code error in css 2015-07-07 04:21:20 +05:00
Asaad Mahmood
ab36656830 Fixing before after hover for date/new separator 2015-07-07 04:19:39 +05:00
Asaad Mahmood
98bdaa04f5 Files img files 2015-07-07 04:16:04 +05:00
Asaad Mahmood
047e7145bb Fixing background hovers 2015-07-07 04:13:36 +05:00
hmhealey
122a67c3b4 Explicitly cast to an int64 when selecting a random profile picture colour to prevent overflow on 32-bit installations of Go 2015-07-06 18:08:52 -04:00
Corey Hulen
2a0516f1fd Merge pull request #140 from mattermost/fix-build
fixing build
2015-07-06 14:03:15 -08:00
=Corey Hulen
a84fc7b938 fixing build 2015-07-06 14:02:42 -08: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
hmhealey
48538d82bc Change Makefile to look for godep in GOPATH instead of using a relative path 2015-07-06 17:31:58 -04:00
nickago
1f0b4a39b0 redirected channel name 404's to town square 2015-07-06 13:15:09 -07:00
nickago
83e4d3fb9c Changed socket event to a props based change 2015-07-06 12:37:42 -07:00
Corey Hulen
3dec509899 Merge pull request #131 from mattermost/mm-1391
Fixes mm-1391 adding travis CI
2015-07-06 11:24:06 -08:00
Asaad Mahmood
f51cc73aaf MM-1461 - Updating Mattermost UI 2015-07-06 23:18:23 +05:00
Christopher Speller
10b625ba17 Merge pull request #128 from rgarmsen2295/mm-832
MM-832 Fixed not being able to open channel notifications settings menu in IE10
2015-07-06 12:07:56 -04: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
b819b492bf Merge pull request #127 from rgarmsen2295/mm-1047
MM-1047 Error code 200 IE 10 & 11 suppression within getMeSynchronous method
2015-07-06 07:31:26 -04:00
=Corey Hulen
34fb817a4a Fixing unit tests 2015-07-06 00:50:42 -08:00
=Corey Hulen
cbadc26386 adding debugging 2015-07-06 00:00:34 -08:00
=Corey Hulen
9be9cf8d9d adding debugging 2015-07-05 23:52:07 -08:00
=Corey Hulen
fcbb3d5561 adding debugging 2015-07-05 23:51:07 -08:00
=Corey Hulen
f2db93f111 adding debugging 2015-07-05 23:28:45 -08:00
=Corey Hulen
e26954ef46 adding debugging 2015-07-05 23:19:05 -08:00
=Corey Hulen
b95e053d41 fixing unit test 2015-07-05 10:22:52 -08:00
=Corey Hulen
4af59ee357 fixing unit test 2015-07-05 10:22:07 -08:00
=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