Commit Graph

3452 Commits

Author SHA1 Message Date
Asaad Mahmood
e104829dcd Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-28 18:04:27 +05:00
Christopher Speller
c6f3361d3c Merge pull request #1210 from mattermost/PLT-25
PLT-25 fixing issues with stats page
2015-10-28 08:34:57 -04:00
Christopher Speller
5322112045 Merge pull request #1187 from mattermost/code-contribution-guidelines-update
Code contribution guidelines update
2015-10-28 08:28:10 -04:00
Joram Wilander
32978e59f9 Merge pull request #1205 from florianorben/fix-relative-time
Dont display '1 minute ago' timestamps for post posted < than 1 minute ago
2015-10-28 08:07:39 -04:00
=Corey Hulen
36308f949d PLT-25 fixing issues with stats page 2015-10-27 22:55:10 -07:00
it33
570b54bbfc Typo fix 2015-10-27 17:29:54 -07:00
it33
5871452ccb Adding "Solution" sections to guide 2015-10-27 17:29:35 -07:00
it33
87514f34bb Update Troubleshooting.md 2015-10-27 17:24:34 -07:00
Florian Orben
c91f4f8ab1 Dont display '1 minute ago' timestamps for post posted < than 1 minute ago 2015-10-28 01:19:57 +01:00
it33
ede80afe4c Update Administration.md 2015-10-27 17:05:20 -07:00
it33
a899b7ef65 Update Troubleshooting.md 2015-10-27 16:59:24 -07:00
it33
078fb4e5c0 Update Outgoing-Webhooks.md 2015-10-27 16:53:30 -07:00
it33
e0ce72b071 Update Outgoing-Webhooks.md 2015-10-27 16:51:31 -07:00
Corey Hulen
e0f69060fa Merge pull request #1190 from mattermost/PLT-25
PLT-25 adding stats to admin console
2015-10-27 11:40:49 -07:00
it33
4dbde3e1d8 Update Troubleshooting.md 2015-10-27 11:02:52 -07:00
=Corey Hulen
399e9c6f4b PLT-25 fixing stats for postgres 2015-10-27 09:55:19 -07:00
it33
95c464b167 Create Administration.md 2015-10-27 08:54:24 -07:00
it33
bfb53fc3e0 Update Troubleshooting.md 2015-10-27 08:50:04 -07:00
it33
b1d4e65ebb Update Troubleshooting.md 2015-10-27 08:48:28 -07:00
Corey Hulen
01c622b9a3 Merge pull request #1195 from mattermost/plt-822
PLT-822 Refactoring post_store into post_store and search_store
2015-10-27 08:22:13 -07:00
Asaad Mahmood
179c4ea684 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-27 20:15:33 +05:00
it33
50eb3d9fe4 Added known issue for deleted channels 2015-10-27 08:05:02 -07:00
it33
34fff89e9d Update Code-Contribution-Guidelines.md 2015-10-27 07:10:32 -07:00
Christopher Speller
3ca8a11a43 Merge pull request #1197 from rgarmsen2295/plt-166
PLT-166 Fixed issue with missing help text for @all and @channel in mention list
2015-10-27 08:49:38 -04:00
Christopher Speller
e92af0daa2 Merge pull request #1184 from girishso/add-trailing-slash
adds trailing slash if missing from Directory in config.json
2015-10-27 08:44:19 -04:00
Christopher Speller
640a7789db Merge pull request #1174 from florianorben/member-popover
Add styling to channel member popover
2015-10-27 08:42:54 -04:00
Christopher Speller
5f42451944 Merge pull request #1154 from girishso/username_symbols
auto-link mentions with user names having symbols
2015-10-27 08:40:49 -04:00
Girish S
9de0ceb229 auto-link mentions with user names having symbols
this also handles the case where user_name having '_'
2015-10-27 18:02:07 +05:30
Girish S
bfa23b0075 adds trailing slash if missing from Directory in config.json
does it only if "DriverName" == model.IMAGE_DRIVER_LOCAL, not sure if required for other
drivers too
2015-10-27 16:48:54 +05:30
=Corey Hulen
d53de84214 Fixing postgres 2015-10-26 22:46:19 -07:00
=Corey Hulen
834e1a8b58 adding arrow notation 2015-10-26 22:13:40 -07:00
=Corey Hulen
aec99ceb9d Merge branch 'master' into PLT-25 2015-10-26 22:11:42 -07:00
Corey Hulen
28847c6b4b Merge pull request #1194 from mattermost/webhook-request
Parse incoming webhook requests into model instead of string map
2015-10-26 22:06:49 -07:00
Corey Hulen
2b198a8cfc Merge pull request #1178 from mattermost/update-web-socket-help
Update web socket help
2015-10-26 22:04:53 -07:00
it33
118b7f50d2 Update Troubleshooting.md 2015-10-26 17:22:36 -07:00
Reed Garmsen
ae3e600c7d Fixed issue with missing help text for @all and @channel in mention list 2015-10-26 17:11:35 -07:00
it33
fd74c3177d Fixing link 2015-10-26 16:57:05 -07:00
Florian Orben
bced07a7f4 add helper method to initiate a direct channel chat 2015-10-26 23:30:00 +01:00
Florian Orben
2008a20d9d use 'Overlay' instead if 'OverlayTrigger' 2015-10-26 23:30:00 +01:00
Florian Orben
c753eacad0 Add some to channel member popover 2015-10-26 23:30:00 +01:00
it33
1bb4077215 Update README.md 2015-10-26 14:30:24 -07:00
Christopher Speller
ee0c732396 Merge pull request #1192 from mattermost/PLT-828
PLT-828 fixing db upgrade code
2015-10-26 16:07:46 -04:00
Christopher Speller
bf555fae14 Refactoring post_store into post_store and search_store 2015-10-26 15:45:52 -04:00
Corey Hulen
942c9317f4 Merge pull request #1164 from hmhealey/plt778
PLT-778 Changed post searching to allow searching by multiple users/channels
2015-10-26 12:12:18 -07:00
JoramWilander
12399dd43c Remove unused iconemoji field 2015-10-26 15:11:06 -04:00
JoramWilander
c94388042b Parse incoming webhook requsets into model instead of string map 2015-10-26 15:10:17 -04:00
Corey Hulen
86e3764cbd Merge pull request #1193 from hmhealey/plt798
PLT-798 Prevent image files larger than 4k resolution from being uploaded
2015-10-26 12:10:10 -07:00
it33
6651844801 Update CONTRIBUTING.md 2015-10-26 12:03:50 -07:00
it33
bbeda9b0e7 Update CONTRIBUTING.md 2015-10-26 12:03:16 -07:00
it33
733fc9e2b1 Update CONTRIBUTING.md 2015-10-26 12:02:01 -07:00