Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #2567 from mattermost/css-webpack-improvments | Harrison Healey | 2016-03-30 | 8 | -9585/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | Moving from scss vendors folder to NPM. | |||||
| * | | | | | Moving from scss vendors folder to NPM. | Christopher Speller | 2016-03-29 | 8 | -9585/+8 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #2568 from mattermost/fix-sidebar-link | Harrison Healey | 2016-03-30 | 3 | -11/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing some warnings. | |||||
| * | | | | | Fixing warning with drafts. | Christopher Speller | 2016-03-29 | 2 | -9/+5 | |
| | | | | | | ||||||
| * | | | | | Fixing Link warning | Christopher Speller | 2016-03-29 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2569 from mattermost/run-fullmap | Harrison Healey | 2016-03-30 | 4 | -3/+24 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding make target for building with a full source map | |||||
| * | | | | | | Adding make target for building with a full source map | Christopher Speller | 2016-03-29 | 4 | -3/+24 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #2570 from mattermost/plt-1944 | Harrison Healey | 2016-03-30 | 3 | -5/+11 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | PLT-1944 Fixing react warnings on permalink return. | |||||
| * | | | | | Fixing react warnings on permalink return | Christopher Speller | 2016-03-29 | 3 | -5/+11 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2565 from ZBoxApp/missing-locs | Joram Wilander | 2016-03-29 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Add missing es locs and sort by id | |||||
| * | | | | Add missing es locs and sort by id | Elias Nahum | 2016-03-29 | 1 | -0/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #2564 from hmhealey/actions | Christopher Speller | 2016-03-29 | 2 | -2/+3 | |
|\ \ \ \ | |/ / / |/| | | | Added RECEIVED_ANALYTICS action | |||||
| * | | | Added RECEIVED_ANALYTICS action | Harrison Healey | 2016-03-29 | 2 | -2/+3 | |
| | | | | ||||||
* | | | | Merge pull request #2556 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-03-29 | 20 | -31/+74 | |
|\ \ \ \ | | | | | | | | | | | Multiple UI improvements | |||||
| * | | | | Removing translated lines | Asaad Mahmood | 2016-03-29 | 3 | -3/+0 | |
| | | | | | ||||||
| * | | | | Removing other theme translations | Asaad Mahmood | 2016-03-29 | 3 | -3/+3 | |
| | | | | | ||||||
| * | | | | Fixing dropdown for posts on mobile | Asaad Mahmood | 2016-03-29 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fixing see other themes link | Asaad Mahmood | 2016-03-29 | 1 | -10/+11 | |
| | | | | | ||||||
| * | | | | Additional UI improvements | Asaad Mahmood | 2016-03-29 | 8 | -30/+44 | |
| | | | | | ||||||
| * | | | | Multiple UI Improvements | Asaad Mahmood | 2016-03-29 | 14 | -0/+31 | |
| | | | | | ||||||
* | | | | | Merge pull request #2562 from mattermost/warning-fix | Harrison Healey | 2016-03-29 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing Link warning on return from admin console. | |||||
| * | | | | | Fixing Link warning | Christopher Speller | 2016-03-29 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2558 from mattermost/center-panel-refactor | Corey Hulen | 2016-03-29 | 22 | -304/+366 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-2382, PLT-2386, PLT-2455 Channel/permalink view cleanup and fixes. | |||||
| * | | | | Refactoring center panel away. Moving tutorial to a route. Fixing a | Christopher Speller | 2016-03-29 | 22 | -304/+366 | |
| | |/ / | |/| | | | | | | | | | | bunch of bugs. | |||||
* | | | | Merge pull request #2560 from mattermost/plt-2464 | Joram Wilander | 2016-03-29 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | PLT-2464 Fixing js error with notifications. | |||||
| * | | | Spelling | Christopher Speller | 2016-03-29 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2553 from hmhealey/actions | Joram Wilander | 2016-03-29 | 1 | -0/+8 | |
|\ \ \ | | | | | | | | | Added a warning message when AppDispatcher tries to dispatch without an action type | |||||
| * | | | Added a warning message when AppDispatcher tries to dispatch without an ↵ | Harrison Healey | 2016-03-28 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | action type | |||||
* | | | | Merge pull request #2551 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-03-28 | 8 | -16/+7395 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | Multiple UI Improvements | |||||
| * / | Multiple UI Improvements | Asaad Mahmood | 2016-03-28 | 8 | -16/+7395 | |
|/ / | ||||||
* | | Merge pull request #2539 from ryoon/gnu-make-as-gmake | Harrison Healey | 2016-03-28 | 1 | -4/+4 | |
|\ \ | | | | | | | Replace 'make' with '$(MAKE)' | |||||
| * | | Replace 'make' with '$(MAKE)' | Ryo ONODERA | 2016-03-25 | 1 | -4/+4 | |
| |/ | | | | | | | Fix the build under the platform that GNU make is installed as gmake. | |||||
* | | Merge pull request #2548 from rodrigocorsi2/pt-translations | Harrison Healey | 2016-03-28 | 2 | -14/+44 | |
|\ \ | | | | | | | LDAP translations pt | |||||
| * | | LDAP translations pt | Rodrigo Corsi | 2016-03-27 | 2 | -14/+44 | |
| | | | ||||||
* | | | Merge pull request #2550 from mattermost/plt-2452 | Harrison Healey | 2016-03-28 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | PLT-2452 Fixing Link being imported incorrectly. Fixes team creation. | |||||
| * | | | Fixing Link being imported incorrectly. Fixes team creation. | Christopher Speller | 2016-03-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2546 from ZBoxApp/open-invite | Joram Wilander | 2016-03-28 | 1 | -1/+3 | |
|\ \ \ \ | | | | | | | | | | | fix register account for teams with open invites | |||||
| * | | | | fix register account for teams with open invites | Elias Nahum | 2016-03-26 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #2545 from ryoon/no-travis | Joram Wilander | 2016-03-28 | 1 | -2/+0 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Mattermost does not appears to use travis ci anymore | |||||
| * | | | | Mattermost does not appears to use travis ci anymore | Ryo ONODERA | 2016-03-26 | 1 | -2/+0 | |
| |/ / / | | | | | | | | | | | | | Remove travis ci status. | |||||
* | | | | Merge pull request #2538 from mattermost/websocket-fix | Christopher Speller | 2016-03-28 | 2 | -7/+13 | |
|\ \ \ \ | | | | | | | | | | | Fix websocket trying to reconnect after a logout | |||||
| * | | | | Fix websocket trying to reconnect after a logout | JoramWilander | 2016-03-24 | 2 | -7/+13 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #2537 from mattermost/oauth-fix | Christopher Speller | 2016-03-28 | 5 | -16/+19 | |
|\ \ \ \ | | | | | | | | | | | Fix OAuth routes and link issues | |||||
| * | | | | Fix oauth routes and link issues | JoramWilander | 2016-03-24 | 5 | -16/+19 | |
| |/ / / | ||||||
* | | | | Merge pull request #2532 from mattermost/ldap-switch-fix | Christopher Speller | 2016-03-28 | 2 | -3/+12 | |
|\ \ \ \ | |_|_|/ |/| | | | Minor fix to let Sign-in Method settings show up when ldap is enabled | |||||
| * | | | Remove loc change | JoramWilander | 2016-03-24 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix chrome autocompleting using hidden input | JoramWilander | 2016-03-24 | 1 | -4/+12 | |
| | | | | ||||||
| * | | | Minor fix to let Sign-in Method settings show up when ldap is enabled | JoramWilander | 2016-03-24 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2547 from ZBoxApp/notifications-fix | Christopher Speller | 2016-03-26 | 2 | -0/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | Fix HTML Notifications not showing | |||||
| * | | | Fix HTML Notifications not showing | Elias Nahum | 2016-03-26 | 2 | -0/+1 | |
|/ / / | | | | | | | | | | - fix filename typo |