IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,083 Commits 5 Branches 2 Tags
Commit Graph

13083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
3f7d1c7bd0 Follow suggestions of Moriz and Robert 2021-06-07 18:50:21 +02:00
Wolfgang Huß
f0a01fa42a Add comment and lineend 2021-06-07 18:07:09 +02:00
Ulf Gebhardt
b3538577dc
backend production=false 2021-06-07 15:31:29 +02:00
Ulf Gebhardt
02f5434ef3
production=false for webapp 2021-06-07 15:07:59 +02:00
Ulf Gebhardt
92bda02f0e
use some ebug builds since its not working out of the box 2021-06-07 14:58:28 +02:00
Ulf Gebhardt
b6b93f58d7
moved babel into main dependencies 2021-06-07 14:11:01 +02:00
Ulf Gebhardt
791d873df2
-remove node_modules 
-build production
 2021-06-07 14:04:36 +02:00
Ulf Gebhardt
76791f72ad
roberts suggestion regarding branch deployment 2021-06-07 13:51:22 +02:00
Wolfgang Huß
42bd648169 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4451-new-deployment-with-base-and-code 2021-06-04 09:14:41 +02:00
Wolfgang Huß
c3212eaca1 Implement 'docker-compose.ocelotsocial-branded.yml' 2021-06-03 19:20:54 +02:00
Wolfgang Huß
16ef30041a
Merge pull request #17 from Ocelot-Social-Community/16-flexibe-footer-links 
feat: [WIP] 🍰 Flexible Footer Links
 2021-06-03 19:05:45 +02:00
Wolfgang Huß
5240bc9e67 Add text line to the rebranded translated html files 2021-06-03 19:03:30 +02:00
Wolfgang Huß
a99b9ed052
Merge pull request #4468 from Ocelot-Social-Community/4464-flexible-footer-links 
feat: 🍰 Flexible Footer Links
 2021-06-03 18:03:20 +02:00
Wolfgang Huß
bd0a70ad54 Add locales to branding, especial translated html files 2021-06-03 17:24:02 +02:00
Wolfgang Huß
9d80cf7867 Add comment to all translated html files 2021-06-03 17:16:46 +02:00
Wolfgang Huß
a53d3cf633 Correct test descriptions 2021-06-03 17:14:56 +02:00
Wolfgang Huß
627a20f66a Implement tests for flexible page footer links 2021-06-03 16:51:40 +02:00
Wolfgang Huß
a820f227a3
Merge pull request #4466 from Ocelot-Social-Community/4465-correct-contribution 
docs: 🍰 Correct 'Contribution.md'
 2021-06-03 08:30:40 +02:00
Wolfgang Huß
a091ac9689 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 16-flexibe-footer-links 2021-06-03 07:37:25 +02:00
Wolfgang Huß
7b09df848b Extend and change links 2021-06-03 07:36:55 +02:00
Wolfgang Huß
1bd4af6fd3 Implement flexible page footer links 2021-06-02 20:18:11 +02:00
Wolfgang Huß
d7b888f7b2 Extend and change links 2021-06-02 20:10:30 +02:00
Wolfgang Huß
9d9d44359a Correct 'Contribution.md' 2021-06-01 13:23:49 +02:00
Wolfgang Huß
19e3c9cc7a Add copying of nginx config into maintenance 'code' target 
- To use the nginx config in rebranding.
 2021-06-01 13:11:39 +02:00
Wolfgang Huß
38b95d8b33
Merge pull request #4461 from Ocelot-Social-Community/4459-correct-discord-links 
docs: 🍰 Correct Discord Links And Divers
 2021-06-01 12:23:16 +02:00
Wolfgang Huß
36de9a3451 Refactor some HC and prettify some formating 2021-05-31 18:07:52 +02:00
Wolfgang Huß
a03830d5c6 Correct Discord link 2021-05-31 15:57:50 +02:00
Wolfgang Huß
b824ebb9f5 Correct GitHub name 2021-05-31 15:53:07 +02:00
Wolfgang Huß
0318910488 Correct Discord links and divers 2021-05-31 15:48:52 +02:00
dependabot-preview[bot]
e36c88ee96
Bump date-fns from 2.12.0 to 2.22.1 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.12.0 to 2.22.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.12.0...v2.22.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-31 05:21:24 +00:00
Wolfgang Huß
a0a2fb43ab Prettify some formating 2021-05-30 20:52:16 +02:00
Wolfgang Huß
1f89baa843 Refine comment 2021-05-30 20:37:36 +02:00
Wolfgang Huß
92abc35a60 Remove comments 2021-05-30 20:26:12 +02:00
Wolfgang Huß
6ba2cf0970 Build base and code Docker images 
- Push always for test purposes. To be reverted later.
 2021-05-30 19:55:42 +02:00
Wolfgang Huß
931705976d Establish new deployment structure with base and code Docker images, first step 2021-05-30 17:58:04 +02:00
dependabot-preview[bot]
32d6a6c795
[Security] Bump browserslist from 4.9.1 to 4.16.6 in /backend 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.9.1 to 4.16.6. **This update includes a security fix.**
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.9.1...4.16.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-26 05:20:06 +00:00
Wolfgang Huß
7fea34a71e
Change link for contribution 2021-05-25 17:07:46 +02:00
Wolfgang Huß
06fafb8cee
Change logo file name in main Readme.md 2021-05-25 16:59:27 +02:00
dependabot-preview[bot]
158e63a7de
[Security] Bump browserslist from 4.14.7 to 4.16.6 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.14.7 to 4.16.6. **This update includes a security fix.**
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.14.7...4.16.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-25 05:08:16 +00:00
Wolfgang Huß
dacbffa933
Merge pull request #12 from Ocelot-Social-Community/adjust-to-new-logo-structure 
💥 Release v1.0.3
 2021-05-20 09:59:03 +02:00
Wolfgang Huß
71f250ceb6 Upgrade ocelot.social build number to 1.0.3-82 2021-05-19 17:12:48 +02:00
Wolfgang Huß
c7e3955539
Merge pull request #4435 from Ocelot-Social-Community/release-v1.0.3 
chore: 🍰 Release v1.0.3
 2021-05-19 16:56:49 +02:00
Wolfgang Huß
981c48a782 Release v1.0.3 2021-05-19 11:10:33 +02:00
Wolfgang Huß
ac85a97191 Rename logo 'logo-horizontal.svg' to small caps, remove dummy 2021-05-19 11:10:01 +02:00
Wolfgang Huß
9d370c1921 Adjust to new logo structure 
- Rename logo 'logo-horizontal--dummy' to dummy to get small caps in the next step.
 2021-05-19 11:07:07 +02:00
Wolfgang Huß
772a892dc9 v1.0.3 2021-05-19 08:50:05 +02:00
Wolfgang Huß
169c334711
Merge pull request #4433 from Ocelot-Social-Community/4432-fix-header-logo-rebrand-replacement 
chore: 🍰 Refactor Logos
 2021-05-19 08:37:49 +02:00
Wolfgang Huß
8a51c8cb1d Rename logo to just small caps 2021-05-19 07:09:38 +02:00
Wolfgang Huß
0df0c19c73 Rename logo as dummy for following just small caps 2021-05-19 07:08:49 +02:00
Wolfgang Huß
7da8cef5ab Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4432-fix-header-logo-rebrand-replacement 
# Conflicts:
#	webapp/components/LoginForm/LoginForm.vue
 2021-05-18 22:28:58 +02:00