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

904 Коммитов

Автор SHA1 Сообщение Дата
Asaad Mahmood
eab6e1360a UI Improvements for RHS 2015-07-10 22:44:05 +05:00
Joram Wilander
f433da2e5f Merge pull request #156 from asaadmahmoodspin/master
Improving mentions list and other UI improvements
2015-07-10 12:12:03 -04:00
Asaad Mahmood
7d7a50d6b1 MM-1304 - Quick fix for error on welcome sign up page 2015-07-10 20:56:20 +05:00
Asaad Mahmood
14395689ca Merge branch 'master' of https://github.com/mattermost/platform 2015-07-10 20:24:18 +05:00
Joram Wilander
ff128d7c16 Merge pull request #154 from nickago/MM-831
MM-831 Post timestamp now updates in real time
2015-07-10 11:07:54 -04:00
Christopher Speller
ae939cb98d Merge pull request #160 from ralder/fix-pr-150-MM-895
[webui] fix bugs for pr #150 MM-895
2015-07-10 09:08:33 -04:00
Christopher Speller
d254b64159 Merge pull request #152 from faebser/manifest-for-mobile
Manifest for mobile
2015-07-10 08:42:14 -04:00
ralder
34cc2fcd53 fix bugs for pr #150 MM-895 2015-07-10 04:36:16 -07:00
Joram Wilander
704b6766b2 Merge pull request #155 from nickago/MM-1296
MM-1296 Server now notifies users they have been added to a new channel
2015-07-09 23:22:03 -04:00
nickago
fe6f9437ab Added comments for the force update functions 2015-07-09 14:55:29 -07:00
Asaad Mahmood
53d0420e24 Improving mentions list and other UI improvements 2015-07-10 02:38:19 +05:00
nickago
702112dfb3 Placed event listeners on higher level components to avoid app dispatcher vomit 2015-07-09 14:12:37 -07:00
nickago
04b80b6a25 Merge branch 'master' of https://github.com/mattermost/platform into MM-831
merge
2015-07-09 13:44:28 -07:00
Joram Wilander
763618ef36 Merge pull request #151 from asaadmahmoodspin/master
MM-1469 - Loading message in more channel modal
2015-07-09 15:26:20 -04:00
nickago
3371f146f8 Minor formatting change 2015-07-09 12:18:43 -07:00
nickago
b1e2eccaf2 Added curly brace 2015-07-09 12:17:16 -07:00
nickago
44000b58d9 Server now notifies users they have been added to a new channel 2015-07-09 12:05:04 -07:00
nickago
38532013fa Time change ping riding on the status interupt for timestamp update 2015-07-09 10:44:23 -07:00
Asaad Mahmood
23c40243a4 Updating font size and margins for loading animation 2015-07-09 21:20:32 +05:00
Asaad Mahmood
c760e06433 Updating Ui for posts 2015-07-09 21:11:47 +05:00
Asaad Mahmood
b61f653626 Merge branch 'master' of https://github.com/mattermost/platform 2015-07-09 21:00:29 +05:00
Joram Wilander
b6fb6ea3be Merge pull request #145 from ralder/fix-tabIndex-channel_invite_modal
[webui] add missing tabIndex for channel members modal
2015-07-09 09:37:39 -04:00
Fabian Frei
5df0a55a5a remove newline 2015-07-09 11:42:41 +02:00
Fabian Frei
cb2cb1ee42 added link to manifest.json and ios metatags 2015-07-09 11:24:46 +02:00
Fabian Frei
48c22da847 added manifest.json 2015-07-09 11:24:21 +02:00
Christopher Speller
3ad2098926 Merge pull request #149 from rgarmsen2295/mm-1260
MM-1260 Member Invites can no longer be sent to emails already used to signup
2015-07-08 20:24:39 -04:00
Asaad Mahmood
a533ff4d71 MM-1444 - Fixing text selection issue 2015-07-09 02:53:07 +05:00
Joram Wilander
11dde6c44b Merge pull request #150 from mattermost/mm-895
MM-895 Reorganization of browser storage.
2015-07-08 14:47:49 -04:00
Joram Wilander
a65b2a2df5 Merge pull request #146 from nickago/MM-1284
MM-1284 Fixed auto-linking (for good hopefully)
2015-07-08 14:47:32 -04: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
nickago
8256a168a6 Merge branch 'MM-1284' of https://github.com/nickago/platform into MM-1284
merge conflics
2015-07-08 10:33:01 -07:00
nickago
126c2e56e0 Semicolons and a bug fix 2015-07-08 10:32:33 -07:00
nickago
9873ffd05f Changed linkify to autolinker and wrote gap-bridging code 2015-07-08 10:17:56 -07:00
nickago
b891482bce Add ALL the semicolons 2015-07-08 10:16:29 -07:00
Christopher Speller
ce5639a629 Adding comments to change versions in sync 2015-07-08 12:43:23 -04:00
Christopher Speller
d5785ee901 Finishing centralization of BrowserStore 2015-07-08 12:38:14 -04: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
Christopher Speller
7f5ebb42b5 Modifying all storage to use session storage. Also adding an abstraction layer to add current user id as a prefix to most keys. 2015-07-08 09:55:24 -04: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
Reed Garmsen
65dc307e68 Small tweaks and cleanup 2015-07-07 18:12:53 -07:00