Commit Graph

5127 Commits

Author SHA1 Message Date
=Corey Hulen
581785f504 Fixing version 2016-02-02 16:24:03 -08:00
=Corey Hulen
c4c7b9d310 Fixing console 2016-02-02 16:19:15 -08:00
=Corey Hulen
15976cc33d Adding props to admin console 2016-02-02 16:15:04 -08: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
=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
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
Christopher Speller
6a160c8255 Merge pull request #2022 from asaadmahmoodspin/ui-improvements
Improvements to system console
2016-01-29 11:54:22 -05:00
Elias Nahum
6b7438b52f PLT-7: Refactoring frontend (chunk 6)
- Authorize
- Signup Team Confirm
- Footer
2016-01-29 13:50:48 -03:00
Asaad Mahmood
28fe235686 Improvements to system console 2016-01-29 21:11:46 +05:00
Harrison Healey
5c3fefe1a1 Merge pull request #2020 from ZBoxApp/PLT-7-pages2
PLT-7: Refactoring frontend (chunk 5)
2016-01-29 09:35:25 -05:00
Elias Nahum
94a19ae75e PLT-7: Refactoring frontend (chunk 5)
- Signup Team Complete
- Signup User Complete
- Email Verify
2016-01-29 10:47:52 -03:00
Christopher Speller
c4386652ba Merge pull request #2018 from fallenby/PLT-1592
PLT-1592 String changes to make password reset expiry experience more obvious and forgiving
2016-01-29 08:42:25 -05:00
Christopher Speller
2942b91de4 Merge pull request #2016 from mattermost/PLT-1765
PLT-1765 allowing support of 2 previous versions
2016-01-29 08:41:06 -05:00
Christopher Speller
66af7a8337 Merge pull request #2013 from mattermost/plt-1749
PLT-1749 Return channel type in new post websocket events
2016-01-29 08:38:24 -05:00
Christopher Speller
e2238fcd51 Merge pull request #2011 from mattermost/plt-1837
PLT-1837 Remove expiry from public links
2016-01-29 08:37:28 -05:00