Corey Hulen
ed06e7fbbc
Merge pull request #176 from nickago/MM-1400
...
MM-1400 Add processing for message-less image posts w/ pluralization
2015-07-15 09:53:26 -08:00
nickago
46e076529a
Fixed typo, returned password flow to standard model
2015-07-15 08:45:17 -07:00
nickago
fa4ac0c789
Fixed minor typo
2015-07-14 12:08:00 -07:00
Joram Wilander
d9afa47ef8
Revert "MM-831 Time change ping riding on the status interupt for timestamp update"
2015-07-14 08:07:01 -04:00
Joram Wilander
1f1ad8234a
Merge pull request #174 from nickago/MM-831-3
...
MM-831 Time change ping riding on the status interupt for timestamp update
2015-07-14 10:55:37 -04:00
nickago
634df1c624
Added semicolons
2015-07-14 07:54:09 -07:00
Joram Wilander
2e4b61ef38
Merge pull request #167 from rgarmsen2295/mm-629
...
MM-629 Empty messages with files attached now include text in the desktop notification describing the contents
2015-07-14 10:51:20 -04:00
Joram Wilander
1ba12b0ccf
Merge pull request #168 from ralder/fix-loading-screen-for-ie
...
[webui] fix loading animation for ie
2015-07-14 10:49:51 -04:00
Asaad Mahmood
d1cb7d35fb
mm-1302 - Adding profile pick in LHS Header
2015-07-14 03:26:04 +05:00
nickago
3d56d9b241
Add processing for messageless image posts w/ pluralization
2015-07-13 14:56:54 -07:00
Asaad Mahmood
0a166572c1
Merge branch 'MM-1302' of https://github.com/nickago/platform into mm-1302
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-07-14 02:30:55 +05: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
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
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
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
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
2a1cdc68c8
Better logic for checking if channel has loaded
2015-07-10 11:48:52 -07: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
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
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
Reed Garmsen
7f0d070bf1
Added performance comment
2015-07-09 17:59:13 -07:00
Reed Garmsen
56f369cfd1
Use the AsyncClient call 'updateLastViewedAt' as a way of checking for inet connectivity immediately after clearning yellow bar after user has typed 5 characters
2015-07-09 17:49:02 -07:00
Reed Garmsen
80f9ebadef
Added errorchange listener to textbox that detects if inet is not connected. Still do not have reliable way of checking if inet has reconnected
2015-07-09 16:41:33 -07:00
Reed Garmsen
212a0da5f4
Removed extraneous console.log functions
2015-07-09 16:26:53 -07:00
Reed Garmsen
95a1540dff
Leave result of _getMoreChannels unitialized if it does not yet exist in browser storage to know when list of more channels is loading vs when its empty
2015-07-09 16:25:57 -07:00
Reed Garmsen
ceb243fbb2
The options to change member roles are now links so that they have the 'click' mouse hand when hovered over
2015-07-09 16:04:13 -07: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
