IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,192 Commits 845 Branches 1,202 Tags
44c19ee443831e0e94b5738ecb21a64ce7643247
Commit Graph

1976 Commits

Author SHA1 Message Date
Harrison Healey
4f1dbb8ca9 Merge pull request #2052 from mattermost/PLT-1429 
PLT-1429 adding user created slash commands
 2016-02-04 11:38:27 -05:00
Corey Hulen
34547186ba Merge pull request #2068 from hmhealey/plt1767 
PLT-1767 Fixed editing your last comment in the RHS
 2016-02-04 07:54:57 -08:00
hmhealey
f9ce99bdcf Fixed localization issues in file_upload.jsx 2016-02-04 10:10:00 -05:00
hmhealey
e4492152c7 Fixed editing your last comment in the RHS 2016-02-04 10:00:19 -05:00
Joram Wilander
87e6357265 Merge pull request #2062 from asaadmahmoodspin/ui-improvements 
Multiple UI Improvements
 2016-02-04 07:26:05 -05:00
Corey Hulen
e036375fe2 Merge pull request #2063 from mattermost/fix-loc 
Fixing loc error
 2016-02-03 17:08:41 -08:00
=Corey Hulen
d3a965a362 Merge branch 'master' into PLT-1429 2016-02-03 12:11:02 -08:00
=Corey Hulen
143186b9d9 Fixing loc error 2016-02-03 11:26:06 -08:00
Asaad Mahmood
f8d3f9d4ec Multiple UI Improvements 2016-02-03 23:54:48 +05:00
=Corey Hulen
bdfa4715d6 Merge branch 'master' into PLT-1429 2016-02-03 10:45:58 -08:00
Elias Nahum
cdfa9b585a Messages for SocketStore and small fixes 2016-02-03 12:17:13 -03:00
Elias Nahum
6a3806fe9d PLT-7: Refactoring frontend (chunk 11) 
- channel view
- Added translations for previous commits
- Fix bug on signup_team email body
 2016-02-03 12:17:13 -03:00
Christopher Speller
f7fddd6cce Merge pull request #2055 from khoa-le/PLT-1693 
PLT-1693: Clear the password input boxes when user enter incorrect Retype New P…
 2016-02-03 08:55:25 -05:00
Christopher Speller
75f412c4be Merge pull request #2049 from mattermost/plt-1856 
PLT-1856 Add basic server audit tab to system console for EE
 2016-02-03 08:52:18 -05:00
Christopher Speller
d479b08c99 Merge pull request #2045 from mattermost/plt-1849 
PLT-1849 Added extra system-wide statistics for EE
 2016-02-03 08:50:25 -05:00
Joram Wilander
0571953755 Merge pull request #2051 from ZBoxApp/PLT-7-channel-modals 
PLT-7: Refactoring frontend (chunk 10)
 2016-02-03 07:37:27 -05:00
Joram Wilander
5be7d00230 Merge pull request #2048 from rgarmsen2295/plt-1317 
PLT-1317 Replaces the clock icon for same user posts with a simple timestamp
 2016-02-03 07:36:04 -05:00
Joram Wilander
b7b61c0adc Merge pull request #2047 from hmhealey/helpurl 
Updated post help link
 2016-02-03 07:35:29 -05:00
Joram Wilander
36b4dcc17f Merge pull request #2044 from khoa-le/PLT-1864 
PLT-1864 Added help text indicating valid email required
 2016-02-03 07:34:47 -05:00
Joram Wilander
4a09adeb39 Merge pull request #1991 from rgarmsen2295/plt-976 
PLT-976 Adds ability to sign in with username
 2016-02-03 07:33:43 -05:00
Khoa, Le Ngoc
41bf14ade2 Clear the password input boxes when user enter incorrect Retype New Password. 2016-02-03 13:24:15 +07:00
Eric Sethna
d31ae20738 Update center_panel.jsx 
As discussed in UX meeting. Text change to help users understand that they are just scrolled up in the channel view rather than in a different interface when they jump to a search result.
"You are viewing the archives. Click here to jump to recent messages." -> "Click here to jump to recent messages"
 2016-02-02 17:03:29 -08:00
Corey Hulen
ddce9ae35c Merge pull request #2026 from rgarmsen2295/plt-1720 
PLT-1720 Properly disable the get team link functionality when user creation is disabled
 2016-02-02 16:34:18 -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
Elias Nahum
d424c9eaf1 PLT-7: Refactoring frontend (chunk 10) 
- Modals
- Fix bug on msg_typing
- Add missing translations in es.json for EE
 2016-02-02 19:39:56 -03:00
JoramWilander
d153d661db Add basic server audit tab to system console for EE 2016-02-02 16:49:27 -05:00
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
hmhealey
7587689735 Updated post help link 2016-02-02 12:51:40 -05:00
=Corey Hulen
ff54da2e4a Adding loc to front-end 2016-02-02 08:42:36 -08:00
JoramWilander
3d03bdf2f1 Added extra system-wide statistics for EE 2016-02-02 08:41:02 -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
b4ec690051 Fixing merge 2016-02-01 14:44:17 -08:00
Elias Nahum
e7f409a3c7 fix hour12 React warning for FormattedDate 2016-02-01 17:52:43 -03:00
Elias Nahum
3f91bc2df2 PLT-7: Refactoring frontend (chunk 9) 
- sidebar right & rhs
 2016-02-01 17:23:45 -03: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
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
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
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
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