Skip to content

/ Ocelot-Social

  • Unwatch
    Notifications
  • Fork

    Fork Ocelot-Social

    If this dialog fails to load, you can visit the fork page directly.
Open with
Jump to bottom

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

Open
wants to merge 39 commits into
base: master
from
Open

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

wants to merge 39 commits into from
+1,364 −1,229

Conversation

@Mogge

Pick your reaction

Copy link
Report content
Member

@Mogge Mogge commented 6 days ago

cake Pullrequest

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

Pick your reaction

Select a reply ctrl .

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

Nothing to preview

roschaefer added 30 commits on Jun 4
@roschaefer
Rename dockerhub organizations
23ae569 
..plus get rid of obsolete prefix `nitro-`.
@roschaefer
feat: Avoid new builds on base docker-compose.yml
2c4c9ab
@roschaefer
Merge pull request #6 from The-Schools-in-Motion-Network/avoid_builds…
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
d7d31e0 
…_on_production

feat: Avoid new builds on base docker-compose.yml
@roschaefer
Silly copy+paste error
9360181
@roschaefer
Silly fix of copy+paste error
73c1f3c
@roschaefer
Remove labels from Dockerfiles
a741721 
Version was out of date anyways
@roschaefer
refactor: Image paths
bc70e8b 
* removed obsolete images
* moved all overwritable images to a location webapp/static/img/custom/
* better names
@roschaefer
Add tags and APPLICATION_NAME env variable
0ee3a30
@roschaefer
Paramterize all emails
3a21622
@roschaefer
Replace example link
92fba41
@roschaefer
backend: Ignore if .env file cannot be found
063200b 
fix: #7
@roschaefer
Parameterize emails in backend
16c7be1
@roschaefer
Remove inappropriate picture help link
4ea0d65 
This link is helpful but points to Human Connection, so unfortunately I
have to remove it.
@roschaefer
Parameterize links
387ea64
@roschaefer
fix: Remove broken moreInfoURL
193f977 
The links specified in the locales were pointing to the English site and
were mostly broken anyways.
@roschaefer
Parameterize manifest
37b3014
@roschaefer
refactor: Avoid html in translation files
36679da 
I removed it. We cannot parameterize localizations with absolute urls
properly.
@roschaefer
Fix Italian translation
3fa0723
@roschaefer
Add CI workflow
92920fe
@roschaefer
Fix image tags
811027f
@roschaefer
Run lint --fix
d171d78
@roschaefer
Replace name Human Connection from locales
0d5cf7a
@roschaefer
Parameterize entire html of terms+conditions
4a91066
@roschaefer
Make four static pages
77b0310 
* imprint
* data privacy
* terms of service
* code of conduct
@roschaefer
Replace welcome image in email templates
dd09dfa
@roschaefer
Remove name "Human Connection" in email templates
9bb827a
@roschaefer
Fix lint
68c5f0d
@roschaefer
Remove obsolete env var
a20aebc
@roschaefer
Install raw-loader node module
1d98f58
@roschaefer
fix image path
d78e181
roschaefer and others added 7 commits on Jun 16
@roschaefer
refactor: Move Logo out of styleguide
c2d9288
@roschaefer
Remove "Human Connection" from translations
650b3ce
@roschaefer
Parameterize page titles
906ab2d
@Mogge
merged conflicts
Loading status checks…
5fc24a3
@Mogge
merging rebranding branch from /
Loading status checks…
bd962bb
@Mogge
Starting rebranding to ocelot.social
Loading status checks…
ecb0bb3
@Mogge
logos changed. SVG should be in better quality
Loading status checks…
128e1f0
@Tirokk 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
@Mogge
further rebranding
Loading status checks…
5cfb735
@Mogge
define volumes
Loading status checks…
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
@github-actions
CI / Continuous Integration (push) Successful in 8m
Details
@travis-ci
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
@Mogge

Couldn’t update branch

Oops, something went wrong.

@Mogge
Select a reply ctrl .
Remember, contributions to this repository should follow its contributing guidelines and code of conduct.
ProTip! Add comments to specific lines under Files changed.
Reviewers
Request up to 15 reviewers

Suggestions

@ogerly ogerly

@Tirokk Tirokk

@roschaefer roschaefer

At least 1 approving review is required to merge this pull request.

Still in progress?
Convert to draft

Convert this pull request to draft?

People who are already subscribed will not be unsubscribed.
Assignees
Assign up to 10 people to this pull request

@Mogge Mogge

Labels
Apply labels to this pull request
None yet
Projects
Projects
None yet
Milestone
Set milestone
No milestone
Linked issues
Link an issue from this repository

Successfully merging this pull request may close these issues.

None yet

Notifications
Customize

Notification settings

Loading...

You’re receiving notifications because you’re watching this repository.

2 participants
@Mogge @roschaefer
Lock conversation

Lock conversation on this pull request

  • Other users can’t add new comments to this pull request.
  • You and other members of teams with write access to this repository can still leave comments that others can see.
  • You can always unlock this pull request again in the future.

Optionally, choose a reason for locking that others can see. Learn more about when it’s appropriate to lock conversations.

You can’t perform that action at this time.