Browse Source

Merge branch 'master' of gitote.in:gitote/gitote

Yoginth 7 years ago
parent
commit
acd0b83221
4 changed files with 30 additions and 31 deletions
  1. 3 3
      README.md
  2. 1 1
      gitote.go
  3. 10 1
      public/expansion/expansion.js
  4. 16 26
      templates/pages/contribute.tmpl

+ 3 - 3
README.md

@@ -125,9 +125,9 @@ Some existing code may be poorly written or untested, so we must have more scrut
 
 
 ## Sponsors 🙏
 ## Sponsors 🙏
 
 
-#### [![DigitalOcean](https://img.shields.io/badge/DigitalOcean-%F0%9F%99%8F-555.svg?logo=digitalocean&style=for-the-badge)](https://m.do.co/c/1ddec8d50826)
-#### [![BrowserStack](https://img.shields.io/badge/BrowserStack-%F0%9F%99%8F-555.svg?logo=google%20chrome&style=for-the-badge)](https://browserstack.com/?utm_source=Gitote)
-#### [![Sentry](https://img.shields.io/badge/Sentry-%F0%9F%99%8F-555.svg?logo=sentry&style=for-the-badge)](https://sentry.io/?utm_source=Gitote)
+<a href="https://m.do.co/c/1ddec8d50826"><img src="https://cdn.jsdelivr.net/npm/gitote@1.3.3/img/sponsors/digitalocean.png" width="220"/></a>
+
+<a href="https://browserstack.com/?utm_source=Gitote"><img src="https://cdn.jsdelivr.net/npm/gitote@1.3.3/img/sponsors/browserstack.png" width="220"/></a>
 
 
 ## License 💼
 ## License 💼
 
 

+ 1 - 1
gitote.go

@@ -23,7 +23,7 @@ import (
 )
 )
 
 
 // AppVer represents the version of Gitote
 // AppVer represents the version of Gitote
-const AppVer = "1.0.1-prod-rc.7"
+const AppVer = "1.0.1-prod-rc.8"
 
 
 // APIVer represents the API version of Gitote
 // APIVer represents the API version of Gitote
 const APIVer = "v1"
 const APIVer = "v1"

+ 10 - 1
public/expansion/expansion.js

@@ -2,15 +2,24 @@ var nextWord = (function() {
     var wordArray = [
     var wordArray = [
         'Gitote Is Tasty',
         'Gitote Is Tasty',
         'Get In Touch',
         'Get In Touch',
+        'Get Inside Test',
         'Get It Tested',
         'Get It Tested',
         'GNU Interactive Tools',
         'GNU Interactive Tools',
         'Goods In Transit',
         'Goods In Transit',
+        'Goods In Transport',
         'Geek In Training',
         'Geek In Training',
         'Goddess In Training',
         'Goddess In Training',
         'Gentleman In Training',
         'Gentleman In Training',
         'Geologist In Training',
         'Geologist In Training',
+        'Ghost In Training',
         'Geeks In Town',
         'Geeks In Town',
-        'General Information Test'
+        'General Information Test',
+        'Group Inclusive Tour',
+        'Geometric Invariant Theory',
+        'Graphic Information Technology',
+        'Graphic Image Technology',
+        'Great Innovative Technology',
+        'Global Information Tracker'
     ];
     ];
     var copy;
     var copy;
     return function() {
     return function() {

+ 16 - 26
templates/pages/contribute.tmpl

@@ -14,8 +14,8 @@
         </p>
         </p>
         <p class="pages-small">
         <p class="pages-small">
             If you’re uncomfortable getting into open source development right away, you may want to consider 
             If you’re uncomfortable getting into open source development right away, you may want to consider 
-            the Documentation or Translation tracks. Documentation and Translation are both just as important as 
-            code, and we'd be happy to have your contributions.
+            the Documentation track. Documentation are just as important as code, and we'd be happy to have 
+            your contributions.
         </p>
         </p>
 
 
         <center class="pages-heading">
         <center class="pages-heading">
@@ -42,8 +42,8 @@
 
 
         <p class="pages-small">
         <p class="pages-small">
             Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, 
             Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, 
-            wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers 
-            who do not follow the Code of Conduct may be removed from the project team.
+            issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not 
+            follow the Code of Conduct may be removed from the project team.
         </p>
         </p>
 
 
         <p class="pages-small">
         <p class="pages-small">
@@ -66,26 +66,20 @@
         </center>
         </center>
 
 
         <p class="pages-small">
         <p class="pages-small">
-            These instructions are for development of Gitote.in specifically. Please note that use of the 
-            Gitote Development Kit is currently experimental on Windows. macOS or Linux are recommended for the best 
-            contribution experience.
+            These instructions are for development of <a href="https://gitote.in">Gitote.in</a> specifically. Please 
+            note that use of the Gitote Development Kit is currently experimental on Windows and macOS. Linux is recommended 
+            for the best contribution experience.
         </p>
         </p>
         <ol>
         <ol>
             <li class="pages-small">
             <li class="pages-small">
-                Download and setup the <a href="https://gitote.in/gitote/gitote-development-kit">Gitote Development 
-                Kit</a>, see the <a href="https://gitote.in/gitote/gitote-development-kit/blob/master/README.md">GDK 
-                README</a> for instructions on setting it up and 
-                <a href="https://gitote.in/gitote/gitote-development-kit/blob/master/doc/howto/troubleshooting.md">
-                Troubleshooting</a> if you get stuck.
+                Read Gitote Development Kit</a>, see the <a href="https://gitote.in/gitote/gitote/src/master/docs/GDK.md">GDK README</a> 
+                for instructions on setting it up and.                
             </li> 
             </li> 
             
             
             <li class="pages-small">Fork the Gitote project.</li> 
             <li class="pages-small">Fork the Gitote project.</li> 
             <li class="pages-small">
             <li class="pages-small">
-                Choose an issue to work on. * You can find easy issues by 
-                <a href="https://gitote.in/gitote/gitote/issues?label_name%5B%5D=Accepting+merge+requests">
-                looking at issues labeled Accepting Merge Requests and sorting issues by weight</a>, low-weight issues will be the 
-                easiest to accomplish. 
-                
+                Choose an issue to work on. * You can find easy issues by <a href="https://gitote.in/gitote/gitote/issues?labels=13"> looking at issues labeled Accepting Pull Requests</a>
+
                 <ul> 
                 <ul> 
                     <li class="pages-small">
                     <li class="pages-small">
                         Be sure to comment and verify no one else is working on the issue, and to make sure 
                         Be sure to comment and verify no one else is working on the issue, and to make sure 
@@ -98,17 +92,13 @@
                 </ul>
                 </ul>
             <li class="pages-small">Add the feature or fix the bug you’ve chosen to work on.</li> 
             <li class="pages-small">Add the feature or fix the bug you’ve chosen to work on.</li> 
             <li class="pages-small">
             <li class="pages-small">
-                Open a merge request. The earlier you open a merge request, the sooner you can get feedback. You can
-                mark it as a Work in Progress to signal that you’re not done yet.
-            </li> 
-            <li class="pages-small">
-                Add tests and documentation if needed, as well as 
-                <a href="https://docs.gitlab.com/ee/development/changelog.html">a changelog entry</a>.
-            </li> 
-            <li class="pages-small">Make sure the test suite is passing.</li> 
+                Open a pull request. The earlier you open a pull request, the sooner you can get feedback. You can
+                mark it as a Work in Progress(In issue name) to signal that you’re not done yet.
+            </li>
+            <li class="pages-small">Make sure the test suite is passing <a href="https://gitlab.com/gitote/gitote/pipelines">here</a>.</li> 
             <li class="pages-small">
             <li class="pages-small">
                 Wait for a reviewer. You’ll likely need to change some things once the reviewer has completed a code review for 
                 Wait for a reviewer. You’ll likely need to change some things once the reviewer has completed a code review for 
-                your merge request. You may also need multiple reviews depending on the size of the change.
+                your pull request. You may also need multiple reviews depending on the size of the change.
             </li> 
             </li> 
             <li class="pages-small">Get your changes merged!</li>
             <li class="pages-small">Get your changes merged!</li>
         </ol> 
         </ol>