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

235 Коммитов

Автор SHA1 Сообщение Дата
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
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
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
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
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
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
14f02b770b Merge branch 'master' of https://github.com/mattermost/platform 2015-07-07 20:16:14 +05: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
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
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
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
Asaad Mahmood
f51cc73aaf MM-1461 - Updating Mattermost UI 2015-07-06 23:18:23 +05: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
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
6b1ae67f2f Added comment for later reference 2015-07-02 18:02:00 -07:00
Reed Garmsen
e51a0461a6 Implemented IE10 & 11 specific error suppression when a 200 status (aka OK) error is thrown 2015-07-02 17:54:00 -07:00
Reed Garmsen
933578ca07 Removed option that does not work 2015-07-02 17:13:01 -07:00
Reed Garmsen
6b48dbe231 Added two possible options for removing blue bar error, will choose one later 2015-07-02 17:13:00 -07:00
Reed Garmsen
5a597c9606 Added line that disables caching with a ajax client call that was causing errors to be thrown in IE10 2015-07-02 17:13:00 -07: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