Skip to content
This repository has been archived by the owner on Mar 17, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into feature/rest-username-suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
engelgabriel authored May 30, 2018
2 parents dfd749c + ee1c178 commit 742e9b8
Show file tree
Hide file tree
Showing 178 changed files with 3,788 additions and 1,015 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ This is the official repository for Rocket.Chat Documentation.
This is a quick guide on how to run the docs site locally, for a more in depth guide please look [here]( contributing/documentation)

- install ruby (version 2.5 or higher recommended, if using any version prior to 2.5 you will need to install bundler with `gem install bundler`).
- This step is for only macOS users:
- You will need to have either `xcode` or the `xcode command line tools` installed. To install the command tools use `xcode-select --install`. Don't forget to accept the `sudo xcodebuild -license` command.
- Depending on your setup you might need to install [nokogiri](http://www.nokogiri.org/tutorials/installing_nokogiri.html) and its dependencies manually.
- Fork the [repository](https://github.com/RocketChat/docs).
- Clone your fork.
- Run `bundle install` inside of the cloned docs folder.
Expand Down
6 changes: 5 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Rocket.Chat user, admin, API, integration, plugin and contributing
url: https://rocket.chat/docs

# bump if alterting styles or js
version: 17
version: 22

defaults:
- scope:
Expand All @@ -23,6 +23,10 @@ plugins:
whitelist:
- jekyll-redirect-from

markdown: kramdown

highlighter: rouge

exclude:
- Gemfile
- Gemfile.lock
Expand Down
11 changes: 11 additions & 0 deletions _data/projects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@
Realtime API: realtime-api/
Livechat API: livechat-api/

-
name: Bots
icon: cog
description: Guides for using bots in Rocket.Chat
path: bots/
pages:
Bots Architecture: bots-architecture/
Bots FAQ: bots-faq/
Configuring Bots: configure-bot-environment/
Creating Bots Users: creating-bot-users/

-
name: Contributing
icon: github
Expand Down
28 changes: 19 additions & 9 deletions _data/toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
- Ubuntu:
- Snaps:
- AutoSSL
- Mongo Options
- Configuring SSL Reverse Proxy
- PM2, Systemd, Upstart
- Running in a sub folder
Expand Down Expand Up @@ -97,6 +98,7 @@
- Direct Reply
- File Upload:
- Amazon S3
- Google Cloud Storage
- Minio
- Import:
- CSV
Expand Down Expand Up @@ -144,6 +146,7 @@
- Create the First Admin
- Restoring an Admin
- Settings Via Env Vars
- Youtube Broadcasting
- Developer guides:
- Quick Start
- Branches and Releases
Expand All @@ -158,15 +161,6 @@
- Embedded Layout
- Internationalization
- Livechat API
- Using Bots:
- Bots FAQ
- Bots Architecture
- Creating Bot Users
- Configure Bot Environment
- Running a Hubot Bot
- Running a Botkit Bot
- Running a Rasa Bot
- Running a Botpress Bot
- Mobile Apps:
- Supporting SSL
- Realtime-API:
Expand Down Expand Up @@ -228,6 +222,7 @@
- addOwner
- archive
- close
- counters
- create
- files
- getAllUserMentionsByChannel
Expand All @@ -243,6 +238,7 @@
- removeModerator
- removeOwner
- rename
- setCustomFields
- setDescription
- setJoinCode
- setPurpose
Expand Down Expand Up @@ -274,6 +270,7 @@
- addOwner
- archive
- close
- counters
- create
- files
- getIntegrations
Expand All @@ -288,6 +285,7 @@
- removeModerator
- removeOwner
- rename
- setCustomFields
- setDescription
- setPurpose
- setReadOnly
Expand All @@ -296,6 +294,7 @@
- unarchive
- Im:
- close
- counters
- create
- files
- history
Expand Down Expand Up @@ -334,6 +333,8 @@
- Subscriptions:
- get
- getOne
- read
- unread
- Users:
- create
- createToken
Expand Down Expand Up @@ -361,5 +362,14 @@
- Colors
- Components
- Themes
- Bots:
- Bots FAQ
- Bots Architecture
- Creating Bot Users
- Configure Bot Environment
- Running a Hubot Bot
- Running a Botkit Bot
- Running a Rasa Bot
- Running a Botpress Bot
- Community Cookbook:
- Remote Video Monitoring
102 changes: 75 additions & 27 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,28 +1,76 @@
<footer>
<div class="wrapper">
<ul>
<li><a href="https://rocket.chat/download">Download</a></li>
<li><a href="https://rocket.chat/support">Support</a></li>
<li><a href="https://rocket.chat/cloud">Cloud</a></li>
<li><a href="https://rocket.chat/docs/">Docs</a></li>
</ul>
<ul>
<li><a href="https://rocket.chat/team">Team</a></li>
<li><a href="https://rocketchat.recruitee.com/">Jobs</a></li>
<li><a href="https://rocket.chat/partners">Partners</a></li>
<li><a href="https://rocket.chat/terms">Terms of Service</a></li>
</ul>
<ul>
<li><a href="https://rocket.chat/community">Community</a></li>
<li><a href="https://forums.rocket.chat">Forums</a></li>
<li><a href="https://rocket.chat/blog/">Blog</a></li>
<li><a href="https://rocket.chat/contact">Contact</a></li>
</ul>
<ul>
<li><a href="https://shop.spreadshirt.com/rocketchat" target="_blank">Swag Store</a></li>
<li><a href="https://www.stickermule.com/user/1070688638/stickers" target="_blank">Stickers</a></li>
<li><a href="https://rocket.chat/press">Press</a></li>
</ul>
<footer class="app-footer {% if page.theme == 'light' %}app-footer--light{% else %}app-footer--black{% endif %}">
<div class="container">

<div class="app-footer_col">
<input id="menu1" type="checkbox" />
<label for="menu1" class="app-footer_pre-menu">Product</label>
<ul class="app-footer_nav">
<li><a href="//rocket.chat/">Rocket.Chat</a></li>
<li><a href="//rocket.chat/support">Support</a></li>
<li><a href="//rocket.chat/cloud">Cloud</a></li>
<li><a href="//rocket.chat/bots">Bots</a></li>
<li><a href="//rocket.chat/community">Community</a></li>
<li><a href="//rocket.chat/pt/webinars/">Webinars</a></li>
<li><a href="//rocket.chat/docs/">Documentation</a></li>
</ul>
</div>

<div class="app-footer_col">
<input id="menu2" type="checkbox" />
<label for="menu2" class="app-footer_pre-menu">Company</label>
<ul class="app-footer_nav">
<li><a href="//rocket.chat/team">Team</a></li>
<li><a target="_blank" rel="noopener noreferrer" href="//rocketchat.recruitee.com/">Jobs</a></li>
<li><a href="//rocket.chat/contact">Contact</a></li>
<li><a href="//rocket.chat/partners">Partners</a></li>
<li><a href="//rocket.chat/press">Press</a></li>
<li><a href="//rocket.chat/blog/">Blog</a></li>
<li><a href="//shop.spreadshirt.com/rocketchat" target="_blank" rel="noopener noreferrer">Gift shop</a></li>
</ul>
</div>

<div class="app-footer_col">
<input id="menu3" type="checkbox" />
<label for="menu3" class="app-footer_pre-menu">Legal</label>
<ul class="app-footer_nav">
<li><a href="//rocket.chat/terms">Terms of Service</a></li>
<li><a href="//rocket.chat/privacy">Privacy</a></li>
<li><a href="//rocket.chat/dmca">DMCA Policy</a></li>
</ul>
</div>

<div class="app-footer_col">
<input id="menu4" type="checkbox" />
<label for="menu4" class="app-footer_pre-menu">Get started</label>
<ul class="app-footer_nav">
<li><a class="app-footer_install" target="_blank" rel="noopener noreferrer" href="//cloud.rocket.chat/trial/small"><span><img src="{{ site.url }}/images/default/cloud.svg" alt="Free trial"></span> Cloud trial</a></li>
<li><a class="app-footer_install" href="//rocket.chat/install" title="install"><span style="margin-top: -0.1em;"><img src="{{ site.url }}/images/default/install.svg" alt="Install"></span> Install server</a></li>
</ul>
</div>

<div class="app-footer_wrap-logo">
<h1 class="app-footer_logo">
<a href="//rocket.chat/">
<img src="{{ site.url }}/images/default/logo.svg" alt="Rocket.Chat">
</a>
</h1>

<a class="app-footer_github" target="_blank" href="//github.com/RocketChat/Rocket.Chat" rel="noopener noreferrer">
<span><img src="{{ site.url }}/images/default/star.svg" alt="GitHub Stars"></span>
<span class="star-count">{{site.stars}}K</span>
</a>
<a class="app-footer_github" target="_blank" href="//github.com/RocketChat/Rocket.Chat/fork" rel="noopener noreferrer">
<span><img src="{{ site.url }}/images/default/fork.svg" alt="GitHub forks"></span>
<span class="fork-count">{{site.forks}}K</span>
</a>
<a class="app-footer_github-link" target="_blank" href="//github.com/RocketChat/Rocket.Chat" rel="noopener noreferrer">
<span><img src="{{ site.url }}/images/default/github.svg" alt="GitHub"></span>
Open on GitHub
</a>

<a href="//keycdn.com" target="_blank" rel="noopener noreferrer" class="app-footer_partner">
<img src="{{ site.url }}/images/default/keycdnlogo.png" alt="KeyCDN">
</a>
</div>
</div>
<div class="clear"></div>
</footer>
</footer>
28 changes: 28 additions & 0 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<div class="app-header app-header--black">
<header class="app-header_wrap headroom--top">
<div class="container">
<h1 class="app-header_logo">
<a href="/">
<img class="normal" src="{{ site.url }}/images/default/logo.svg" alt="Rocket.Chat">
</a>
</h1>

<input type="checkbox" id="handle-menu" />
<label class="app-header_handle-menu" for="handle-menu"><span /></label>

<nav class="app-header_menu">
<ul>
<li><a data-senna-off="true" href="//rocket.chat/cloud">Cloud</a></li>
<li><a data-senna-off="true" href="//rocket.chat/install">Install</a></li>
<li><a data-senna-off="true" href="//rocket.chat/support">Support</a></li>
<li><a data-senna-off="true" href="//rocket.chat/community">Community</a></li>
<li><a data-senna-off="true" href="//rocket.chat/docs/">Docs</a></li>
<li><a data-senna-off="true" href="//rocket.chat/blog/">Blog</a></li>
<li><a data-senna-off="true" href="//rocket.chat/contact">Contact</a></li>
</ul>
<a class="app-header_install" href="//rocket.chat/cloud"><span><img src="{{ site.url }}/images/default/cloud.svg" alt="Install"></span> Try now</a>
</nav>

</div>
</header>
</div>
Loading

0 comments on commit 742e9b8

Please sign in to comment.