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

5679 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
397ebec88c PLT-2115 adding compliance 2016-03-14 10:22:36 -07:00
=Corey Hulen
013f27ff1a Updating interface 2016-03-11 16:58:01 -08:00
=Corey Hulen
6fa6ea0af5 PLT-2115 adding compliance interfaces 2016-03-11 16:53:32 -08:00
=Corey Hulen
6d21a339dc PLT-2115 adding compliance feature to enterprise 2016-03-10 09:39:05 -08:00
Corey Hulen
cbf84c8bea Merge pull request #2384 from ZBoxApp/es-locs
Added missing web and server spanish locs
2016-03-08 09:06:12 -08:00
Elias Nahum
76859adfeb Added missing web and server spanish locs 2016-03-08 12:47:26 -03:00
Harrison Healey
22470c2069 Merge pull request #2370 from mattermost/PLT-1830
PLT-1830 Adding ability to create team with ldap
2016-03-08 10:18:05 -05:00
Harrison Healey
8fc42cbeb6 Merge pull request #2373 from mattermost/PLT-1988
PLT-1988 fixing slash logout
2016-03-08 10:05:12 -05:00
Harrison Healey
c18cac1f71 Merge pull request #2374 from mattermost/PLT-2040
PLT-2040 disable executing of commands
2016-03-08 10:04:49 -05:00
Harrison Healey
93dc768156 Merge pull request #2375 from mattermost/PLT-2117
PLT-2117 chaning multiple rrs
2016-03-08 10:04:19 -05:00
Harrison Healey
49fa15c592 Merge pull request #2376 from asaadmahmoodspin/ui-improvements
Multiple UI improvements
2016-03-08 10:03:54 -05:00
Christopher Speller
9eab1b3071 Merge pull request #2371 from ZBoxApp/locs
Add missing web locales
2016-03-08 08:43:01 -05:00
Christopher Speller
8dd3711bd8 Merge pull request #2347 from hmhealey/morechannels
Fixed positioning of elements in MoreChannels modal
2016-03-08 08:42:43 -05:00
Asaad Mahmood
b934dfc059 Multiple UI Improvements 2016-03-08 15:47:50 +05:00
Asaad Mahmood
7db020ec34 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Conflicts:
	web/react/components/textbox.jsx
	web/sass-files/sass/partials/_post.scss
2016-03-08 15:17:36 +05:00
Asaad Mahmood
cc453a048d Multiple UI Improvements 2016-03-08 15:07:43 +05:00
Christopher Speller
3c14155148 Merge pull request #2372 from mattermost/PLT-2039
PLT-2039 fixing slash builtin cmds showing as webhook
2016-03-07 21:57:06 -05:00
=Corey Hulen
7695e0ea4b PLT-2117 chaning multiple rrs 2016-03-07 18:03:28 -08:00
=Corey Hulen
e7ece19957 Fixing unit test 2016-03-07 17:45:15 -08:00
=Corey Hulen
2f92a94c3c PLT-2040 disable executing of commands 2016-03-07 17:24:09 -08:00
=Corey Hulen
d9f242d430 PLT-1988 fixing slash logout 2016-03-07 17:16:56 -08:00
=Corey Hulen
8c3b4d0a4e PLT-2039 fixing slash builtin cmds showing as webhook 2016-03-07 17:12:47 -08:00
Elias Nahum
e3256e6bc7 Add missing web locales
- Sort locale files by id
2016-03-07 21:32:05 -03:00
=Corey Hulen
777012eee4 PLT-1830 Adding ability to create team with ldap 2016-03-07 14:59:15 -08:00
Christopher Speller
b001507bed Merge pull request #2368 from hmhealey/plt2227
PLT-2227 Properly cleared the post draft after a command is entered
2016-03-07 17:18:34 -05:00
Christopher Speller
04a194d802 Merge pull request #2366 from hmhealey/plt2016
PLT-2016/PLT-2013 Fixed file attachment download link to properly trigger a download
2016-03-07 17:18:14 -05:00
Christopher Speller
c31b0bf361 Merge pull request #2364 from hmhealey/confirm
Renamed confirm_button to confirmButton in InviteMemberModal
2016-03-07 17:18:02 -05:00
Christopher Speller
2cf5579e30 Merge pull request #2362 from ZBoxApp/PLT-2239
PLT-2239: Fix Discard changes modal button text not showing
2016-03-07 17:17:36 -05:00
Christopher Speller
a980c0d7b3 Merge pull request #2360 from hmhealey/plt1993
PLT-1993/PLT-1994 Stopped calling uploadFiles multiple times for a single upload
2016-03-07 17:17:02 -05:00
Christopher Speller
9d5e3e65b8 Merge pull request #2352 from hmhealey/plt2139
PLT-2139 Stopped removing extra punctuation after @mentions
2016-03-07 17:16:14 -05:00
Christopher Speller
ededd620bb Merge pull request #2350 from hmhealey/plt1930
PLT-1930 Fixed Private Channels header in SearchSuggestionList
2016-03-07 17:15:23 -05:00
Christopher Speller
a1507438f5 Merge pull request #2349 from hmhealey/plt2008
PLT-2008 Removed gif playing code from the FileAttachment component
2016-03-07 17:14:56 -05:00
Christopher Speller
e0c08d4ed6 Merge pull request #2348 from hmhealey/member
Updated Channel Members modal UI
2016-03-07 17:14:15 -05:00
Corey Hulen
1dde831daf Merge pull request #2365 from hmhealey/plt2142
PLT-2142 Increased the maximum size of image uploads to 24 megapixels
2016-03-07 14:12:51 -08:00
Harrison Healey
68b8285eaf Fixed clearing post draft after a command is entered 2016-03-07 15:58:08 -05:00
Harrison Healey
a94879a7d5 Fixed file attachment download link to properly trigger a download on IE11/Edge/Safari 2016-03-07 15:34:14 -05:00
Harrison Healey
733396f6b3 Increased the maximum size of image uploads to 24 megapixels 2016-03-07 14:37:19 -05:00
Harrison Healey
608f6f76f3 Renamed confirm_button to confirmButton in InviteMemberModal 2016-03-07 14:22:56 -05:00
Harrison Healey
b8b38c0c72 Merge pull request #2340 from rodrigocorsi2/PLT-2076
PLT-2076: Add help text below the input box when a user starts typing
2016-03-07 13:53:56 -05:00
Elias Nahum
81c2c85f1b PLT-2239: Fix Discard changes modal button text not showing 2016-03-07 14:43:14 -03:00
Harrison Healey
734387bdb9 Stopped calling uploadFiles multiple times for a single upload 2016-03-07 11:11:08 -05:00
Harrison Healey
9695956083 Stopped removing extra punctuation after @mentions 2016-03-07 10:26:50 -05:00
Harrison Healey
c73bcd86bb Fixed Private Channels header in the SearchSuggestionList to actually say Private instead of Public 2016-03-07 10:18:38 -05:00
Harrison Healey
c4eac8cf62 Removed gif playing code from the FileAttachment component 2016-03-07 10:10:03 -05:00
Harrison Healey
8f917a2925 Changed Channel Members modal to list full user objects with all fields populated 2016-03-07 09:55:57 -05:00
Harrison Healey
6217b06ca2 Added @ before username in UserList when a Full Name or Nickname is present 2016-03-07 09:51:10 -05:00
Harrison Healey
37897e6283 Changed 'Remove Member' to 'Remove' in Channel Members modal 2016-03-07 09:41:38 -05:00
Rodrigo Corsi
5884495a85 Fix camel case 2016-03-07 11:11:58 -03:00
Harrison Healey
c6fce25c7c Fixed indentation in MoreChannels modal 2016-03-07 09:09:23 -05:00
Joram Wilander
0387ac7997 Merge pull request #2339 from ZBoxApp/PLT-2218
PLT-2218: Notification email footer is translated based on the sender's language
2016-03-07 07:49:31 -05:00