Граф коммитов

5419 Коммитов

Автор SHA1 Сообщение Дата
it33
3ef0f5ad37 Update README.md 2016-02-17 18:18:50 -08: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
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
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
Elias Nahum
9868431e3e Update loc strings 2016-02-12 17:43:04 -03:00
JoramWilander
c861a24d48 Fix badge and tab */(1) not disappearing until switching away from channel 2016-02-12 14:23:12 -05:00
Christopher Speller
45dfd516aa Merge pull request #2152 from asaadmahmoodspin/ui-fixes
Multiple UI Improvements
2016-02-12 14:19:11 -05:00
Asaad Mahmood
37a999ebaf Adding import instead of require for fastclick 2016-02-12 23:06:51 +05:00
JoramWilander
4e8da24777 Fix load more messages being broken by getPostsSince call 2016-02-12 10:58:58 -05:00
Asaad Mahmood
7bea418a65 Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes 2016-02-12 20:19:07 +05:00
Christopher Speller
6cb4f82ee5 Updating dockerfile for v2.0.0-rc2 2016-02-12 08:16:52 -05:00
Christopher Speller
0807fe5b05 Merge pull request #2157 from mattermost/ie-cache-fix
Fixing IE expire issue
2016-02-12 08:06:41 -05:00
Tatsuya Niwa
9bf8734bd1 add translated messages to es.json. 2016-02-12 10:12:24 +09:00
Tatsuya Niwa
6759699016 delete not translated messages in es.json 2016-02-12 10:09:08 +09:00
Christopher Speller
3f50aa4734 Merge pull request #2158 from mattermost/fix-socket-loc
Fixing so the loc tool can use these
2016-02-11 18:54:33 -05:00
Christopher Speller
d538aa4a5f Merge pull request #2155 from ZBoxApp/PLT-1948
PLT-1948: Fix duplicate am/pm on last password update
2016-02-11 18:51:20 -05:00
=Corey Hulen
4419fe140d Fixing so the loc tool can use these 2016-02-11 13:24:56 -08:00
=Corey Hulen
35e3b8c40f Fixing IE expire issue 2016-02-11 13:17:27 -08:00
Elias Nahum
ae8c67365d eslint no-shadow resolved 2016-02-11 16:46:46 -03:00
Christopher Speller
ab1f5acf4d Merge pull request #2150 from ZBoxApp/PLT-1963
PLT-1963: Fixing intl console error on Outgoing webhook edit
2016-02-11 14:31:23 -05:00
Elias Nahum
b0252c9aa9 Fix duplicate am/pm on last password update 2016-02-11 16:29:52 -03:00
Christopher Speller
7d207ec8a6 Merge pull request #2154 from mattermost/plt-1933
RC2 PLT-1933 Emit change after setting preferences in head.html
2016-02-11 14:29:04 -05:00
Christopher Speller
d29abb8f86 Merge pull request #2153 from mattermost/plt-1939
RC2 PLT-1939 Fix localization error for team invites
2016-02-11 14:18:20 -05:00
JoramWilander
32cca5c31e Emit change after setting preferences in head.html 2016-02-11 14:06:11 -05:00
JoramWilander
b35146e9b8 Fix localization error for team invites 2016-02-11 13:47:32 -05:00
Christopher Speller
395d51dda6 Merge pull request #2145 from mattermost/PLT-1956
PLT-1956 Infinite "Loading..." Animation for Webhooks/Slash Commands UI
2016-02-11 13:46:15 -05:00
Christopher Speller
50104a1aa8 Merge pull request #2148 from mattermost/missing-posts-2.0
RC2 PLT-1774 Fixing the elusive missing post bug
2016-02-11 13:45:52 -05:00