Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MM-1427 Copied required Javascript libraries and resources into repository #130

Merged
merged 3 commits into from
Jul 8, 2015
Merged

Conversation

hmhealey
Copy link
Member

@hmhealey hmhealey commented Jul 3, 2015

Copied the Bootstrap, jQuery, and React libraries into static/js along with their required resources. Loggly, Snowplow, and the Google Visualization apis are still external, but those don't appear to be required to run Mattermost.

@coreyhulen
Copy link
Contributor

You also need to modify the Makefile. Specifically, "make dist" which replaces some of the .js files with min.js

@hmhealey
Copy link
Member Author

hmhealey commented Jul 6, 2015

Changed the Makefile to correctly use the minified and unminified versions of the local Javascript libraries. Ready for review again.

@coreyhulen
Copy link
Contributor

please rebase for merge

@hmhealey
Copy link
Member Author

hmhealey commented Jul 8, 2015

Rebased and perfect scrollbar has been updated to 0.6.3 to match the previously conflicting changes. Tested to make sure that javascript files are loaded correctly without an internet connection when using builds produced by make run and make dist. Also, I added the full version number to perfect-scrollbar.js since it took me a while to find the matching unminified version. Ready for merge.

coreyhulen added a commit that referenced this pull request Jul 8, 2015
MM-1427 Copied required Javascript libraries and resources into repository
@coreyhulen coreyhulen merged commit 689692b into mattermost:master Jul 8, 2015
@hmhealey hmhealey deleted the staticjs branch September 11, 2015 14:55
dmeza pushed a commit to uber-archive/mattermost-server that referenced this pull request Nov 1, 2017
)

* UCHAT-491 hide password preference for saml auth_service

* UCHAT-491 use constant for saml string
witjem pushed a commit to witjem/mattermost-server that referenced this pull request Oct 6, 2022
* added system getbusy, setbusy, clearbusy

* unit tests for getbusy, setbusy, clearbusy

* better json output for setbusy, clearbusy; log desc for Command

* setbusy seconds arg to mandatory flag

* ignore redundant bool returned from setbusy,clearbusy

* don't double up error messages

* add printer.SetSingle calls; pretty print expiry time

* update vendor

* use server@master

* make docs
Kshitij-Katiyar pushed a commit that referenced this pull request Jul 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants