Corey Hulen
d16a1d6d75
Merge pull request #171 from mattermost/mm-1415
...
Fixes mm-1415 adding email bypass flag
2015-07-15 10:27:24 -08:00
=Corey Hulen
e017babc5d
fixing merge
2015-07-15 10:22:05 -08:00
Corey Hulen
38f9e140e9
Merge pull request #191 from asaadmahmoodspin/master
...
Minor UI changes
2015-07-15 09:54:44 -08:00
Corey Hulen
301127f575
Merge pull request #181 from hmhealey/mm1494
...
MM-1494 Change image resizing for preview and thumbnail to use Lanczos interpolation
2015-07-15 09:53:41 -08:00
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
Corey Hulen
593556d30d
Merge pull request #153 from nickago/MM-1460
...
MM-1460 Updated database schema for emoji compatibility
2015-07-15 09:52:46 -08:00
Asaad Mahmood
42a213c54d
Minor UI changes
2015-07-15 22:32:08 +05:00
nickago
c1e23faab7
Changed scope of 'metatdata'
2015-07-15 09:13:34 -07:00
Christopher Speller
31e9c6ae49
Merge pull request #189 from nickago/MM-1591
...
MM-1591 Fixed typo, returned password flow to standard model
2015-07-15 12:10:23 -04:00
nickago
46e076529a
Fixed typo, returned password flow to standard model
2015-07-15 08:45:17 -07:00
=Corey Hulen
246d12aaf2
fixes mm-1348 removing dependency on redis
2015-07-14 15:12:04 -08:00
nickago
cb2bff28ee
Team admin can now delete any post
2015-07-14 13:09:14 -07:00
nickago
fa4ac0c789
Fixed minor typo
2015-07-14 12:08:00 -07:00
nickago
9f816e2554
Need you GDev key for youtube stuff
2015-07-14 11:55:49 -07:00
Joram Wilander
a45dea6b06
Merge pull request #182 from mattermost/revert-174-MM-831-3
...
Revert "MM-831 Time change ping riding on the status interupt for tim…
2015-07-14 12:07:27 -04:00
hmhealey
7ff57181b9
Changed image resizing for both the preview and thumbnail to use Lanczos interpolation instead of simple nearest neighbour
2015-07-14 11:48:53 -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
Joram Wilander
cce492977b
Merge pull request #178 from asaadmahmoodspin/master
...
mm-1302 - Adding profile pick in LHS Header
2015-07-14 10:49:37 -04: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
it33
b31327f072
Updating README_DEV.md with corrected forum links
2015-07-13 23:40:40 -07: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
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
