Commit Graph

865 Commits

Author SHA1 Message Date
Asaad Mahmood
a533ff4d71 MM-1444 - Fixing text selection issue 2015-07-09 02:53:07 +05:00
Asaad Mahmood
de742baac0 MM-1469 - Loading message in more channel modal 2015-07-08 23:08:06 +05:00
Asaad Mahmood
235beeb829 Merge branch 'master' of https://github.com/asaadmahmoodspin/platform 2015-07-08 22:40:28 +05:00
asaadmahmoodspin
c721a3deac Merge pull request #1 from rgarmsen2295/mm-1469
MM-1469 Added loading animation logic to the "Get More Channels Menu" ("More...")
2015-07-08 22:39:44 +05:00
Corey Hulen
689692b22d Merge pull request #130 from hmhealey/staticjs
MM-1427 Copied required Javascript libraries and resources into repository
2015-07-08 07:54:49 -08:00
it33
30e90a2155 Corrected release numbering in README.md 2015-07-08 07:02:07 -07:00
hmhealey
9da9f62f44 Use correctly minified and unminified js libraries for JQuery, Bootstrap, and Perfect Scrollbar 2015-07-08 09:28:58 -04:00
hmhealey
66e2ff0ae3 Copied Bootstrap, jQuery and React libraries and resources into repository 2015-07-08 09:15:10 -04:00
hmhealey
cafae64a90 Moved minified javascript out of min directory 2015-07-08 09:15:10 -04:00
Joram Wilander
3012a7f532 Merge pull request #136 from mattermost/code-review
team code review
2015-07-08 09:07:47 -04: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
Corey Hulen
85b895ecb7 Merge pull request #147 from rgarmsen2295/mm-934
MM-934 Users can no longer "click n' drag" text boxes to resize them
2015-07-07 23:13:43 -08:00
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
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
Joram Wilander
66e97a56b0 Merge pull request #142 from asaadmahmoodspin/master
Minor UI upgrades
2015-07-07 15:51:03 -04: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
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
Reed Garmsen
7102530def Prevent text areas from being resizeable 2015-07-07 11:56:55 -07: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
=Corey Hulen
e3ab0a4e3d team code review 2015-07-06 11:20:40 -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