Reed Garmsen
eeb1c1b5b8
Properly disable the get team link functionality when user creation is disabled
2016-02-02 12:09:44 -08:00
Reed Garmsen
70e0618f62
Fixed React invalid prop warning in Team Settings
2016-02-02 12:09:02 -08:00
Reed Garmsen
b013f02209
Added ability to sign in via username; separated email sign in and sign up config settings
2016-02-02 12:07:42 -08:00
Reed Garmsen
92816619cc
Changed clock icon in repeat posts to simple timestamp
2016-02-02 11:54:01 -08:00
Reed Garmsen
fe39f2400f
Removed css clock from sub-posts
2016-02-02 10:58:35 -08:00
hmhealey
7587689735
Updated post help link
2016-02-02 12:51:40 -05:00
=Corey Hulen
4c6c94d47c
Fixing unit test
2016-02-02 08:46:43 -08:00
=Corey Hulen
ff54da2e4a
Adding loc to front-end
2016-02-02 08:42:36 -08:00
JoramWilander
9517690577
Remove missing ES translations
2016-02-02 08:49:50 -05:00
JoramWilander
3d03bdf2f1
Added extra system-wide statistics for EE
2016-02-02 08:41:02 -05:00
Christopher Speller
320fe1c392
EE Fixes
2016-02-02 08:31:37 -05:00
Khoa, Le Ngoc
4d70e1246b
Fixed Eslint validation.
2016-02-02 16:29:14 +07:00
Khoa, Le Ngoc
4827453232
Added help text indicating valid email required when user sign up from link.
2016-02-02 16:04:25 +07:00
=Corey Hulen
8e8fa97e6b
Switching defaults
2016-02-01 18:58:57 -08:00
=Corey Hulen
27586a320a
Adding loc to new command backend
2016-02-01 18:52:43 -08:00
=Corey Hulen
b4ec690051
Fixing merge
2016-02-01 14:44:17 -08:00
Corey Hulen
f28486c455
Merge pull request #2042 from ZBoxApp/PLT-7-sidebar-right
...
PLT-7: Refactoring frontend (chunk 9)
2016-02-01 13:37:54 -08:00
Elias Nahum
e7f409a3c7
fix hour12 React warning for FormattedDate
2016-02-01 17:52:43 -03:00
Joram Wilander
a772b06e87
Merge pull request #2043 from mattermost/upgrade-babel-eslint
...
Removed escope and upgraded babel-eslint
2016-02-01 15:45:59 -05:00
JoramWilander
bba4b767c5
Removed escope and upgraded babel-eslint
2016-02-01 15:36:04 -05:00
Elias Nahum
3f91bc2df2
PLT-7: Refactoring frontend (chunk 9)
...
- sidebar right & rhs
2016-02-01 17:23:45 -03:00
Harrison Healey
9fe4c0603e
Merge pull request #2040 from mattermost/fix-email
...
Fixing email unit tests
2016-02-01 14:46:46 -05:00
=Corey Hulen
baa2927ab6
Merge branch 'master' into fix-email
2016-02-01 11:14:43 -08:00
Christopher Speller
bf69acefc4
Merge pull request #2041 from mattermost/temp-babel-eslint-fix
...
Temporary fix for babel-eslint
2016-02-01 14:13:11 -05:00
JoramWilander
3442c783c9
Temporary fix for babel-eslint
2016-02-01 13:49:55 -05:00
=Corey Hulen
2487d561cd
Merge branch 'master' into fix-email
2016-02-01 08:44:50 -08:00
Corey Hulen
1543be8a06
Merge pull request #2037 from mattermost/plt-1862
...
PLT-1862 Fix console errors
2016-02-01 08:36:09 -08:00
=Corey Hulen
1006e99859
Fixing email unit tests
2016-02-01 08:35:08 -08:00
Joram Wilander
a6d2c2c2d9
Merge pull request #2039 from asaadmahmoodspin/ui-improvements
...
Fixing system console and changing swapping icon with reply icon
2016-02-01 09:54:04 -05:00
Joram Wilander
caf957312b
Merge pull request #2038 from ZBoxApp/PLT-7-sidebar
...
PLT-7: Refactoring frontend (chunk 8)
2016-02-01 09:52:01 -05:00
Asaad Mahmood
4abe6037bb
Fixing system console and changing swapping icon with reply icon
2016-02-01 19:37:07 +05:00
Elias Nahum
a6102e27d4
PLT-7: Refactoring frontend (chunk 8)
...
- Sidebar and related components
- Small Tweak to demotion and add msg for terminal cmd
2016-02-01 11:25:07 -03:00
Christopher Speller
4a214cdaa2
Merge pull request #2029 from ZBoxApp/PLT-7-user
...
PLT-7: Refactoring frontend (chunk 7)
2016-02-01 08:58:16 -05:00
Christopher Speller
681134912c
Merge pull request #1966 from ttyniwa/feature/warning_when_demote_own_role_from_system_admin
...
PLT-588 Add a warning when a user demotes themselves from System Admi…
2016-02-01 08:55:50 -05:00
JoramWilander
12efe8675e
Fix console errors
2016-02-01 08:01:49 -05:00
Corey Hulen
0b022b130a
Merge pull request #2031 from mattermost/Typos-and-tweaks
...
occured > occurred
2016-01-31 21:12:35 -08:00
it33
90b65b593f
occured > occurred
2016-01-31 09:06:30 -08:00
Elias Nahum
5be57bc970
PLT-7: Refactoring frontend (chunk 7)
...
- Elegant way to include react Component into FormattedMessage
2016-01-31 12:23:16 -03:00
Elias Nahum
78314c7d4d
PLT-7: Refactoring frontend (chunk 6)
...
- User settings
2016-01-30 18:10:04 -03:00
Alan Mooiman
ad64f315f3
Adjustments to makefile
...
Compass will compile on first run (instead of having to make a change to a sass file)
Stop command won't kill virtualbox processes that are also named "mattermost". If we're going to wildcard kill processes, let's not go overboard.
2016-01-29 15:02:05 -08:00
Christopher Speller
7ff7c86461
Merge pull request #2023 from ZBoxApp/PLT-7-templates
...
PLT-7: Refactoring frontend (chunk 6)
2016-01-29 14:52:08 -05:00
Tatsuya Niwa
8b2fb86c3a
fix text localization.
2016-01-30 02:28:38 +09:00
Tatsuya Niwa
ae2201b304
fix ESLint warnings.
2016-01-30 02:28:38 +09:00
Tatsuya Niwa
c1b38e7119
fix role bug.
...
add redirect after demote own role.
2016-01-30 02:28:38 +09:00
Tatsuya Niwa
1b804d563d
fix ESLint warnings.
2016-01-30 02:28:38 +09:00
Tatsuya Niwa
d8c4705bba
delete DemoteOwnRoleModal
2016-01-30 02:28:38 +09:00
Tatsuya Niwa
27f7b9d121
fix ESLint warnings.
2016-01-30 02:28:38 +09:00
Tatsuya Niwa
fecb587018
fix ESLint warnings.
2016-01-30 02:28:38 +09:00
Tatsuya Niwa
3d5bf17349
PLT-588 Add a warning when a user demotes themselves from System Admin to another role.
2016-01-30 02:28:38 +09:00
Elias Nahum
edc0e38687
Remove author
2016-01-29 13:56:33 -03:00