ralder
|
6e5126ba1d
|
fix incorrect call for AsyncClient.dispatchError
|
2015-07-13 13:53:59 -07:00 |
|
Reed Garmsen
|
f406beca8b
|
If a message has no text but has an attached image or file the desktop notification now says uploaded an image or uploaded a file respectively (if both, defaults to image)
|
2015-07-13 13:16:45 -07:00 |
|
Christopher Speller
|
e38ea318a1
|
Merge pull request #158 from nickago/MM-975
MM-975 Added timestamps to pictures to stop caching
|
2015-07-13 14:36:27 -04:00 |
|
nickago
|
8595b915af
|
Fixed 'this' typo and added semicolon
|
2015-07-13 11:24:39 -07:00 |
|
Corey Hulen
|
d2602f540c
|
Merge pull request #166 from rgarmsen2295/mm-1526
MM-1526 Desktop notifications no longer render carriage returns
|
2015-07-13 08:42:32 -08:00 |
|
nickago
|
aff43f43f8
|
removed testing state
|
2015-07-13 09:27:30 -07:00 |
|
nickago
|
c485dad84f
|
Added update function to image update and fixed corner cases
|
2015-07-13 09:22:42 -07:00 |
|
Christopher Speller
|
6447af758c
|
Merge pull request #163 from ralder/fix-and-refactor-browser-store
[webui] second bugfix for pr #150 and refactor BrowserStore
|
2015-07-13 12:07:50 -04:00 |
|
nickago
|
f5d188e1ca
|
Added async get to channel swap
|
2015-07-13 08:58:52 -07:00 |
|
nickago
|
7d6d9c297f
|
Added User update function
|
2015-07-13 08:58:52 -07:00 |
|
nickago
|
c3aed62031
|
Added timestamps to pictures to stop caching
|
2015-07-13 08:58:51 -07:00 |
|
nickago
|
614992dcb7
|
Added timestamp updates to right side and cleaned code
|
2015-07-13 08:34:34 -07:00 |
|
nickago
|
b63d42c2c6
|
merge conflicts
|
2015-07-13 07:23:45 -07:00 |
|
JoramWilander
|
b26bc73c78
|
should fix scrolling on forceupdate
|
2015-07-13 08:32:25 -04:00 |
|
Joram Wilander
|
6cc8788193
|
Merge pull request #164 from ralder/fix-mentions-list-height-in-right-sidebar
[webui] fix incorrect height for mentions list for reply and edit textbox
|
2015-07-13 07:41:25 -04:00 |
|
=Corey Hulen
|
252d0f3924
|
Fixes mm-1415 adding email bypass flag
|
2015-07-12 23:36:52 -08:00 |
|
=Corey Hulen
|
e87adce4a0
|
merging
|
2015-07-12 19:30:25 -08:00 |
|
=Corey Hulen
|
af63080c0d
|
minor tweaks to make sure mysql still runs
|
2015-07-12 19:28:58 -08:00 |
|
=Corey Hulen
|
34d56294a2
|
Patching remainder of the sql stmts to work with postgres
|
2015-07-12 19:28:58 -08:00 |
|
=Corey Hulen
|
ff21a5c75f
|
Fixes mm-1420 adding postgres support
|
2015-07-12 19:24:48 -08:00 |
|
=Corey Hulen
|
443a386f77
|
minor tweaks to make sure mysql still runs
|
2015-07-12 19:12:23 -08:00 |
|
=Corey Hulen
|
cf11d387ee
|
Patching remainder of the sql stmts to work with postgres
|
2015-07-12 18:19:03 -08:00 |
|
=Corey Hulen
|
1c49331785
|
Fixes mm-1420 adding postgres support
|
2015-07-12 14:56:44 -08:00 |
|
ralder
|
4cc9bfce5c
|
[webui] fix loading animation for ie
|
2015-07-11 12:17:55 -07:00 |
|
Reed Garmsen
|
dcea1de006
|
Changed parser for desktop notifications to replace returns with a single space.
|
2015-07-10 17:32:13 -07:00 |
|
Reed Garmsen
|
46d3515fad
|
Changes to notifcation carriage return parsing
|
2015-07-10 17:07:01 -07:00 |
|
Joram Wilander
|
27cab0f507
|
Merge pull request #165 from mattermost/revert-154-MM-831
Revert "MM-831 Post timestamp now updates in real time"
|
2015-07-10 17:49:23 -04:00 |
|
ralder
|
e79ade46b2
|
[webui] fix incorrect height for mentions list for reply textbox
|
2015-07-10 14:12:05 -07:00 |
|
ralder
|
6a559febc2
|
fix BrowserStore bug in actionOnItemsWithPrefix and refactor BrowserStore
|
2015-07-10 12:38:16 -07:00 |
|
Corey Hulen
|
5bb2acc996
|
Merge pull request #159 from rgarmsen2295/mm-1269b
MM-1269b Added yellow tinge to post and comment textbox when connection is disrupted
|
2015-07-10 11:26:35 -08:00 |
|
Corey Hulen
|
d124b9df10
|
Merge pull request #157 from rgarmsen2295/mm-1265
MM-1265 Button to change roles now shows "click" mouse ptr when hovered over & change with loading more channels
|
2015-07-10 11:24:31 -08:00 |
|
Reed Garmsen
|
6f043c5b74
|
Final change to code affected by change to loading more channels logic
|
2015-07-10 11:54:36 -07:00 |
|
Reed Garmsen
|
2977467774
|
Removed test code
|
2015-07-10 11:49:28 -07:00 |
|
Reed Garmsen
|
2a1cdc68c8
|
Better logic for checking if channel has loaded
|
2015-07-10 11:48:52 -07:00 |
|
Joram Wilander
|
947da5d287
|
Merge pull request #162 from asaadmahmoodspin/master
UI Improvements for RHS
|
2015-07-10 13:56:36 -04:00 |
|
Joram Wilander
|
78cc36fa9a
|
Revert "MM-831 Post timestamp now updates in real time"
|
2015-07-10 13:49:15 -04:00 |
|
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 |
|
Reed Garmsen
|
184eac99dd
|
Removed extraneous setState
|
2015-07-10 08:40:38 -07:00 |
|
Reed Garmsen
|
d2e046a98c
|
Changed spacing model of connection flag & removed unnecessary duplication of logic
|
2015-07-10 08:39:37 -07: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 |
|
Reed Garmsen
|
b4b0e92fd4
|
Moved check for existing timer interrupt outside of if-else block for sanity
|
2015-07-09 18:23:14 -07:00 |
|
Reed Garmsen
|
582c94cee9
|
Removed newline
|
2015-07-09 18:18:59 -07:00 |
|
Reed Garmsen
|
eb99363169
|
Changed method again this time to a timer based system so that when inet does come back the yellow tinge goes away automatically not on user input
|
2015-07-09 18:17:40 -07:00 |
|