Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Multiple UI Improvements | Asaad Mahmood | 2016-03-08 | 2 | -4/+4 |
| | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2016-03-08 | 0 | -0/+0 |
|\ | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/textbox.jsx web/sass-files/sass/partials/_post.scss | ||||
| * | Merge pull request #2372 from mattermost/PLT-2039 | Christopher Speller | 2016-03-07 | 1 | -4/+7 |
| |\ | | | | | | | PLT-2039 fixing slash builtin cmds showing as webhook | ||||
| | * | PLT-2039 fixing slash builtin cmds showing as webhook | =Corey Hulen | 2016-03-07 | 1 | -4/+7 |
| |/ | |||||
| * | Merge pull request #2368 from hmhealey/plt2227 | Christopher Speller | 2016-03-07 | 1 | -1/+1 |
| |\ | | | | | | | PLT-2227 Properly cleared the post draft after a command is entered | ||||
| | * | Fixed clearing post draft after a command is entered | Harrison Healey | 2016-03-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #2366 from hmhealey/plt2016 | Christopher Speller | 2016-03-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | PLT-2016/PLT-2013 Fixed file attachment download link to properly trigger a download | ||||
| | * | | Fixed file attachment download link to properly trigger a download on ↵ | Harrison Healey | 2016-03-07 | 1 | -1/+1 |
| | |/ | | | | | | | | | | IE11/Edge/Safari | ||||
| * | | Merge pull request #2364 from hmhealey/confirm | Christopher Speller | 2016-03-07 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Renamed confirm_button to confirmButton in InviteMemberModal | ||||
| | * | | Renamed confirm_button to confirmButton in InviteMemberModal | Harrison Healey | 2016-03-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #2362 from ZBoxApp/PLT-2239 | Christopher Speller | 2016-03-07 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | PLT-2239: Fix Discard changes modal button text not showing | ||||
| | * | | | PLT-2239: Fix Discard changes modal button text not showing | Elias Nahum | 2016-03-07 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge pull request #2360 from hmhealey/plt1993 | Christopher Speller | 2016-03-07 | 2 | -9/+9 |
| |\ \ \ | | | | | | | | | | | PLT-1993/PLT-1994 Stopped calling uploadFiles multiple times for a single upload | ||||
| | * | | | Stopped calling uploadFiles multiple times for a single upload | Harrison Healey | 2016-03-07 | 2 | -9/+9 |
| | |/ / | |||||
| * | | | Merge pull request #2352 from hmhealey/plt2139 | Christopher Speller | 2016-03-07 | 1 | -7/+6 |
| |\ \ \ | | | | | | | | | | | PLT-2139 Stopped removing extra punctuation after @mentions | ||||
| | * | | | Stopped removing extra punctuation after @mentions | Harrison Healey | 2016-03-07 | 1 | -7/+6 |
| | |/ / | |||||
| * | | | Merge pull request #2350 from hmhealey/plt1930 | Christopher Speller | 2016-03-07 | 3 | -3/+2 |
| |\ \ \ | | | | | | | | | | | PLT-1930 Fixed Private Channels header in SearchSuggestionList | ||||
| | * | | | Fixed Private Channels header in the SearchSuggestionList to actually say ↵ | Harrison Healey | 2016-03-07 | 3 | -5/+4 |
| | |/ / | | | | | | | | | | | | | Private instead of Public | ||||
| * | | | Merge pull request #2349 from hmhealey/plt2008 | Christopher Speller | 2016-03-07 | 1 | -102/+8 |
| |\ \ \ | | | | | | | | | | | PLT-2008 Removed gif playing code from the FileAttachment component | ||||
| | * | | | Removed gif playing code from the FileAttachment component | Harrison Healey | 2016-03-07 | 1 | -102/+8 |
| | |/ / | |||||
| * | | | Merge pull request #2348 from hmhealey/member | Christopher Speller | 2016-03-07 | 5 | -12/+10 |
| |\ \ \ | | | | | | | | | | | Updated Channel Members modal UI | ||||
| | * | | | Changed Channel Members modal to list full user objects with all fields ↵ | Harrison Healey | 2016-03-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | populated | ||||
| | * | | | Added @ before username in UserList when a Full Name or Nickname is present | Harrison Healey | 2016-03-07 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Changed 'Remove Member' to 'Remove' in Channel Members modal | Harrison Healey | 2016-03-07 | 4 | -8/+6 |
| | |/ / | |||||
| * | | | Merge pull request #2365 from hmhealey/plt2142 | Corey Hulen | 2016-03-07 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | PLT-2142 Increased the maximum size of image uploads to 24 megapixels | ||||
| | * | | Increased the maximum size of image uploads to 24 megapixels | Harrison Healey | 2016-03-07 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2340 from rodrigocorsi2/PLT-2076 | Harrison Healey | 2016-03-07 | 4 | -7/+80 |
| |\ \ | | |/ | |/| | PLT-2076: Add help text below the input box when a user starts typing | ||||
| | * | Fix camel case | Rodrigo Corsi | 2016-03-07 | 1 | -4/+4 |
| | | | |||||
| | * | Add help text below the input box when a user starts typing | rodrigo | 2016-03-06 | 4 | -7/+80 |
| | | | |||||
| * | | Merge pull request #2339 from ZBoxApp/PLT-2218 | Joram Wilander | 2016-03-07 | 5 | -58/+56 |
| |\ \ | | | | | | | | | PLT-2218: Notification email footer is translated based on the sender's language | ||||
| | * | | Fix for PLT-2218 & PLT-2222 | Elias Nahum | 2016-03-06 | 5 | -58/+56 |
| | |/ | | | | | | | | | | | | | - Also includes missing loc strings for frontend es.json - Sort web [locale].json by id | ||||
| * | | Merge pull request #2333 from hmhealey/plt2194 | Joram Wilander | 2016-03-07 | 2 | -15/+10 |
| |\ \ | | | | | | | | | PLT-2194 Removed Get Team Invite Link link when user creation is disabled | ||||
| | * | | Removed Get Team Invite Link link when user creation is disabled | Harrison Healey | 2016-03-03 | 2 | -15/+10 |
| | | | | |||||
| * | | | Merge pull request #2332 from hmhealey/plt2014 | Joram Wilander | 2016-03-07 | 3 | -2/+7 |
| |\ \ \ | | |_|/ | |/| | | PLT-2014 Stopped removing *s from the end of search phrases | ||||
| | * | | Stopped removing *s from the end of search phrases | Harrison Healey | 2016-03-04 | 3 | -2/+7 |
| | | | | |||||
* | | | | Multiple UI Improvements | Asaad Mahmood | 2016-03-08 | 41 | -661/+710 |
|/ / / | |||||
* | | | Merge pull request #2334 from mattermost/esethna-patch-2 | Corey Hulen | 2016-03-04 | 1 | -0/+33 |
|\ \ \ | | | | | | | | | Update NOTICE.txt with fastclick | ||||
| * | | | Update NOTICE.txt | Eric Sethna | 2016-03-03 | 1 | -0/+33 |
| | |/ | |/| | |||||
* | | | Merge pull request #2306 from mattermost/esethna-patch-1 | Corey Hulen | 2016-03-04 | 4 | -5/+3 |
|\ \ \ | |_|/ |/| | | Update get team invite link help text | ||||
| * | | Update get_team_invite_link_modal.jsx | Eric Sethna | 2016-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | Update pt.json | Eric Sethna | 2016-03-01 | 1 | -1/+0 |
| | | | |||||
| * | | Update es.json | Eric Sethna | 2016-03-01 | 1 | -1/+0 |
| | | | |||||
| * | | Update en.json | Eric Sethna | 2016-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Update get_team_invite_link_modal.jsx | Eric Sethna | 2016-03-01 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2307 from ZBoxApp/PLT-2112 | Joram Wilander | 2016-03-04 | 8 | -2/+90 |
|\ \ \ | | | | | | | | | PLT-2112: Allow CORS | ||||
| * | | | Set CORS Headers when needed if CORS is enabled | Elias Nahum | 2016-03-02 | 2 | -36/+25 |
| | | | | | | | | | | | | | | | | - Enable CORS with and without RateLimiter | ||||
| * | | | Add Cors Handler | Elias Nahum | 2016-03-01 | 2 | -1/+46 |
| | | | | |||||
| * | | | Add default value to AllowCorsFrom setting | Elias Nahum | 2016-03-01 | 3 | -4/+9 |
| | | | | |||||
| * | | | Allow CORS | Elias Nahum | 2016-03-01 | 7 | -0/+49 |
| | | | | |||||
* | | | | Merge pull request #2328 from mattermost/fix-cli-team | Joram Wilander | 2016-03-04 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fixing cli to create open team |