summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2077 from hmhealey/plt1819Joram Wilander2016-02-051-5/+13
|\
| * Changed notifications to only request permission once per session if the user...hmhealey2016-02-041-5/+13
* | New localizationsElias Nahum2016-02-042-78/+79
* | Merge pull request #2079 from mattermost/help-text-updatesCorey Hulen2016-02-043-8/+8
|\ \
| * | Update en.jsonit332016-02-041-1/+1
| * | Update es.jsonit332016-02-041-1/+1
| * | Update en.jsonit332016-02-041-1/+1
| * | Update email_settings.jsxit332016-02-041-1/+1
| * | Update es.jsonit332016-02-041-2/+2
| * | Update en.jsonit332016-02-041-2/+2
| * | Update email_settings.jsxit332016-02-041-2/+2
* | | Merge pull request #2076 from ZBoxApp/loc-fixCorey Hulen2016-02-044-42/+114
|\ \ \
| * | | fix typosElias Nahum2016-02-042-4/+4
| * | | PLT-7: Fix and Add new loc stringsElias Nahum2016-02-044-41/+113
| |/ /
* | | Merge pull request #2075 from mattermost/PLT-1851Corey Hulen2016-02-041-7/+16
|\ \ \
| * | | PLT-1851 fixing websocket reconnect error=Corey Hulen2016-02-041-6/+12
| * | | Merge branch 'master' into PLT-1851=Corey Hulen2016-02-0417-100/+1027
| |\| |
| * | | PLT-1851 reconnect and get missing messages=Corey Hulen2016-02-031-1/+4
* | | | Merge pull request #2071 from hmhealey/plt1820Corey Hulen2016-02-044-41/+36
|\ \ \ \
| * | | | Added focus to the sidebar textbox when it is openedhmhealey2016-02-041-0/+6
| * | | | Added code to refocus on the post/comment textbox after a file is drag and dr...hmhealey2016-02-042-0/+8
| * | | | Updated RHS textbox to refocus after clicking to upload a filehmhealey2016-02-041-0/+5
| * | | | Cleaned up textbox focus codehmhealey2016-02-043-42/+18
| | |/ / | |/| |
* | | | Merge pull request #2073 from mattermost/ee-updatesCorey Hulen2016-02-048-390/+404
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move license storage to databaseJoramWilander2016-02-041-1/+1
| * | | Turn failed audit descriptions redJoramWilander2016-02-041-1/+6
| * | | Convert audit_table to a proper tableJoramWilander2016-02-044-385/+375
| * | | Rename audits tabJoramWilander2016-02-043-3/+10
| * | | Disable remove license button until LDAP is disabledJoramWilander2016-02-042-2/+4
| * | | Fix license info localizationJoramWilander2016-02-043-4/+14
| |/ /
* | | Merge pull request #2064 from hmhealey/plt882Christopher Speller2016-02-0412-96/+115
|\ \ \ | |/ / |/| |
| * | Added helper methods to send ephemeral messages to specific usershmhealey2016-02-042-2/+19
| * | Changed how posts are marked ephemeralhmhealey2016-02-044-6/+9
| * | Changed PostStore to not clear a deleted post's messagehmhealey2016-02-045-22/+27
| * | Added ephemeral messages sent when a user mentions someone not in the channelhmhealey2016-02-042-1/+3
| * | Changed deleted posts to be more general ephemeral postshmhealey2016-02-046-72/+64
* | | Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-049-26/+928
|\ \ \
| * | | PLT-1429 Fixing code review comments=Corey Hulen2016-02-041-1/+0
| * | | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0325-268/+788
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0352-842/+2399
| |\ \ \
| * | | | Fixing console=Corey Hulen2016-02-021-1/+1
| * | | | Adding props to admin console=Corey Hulen2016-02-023-12/+108
| * | | | Adding loc to front-end=Corey Hulen2016-02-023-51/+302
| * | | | Fixing merge=Corey Hulen2016-02-01153-1784/+9627
| |\ \ \ \
| * \ \ \ \ merging=Corey Hulen2016-01-2522-338/+1085
| |\ \ \ \ \
| * \ \ \ \ \ merging=Corey Hulen2016-01-221694-147/+1541284
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merging=Corey Hulen2016-01-151-3/+3
| |\ \ \ \ \ \ \
| * | | | | | | | finishing up commands UI=Corey Hulen2016-01-142-68/+308
| * | | | | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-1430-118/+643
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Adding UI=Corey Hulen2016-01-112-0/+295