=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 |
|
Joram Wilander
|
1009e9f745
|
Merge pull request #2015 from ZBoxApp/PLT-7-pages
PLT-7: Refactoring frontend (chunk 4)
|
2016-01-29 08:24:35 -05:00 |
|
Frank Allenby
|
ca95adc41f
|
Revised PLT-1592
|
2016-01-29 10:39:07 +02:00 |
|
Frank Allenby
|
e7be676969
|
Completed PLT-1592
|
2016-01-29 10:32:11 +02:00 |
|
Elias Nahum
|
baa499d97b
|
Removed duplicates Messaging md files from doc folder
|
2016-01-28 18:56:07 -03:00 |
|
Elias Nahum
|
e88156ea24
|
Fix docs route to include the user locale
- Move Messaging_{locale}.md files to static/help
|
2016-01-28 17:14:11 -03:00 |
|
Joram Wilander
|
761488b745
|
Merge pull request #2014 from asaadmahmoodspin/ui-improvements
Adding reply icon
|
2016-01-28 14:46:43 -05:00 |
|
Elias Nahum
|
53e495cf33
|
PLT-7: Refactoring frontend (chunk 4)
|
2016-01-28 16:16:39 -03:00 |
|
Asaad Mahmood
|
ce2ec34e58
|
Adding reply icon
|
2016-01-29 00:04:42 +05:00 |
|
Asaad Mahmood
|
0e69a871bb
|
Adding reply functionality
|
2016-01-28 23:24:31 +05:00 |
|
JoramWilander
|
6cba0353c9
|
Return channel type in new post websocket events
|
2016-01-28 12:28:02 -05:00 |
|
=Corey Hulen
|
e37b2c62f3
|
Merge branch 'master' into PLT-1765
|
2016-01-28 11:59:38 -05:00 |
|
JoramWilander
|
3ef35a7c0a
|
Removed translation for unneeded link expiry
|
2016-01-28 11:54:03 -05:00 |
|
Corey Hulen
|
db37897538
|
Merge pull request #2010 from ZBoxApp/PLT-7-tutorial
PLT-7: Refactoring frontend (chunk 3)
|
2016-01-28 11:43:10 -05:00 |
|
=Corey Hulen
|
2138b46f6c
|
PLT-1765 allowing support of 2 previous versions
|
2016-01-28 11:39:48 -05:00 |
|
JoramWilander
|
0937cd4e38
|
Remove expiry from public links
|
2016-01-28 11:32:59 -05:00 |
|
Joram Wilander
|
211fa8e5cc
|
Merge pull request #2007 from mattermost/PLT-7-server-fallback
PLT-7 Adding english fallback to server
|
2016-01-28 10:41:30 -05:00 |
|
Corey Hulen
|
67808124b3
|
Merge pull request #2009 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
|
2016-01-28 10:37:36 -05:00 |
|