Commit Graph

5444 Commits

Author SHA1 Message Date
=Corey Hulen
a0959acf87 Merge branch 'ui-improvements' of https://github.com/asaadmahmoodspin/platform into asaadmahmoodspin-ui-improvements 2016-02-22 07:22:52 -08:00
Joram Wilander
51680a7cd8 Merge pull request #2204 from kernicPanel/PLT-1880
PLT-1800 Replace webhooks documentation URL
2016-02-22 08:49:23 -05:00
Christopher Speller
040bff2b9f Merge pull request #2199 from rgarmsen2295/plt-1688
PLT-1688 Fixed issue with corrupted custom mentions on username change
2016-02-22 08:39:49 -05:00
it33
b55a0ae034 Formatting tweaks to README 2016-02-21 11:14:46 -08:00
it33
033f8385a2 Re-organized README 2016-02-21 10:54:56 -08:00
Nicolas Clerc
0986057c64 PLT-1800 Replace webhooks documentation URL 2016-02-21 13:53:27 +01:00
Reed Garmsen
5d4b18605a Fixed issue with corrupted custom mentions on username change 2016-02-19 13:17:49 -08:00
it33
3c0540653f Merge pull request #2198 from timlyo/patch-1
Fixed dead link
2016-02-19 15:21:35 -05:00
Tim
0112033302 Fixed dead link 2016-02-19 19:54:52 +00:00
Joram Wilander
8d807867ac Merge pull request #2191 from hmhealey/plt1256
PLT-1256 Ported PostDeletedModal to React-Bootstrap
2016-02-18 17:34:52 -05:00
Joram Wilander
6e4c0ddef6 Merge pull request #2192 from rgarmsen2295/plt-1622
PLT-1622 Removed ability to copy a permalink on mobile
2016-02-18 17:34:06 -05:00
Joram Wilander
3c5744f0d6 Merge pull request #2193 from rgarmsen2295/plt-1858
PLT-1858 Fixed content security policy header
2016-02-18 17:33:35 -05:00
Reed Garmsen
b10f6877a0 Fixed content security policy header 2016-02-18 12:52:47 -08:00
Reed Garmsen
6cc67e58f2 Removed ability to copy a permalink on mobile 2016-02-18 11:30:12 -08:00
hmhealey
2b20c3510f Ported PostDeletedModal to React-Bootstrap 2016-02-18 10:31:44 -05:00
Harrison Healey
daa06ad41e Merge pull request #2189 from mattermost/plt-2042
PLT-2042 Moving /loadtest url tests to /tests and removing /doc folder.
2016-02-18 10:07:56 -05:00
Christopher Speller
a7fae6e62f Moving tests to /tests and removing /doc folder. Docs are now in seperate repository 2016-02-18 09:25:10 -05:00
Christopher Speller
8b9ff64881 Merge pull request #2188 from ZBoxApp/missing-locs-es
Added missing spanish translations
2016-02-18 09:04:38 -05:00
Elias Nahum
ae6c8998d7 Added missing spanish translations 2016-02-18 09:28:11 -03:00
Corey Hulen
9f1e7b826e Merge pull request #2183 from mattermost/file-upload-fix
Fix loc error with cancelling in progress uploads
2016-02-17 22:47:53 -05:00
Christopher Speller
344f2d2d98 Merge pull request #2181 from mattermost/plt-1707
PLT-1707 Added help text to sso switching and removed redundant divs
2016-02-17 22:25:30 -05:00
it33
3ef0f5ad37 Update README.md 2016-02-17 18:18:50 -08:00
JoramWilander
ccf897c7ee Fix loc error with cancelling in progress uploads 2016-02-17 14:32:25 -05:00
Corey Hulen
1673166ff8 Merge pull request #2182 from rgarmsen2295/plt-1515
PLT-1515 Changed wording in the password change email to be consistent
2016-02-17 14:04:12 -05:00
Corey Hulen
2dc4d35082 Merge pull request #2180 from hmhealey/plt1422
PLT-1422 Added restart-server target to Makefile
2016-02-17 14:02:20 -05:00
Reed Garmsen
a14b623fbf Changed wording of password change email to be more generalized 2016-02-17 08:34:52 -08:00
JoramWilander
e3ab89e1c4 Added help text to sso switching and removed redundant divs 2016-02-17 10:32:22 -05:00
Corey Hulen
65c036d23a Merge pull request #2179 from mattermost/fix-droid
Fixing JS bug with droid
2016-02-17 10:23:25 -05:00
Harrison Healey
def523b611 Merge pull request #2176 from rgarmsen2295/plt-1870
PLT-1870 Added license audit parsing to the audit table
2016-02-17 10:17:22 -05:00
hmhealey
1f989c8728 Added restart-server target to Makefile 2016-02-17 10:14:29 -05:00
=Corey Hulen
4b07624f11 Fixing JS bug with droid 2016-02-17 09:59:55 -05:00
Reed Garmsen
6bc1e3c5ca Added license audit parsing to audit table 2016-02-16 09:16:40 -08:00
Joram Wilander
6ffcfaa2f3 Merge pull request #2171 from asaadmahmoodspin/ui-fixes
Multiple UI Improvements
2016-02-16 08:19:19 -05:00
Asaad Mahmood
44fa72066b Other minor improvements 2016-02-15 23:23:07 +05:00
Asaad Mahmood
22aa2c8c07 Fixing custom theme header click event 2016-02-15 20:25:28 +05:00
Asaad Mahmood
522ff67c63 Multiple UI Improvements 2016-02-15 19:37:06 +05:00
Corey Hulen
2ec3762fb2 Merge pull request #2146 from ttyniwa/feature/PLT-1908
PLT-1908 Add a warning when demoting yourself from System Administrator from the team Manage Members menu
2016-02-14 07:55:45 -08:00
Corey Hulen
6ef0be3cf2 Merge pull request #2168 from ZBoxApp/permalink-spanish
RHS spanish translations for permalink
2016-02-14 07:54:53 -08:00
Corey Hulen
63e1676adb Merge pull request #2165 from ZBoxApp/update-locs
Update loc strings
2016-02-14 07:54:36 -08:00
Elias Nahum
68f28668c0 RHS spanish translations for permalink 2016-02-14 11:35:52 -03:00
Joram Wilander
89f7e8cf2f Merge pull request #2123 from hmhealey/plt1711
PLT-1711 Prevent the admin console from switching to a team that is being remo…
2016-02-14 08:24:09 -05:00
Joram Wilander
54cba38f3b Merge pull request #2138 from rgarmsen2295/plt-1672
PLT-1672 Added permalink feature to posts in the RHS
2016-02-14 08:22:47 -05:00
Christopher Speller
958b588448 Merge branch 'release-2.0' 2016-02-13 11:03:10 -05:00
Christopher Speller
c71c5cef63 Merge pull request #2161 from mattermost/load-more-fix
RC3 Fix load more messages being broken by getPostsSince call
v2.0.0
2016-02-13 10:30:50 -05:00
Christopher Speller
4721e5cd2b Merge pull request #2164 from mattermost/unread-tab-fix
RC3 Fix badge and tab */(1) not disappearing until switching away from channel
2016-02-13 10:30:37 -05:00
Christopher Speller
902ee88570 Merge pull request #2166 from mattermost/esethna-patch-1
Update Changelog.md with more known issues
2016-02-13 10:30:26 -05:00
Christopher Speller
0155afe044 Merge pull request #2167 from mattermost/gitlab-sso-fix
RC3 Make sure the GitLab user has the required fields
2016-02-13 10:30:17 -05:00
JoramWilander
6e9bc1ef8f Make sure the GitLab user has the required fields 2016-02-12 23:44:29 -05:00
Eric Sethna
4f30def994 Update Changelog.md with more known issues
Add known issues found in testing
2016-02-12 14:58:36 -08:00
Reed Garmsen
081d5c22c7 Added permalink feature to posts in the RHS 2016-02-12 13:06:45 -08:00