Skip to content

#
Ocelot-Social-Community / Ocelot-Social

- Unwatch
  6
- 14
  14
- Fork

  # Fork Ocelot-Social

  If this dialog fails to load, you can visit the fork page directly.

  3

Open with

Step 1: Install GitHub CLI

    brew install gh

Step 2: Run in your project repository

    gh pr checkout 3934

Install GitHub CLI manually How to install GitHub CLI
Jump to bottom

# feat: [WIP] 🍰 Rebranding And White-Labeling #3934

Open
Mogge wants to merge 39 commits into master
base: master
from white-labeling
Open

# feat: [WIP] 🍰 Rebranding And White-Labeling #3934

Mogge wants to merge 39 commits into master from white-labeling
+1,364 −1,229

## Conversation

Pick your reaction

Copy link
Report content
Member

### Mogge commented 6 days ago

## Pullrequest

Have all the information for the brand in separate config files. Set these defaults to ocelot.social

Pick your reaction

The content you are editing has changed. Please copy your edits and refresh the page.

## 🍰 Pullrequest Have all the information for the brand in separate config files. Set these defaults to ocelot.social Attach files by dragging & dropping, selecting or pasting them.
Uploading your files… We don’t support that file type. Try again with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. Attaching documents requires write permission to this repository. Try again with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. We don’t support that file type. Try again with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. Yowza, that’s a big file Try again with a file smaller than 10MB. This file is empty. Try again with a file that’s not empty. This file is hidden. Try again with another file. Something went really wrong, and we can’t process that file. Try again.

Nothing to preview

roschaefer added 30 commits on Jun 4
`Rename dockerhub organizations`
`23ae569`

    ..plus get rid of obsolete prefix `nitro-`.

`feat: Avoid new builds on base docker-compose.yml`
`2c4c9ab`
`Merge pull request #6 from The-Schools-in-Motion-Network/avoid_builds…`
Verified
`d7d31e0`

    …_on_production

    feat: Avoid new builds on base docker-compose.yml

`Silly copy+paste error`
`9360181`
`Silly fix of copy+paste error`
`73c1f3c`
`Remove labels from Dockerfiles`
`a741721`

    Version was out of date anyways

`refactor: Image paths`
`bc70e8b`

    * removed obsolete images
    * moved all overwritable images to a location webapp/static/img/custom/
    * better names

`Add tags and APPLICATION_NAME env variable`
`0ee3a30`
`Paramterize all emails`
`3a21622`
`Replace example link`
`92fba41`
`backend: Ignore if .env file cannot be found`
`063200b`

    fix: #7

`Parameterize emails in backend`
`16c7be1`
`Remove inappropriate picture help link`
`4ea0d65`

    This link is helpful but points to Human Connection, so unfortunately I
    have to remove it.

`Parameterize links`
`387ea64`
`fix: Remove broken moreInfoURL`
`193f977`

    The links specified in the locales were pointing to the English site and
    were mostly broken anyways.

`Parameterize manifest`
`37b3014`
`refactor: Avoid html in translation files`
`36679da`

    I removed it. We cannot parameterize localizations with absolute urls
    properly.

`Fix Italian translation`
`3fa0723`
`Add CI workflow`
`92920fe`
`Fix image tags`
`811027f`
`Run lint --fix`
`d171d78`
`Replace name Human Connection from locales`
`0d5cf7a`
`Parameterize entire html of terms+conditions`
`4a91066`
`Make four static pages`
`77b0310`

    * imprint
    * data privacy
    * terms of service
    * code of conduct

`Replace welcome image in email templates`
`dd09dfa`
`Remove name "Human Connection" in email templates`
`9bb827a`
`Fix lint`
`68c5f0d`
`Remove obsolete env var`
`a20aebc`
`Install raw-loader node module`
`1d98f58`
`fix image path`
`d78e181`
roschaefer and others added 7 commits on Jun 16
`refactor: Move Logo out of styleguide`
`c2d9288`
`Remove "Human Connection" from translations`
`650b3ce`
`Parameterize page titles`
`906ab2d`
`merged conflicts`
`5fc24a3`
`merging rebranding branch from /`
`bd962bb`
`Starting rebranding to ocelot.social`
`ecb0bb3`
`logos changed. SVG should be in better quality`
`128e1f0`
Tirokk assigned Mogge 4 days ago
Tirokk changed the title feat: Rebranding and White-Labeling feat: [WIP] 🍰 Rebranding And White-Labeling 4 days ago
Mogge added 2 commits 3 hours ago
`further rebranding`
`5cfb735`
`define volumes`
`78f9e20`

## Merge state

Add more commits by pushing to the `white-labeling` branch on Ocelot-Social-Community/Ocelot-Social.

### Review required

At least 1 approving review is required by reviewers with write access. Learn more.

### All checks have passed

2 successful checks
CI / Continuous Integration (push) Successful in 8m
Details
Travis CI - Branch Successful in 20m — Build Passed
Details
Resolve conflicts

### This branch has conflicts that must be resolved

Use the web editor or the
to resolve conflicts.

#### Conflicting files

`neo4j/Dockerfile`

or view
.

#### Checkout via command line

If you cannot merge a pull request automatically here, you have the option of checking it out via command line to resolve conflicts and perform a manual merge.

Step 1: From your project repository, bring in the changes and test.

    git fetch origin
    git checkout -b white-labeling origin/white-labeling
    git merge master

Step 2: Merge the changes and update on GitHub.

    git checkout master
    git merge --no-ff white-labeling
    git push origin master

feat: [WIP] 🍰 Rebranding And White-Labeling

#### Couldn’t update branch

Oops, something went wrong.

There was an error creating your PullRequest.
Attach files by dragging & dropping, selecting or pasting them.
Uploading your files… We don’t support that file type. Try again with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. Attaching documents requires write permission to this repository. Try again with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. We don’t support that file type. Try again with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. Yowza, that’s a big file Try again with a file smaller than 10MB. This file is empty. Try again with a file that’s not empty. This file is hidden. Try again with another file. Something went really wrong, and we can’t process that file. Try again.

Nothing to preview

Remember, contributions to this repository should follow its contributing guidelines and code of conduct.
ProTip! Add comments to specific lines under Files changed.
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.

We use optional third-party analytics cookies to understand how you use GitHub.com so we can build better products. Learn more.

We use optional third-party analytics cookies to understand how you use GitHub.com so we can build better products.
You can always update your selection by clicking Cookie Preferences at the bottom of the page. For more information, see our Privacy Statement.

##### Essential cookies

We use essential cookies to perform essential website functions, e.g. they're used to log you in. Learn more

##### Always active

##### Analytics cookies

We use analytics cookies to understand how you use our websites so we can make them better, e.g. they're used to gather information about the pages you visit and how many clicks you need to accomplish a task. Learn more