ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

5716 Commits

Author SHA1 Message Date
Wolfgang Huß
7759e54fd4 Correct hashtag link routing 2019-09-16 22:06:36 +02:00
Wolfgang Huß
92df820323 Rename /admin/tags.vue to /admin/hashtags.vue 2019-09-16 22:06:36 +02:00
Wolfgang Huß
0157cc3700 Refactor routing of of hashtag links 2019-09-16 22:06:36 +02:00
Wolfgang Huß
ee8ce5a153 Comment clearification 2019-09-16 22:06:36 +02:00
Wolfgang Huß
82d5ac99df Make hashtag links URL safe 2019-09-16 22:06:36 +02:00
mattwr18
de0837bbd3
Merge pull request #1572 from Human-Connection/set_created_at_in_cypher 
Fix bug where Post.createdAt is sometimes null
 2019-09-16 14:38:13 +02:00
mattwr18
8205b2d986
Merge pull request #1594 from Human-Connection/fix_missing_images 
Fix missing images on staging
 2019-09-16 13:32:29 +02:00
Wolfgang Huß
590917160c
Merge pull request #1593 from Human-Connection/1501-missing-translations 
🍰  Missing translations
 2019-09-16 13:07:05 +02:00
roschaefer
4be3e2a0d0 Fix missing images on staging 2019-09-16 11:41:50 +02:00
Wolfgang Huß
22a005eb1c Show categories translated in all places and even in tooltips 
Show `#` symbol in front of hashtags.
Minor design changes on posts more info page.
 2019-09-16 11:14:13 +02:00
Wolfgang Huß
714c658844 Add hint translation to plus icon for creating posts 
- Position adjustment of the news feed plus icon in hight, because in desktop browsers it intersects the footer.
- Added shadow to plus icon on the user page.
 2019-09-16 10:20:36 +02:00
dependabot-preview[bot]
f0f6224cce
Bump @storybook/addon-actions from 5.1.11 to 5.2.0 in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.1.11 to 5.2.0.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.0/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:07:16 +00:00
mattwr18
c330bb2604
Merge pull request #1588 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/dotenv-1.4.1 
Bump @nuxtjs/dotenv from 1.4.0 to 1.4.1 in /webapp
 2019-09-16 09:05:27 +02:00
dependabot-preview[bot]
2e2330f40f
Bump graphql from 14.5.4 to 14.5.6 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.4 to 14.5.6.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.4...v14.5.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:04:41 +00:00
dependabot-preview[bot]
6c5c9722b2
Bump @nuxtjs/dotenv from 1.4.0 to 1.4.1 in /webapp 
Bumps [@nuxtjs/dotenv](https://github.com/nuxt-community/dotenv-module) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/nuxt-community/dotenv-module/releases)
- [Changelog](https://github.com/nuxt-community/dotenv-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/dotenv-module/compare/v1.4.0...v1.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 04:24:05 +00:00
dependabot-preview[bot]
47fa830cc9
Bump @storybook/vue from 5.1.11 to 5.2.0 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.1.11 to 5.2.0.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.0/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 04:22:30 +00:00
mattwr18
6f21926a76
Merge pull request #1564 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.2.1 
Bump date-fns from 2.1.0 to 2.2.1 in /webapp
 2019-09-13 23:49:09 +02:00
mattwr18
16d7e6c91a Update notifications 
- create only one relationship by using merge, but do not update
createdAt attribute/update test
- order by updatedAt_desc
 2019-09-13 20:14:47 +02:00
mattwr18
67d68db231 Update post resolver to fix embarrasing bugs 
- when a user updates a post, we should not override every property in
our database with the new params, since we have read-only properties
like createdAt that we don't want to go deleting aimlessly.
 2019-09-13 20:14:47 +02:00
dependabot-preview[bot]
650300bc90
Bump date-fns from 2.1.0 to 2.2.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.1.0 to 2.2.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.1.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 04:22:37 +00:00
roschaefer
4db0d69fad Add styleguide/ as submodule 
This should make new contributors aware that the Styleguide exists and
maybe maybe even encourage people to contribute to the Styleguide.

Also this enabled `yarn run dev:styleguide` to build the `webapp/` along
with the styleguide.
 2019-09-13 00:50:48 +02:00
Robert Schäfer
23d17d7b44
Merge pull request #1543 from Human-Connection/more_realistic_end_to_end_tests 
Various changes to build pipeline
 2019-09-12 23:39:46 +02:00
roschaefer
08244ab4b2 Address @mattwr18's review here: 
https://github.com/Human-Connection/Human-Connection/pull/1543#pullrequestreview-287593264

Thinking about it, I really ask myself why I did not find this solution
earlier 🙈

Of course, you don't want to share the generated `buildDir`
with the host system. If you happen to share the `webapp/` folder,
simply point NuxtJS to a build directory somewhere else. Easy!
 2019-09-12 22:56:52 +02:00
Robert Schäfer
064096922f
Merge pull request #1557 from Human-Connection/fix-broken-navbar 
Fix navbar styling
 2019-09-12 22:16:30 +02:00
mattwr18
fb2cade2f9
Merge pull request #1537 from Human-Connection/1455-fix-update-comment-list 
🍰 Fixes a create and update comment problem in the comments list
 2019-09-12 18:36:30 +02:00
mattwr18
cc74b3e8dd Fix navbar styling 
- with all the merge conflicts to deal with, I accidentally added the
wrong value
 2019-09-12 18:33:50 +02:00
Robert Schäfer
ef0f0353ea
Merge pull request #1548 from Human-Connection/1491-fix-show-less-link-not-working-reliably 
Fix show less link not working reliably
 2019-09-12 16:36:05 +02:00
roschaefer
bc153ee42e Synchronize dockerfiles, fix cypress 
.. make tippy.js a production dependency (was throwing errors on my
machine).
 2019-09-12 12:16:20 +02:00
mattwr18
33942f6475
Merge pull request #1283 from Human-Connection/fix/header-alignment 
fix(header-alignment): Fix logo and locale position.
 2019-09-12 11:44:52 +02:00
Wolfgang Huß
36a0844fdd Followed @mattwrd18 suggestion 2019-09-12 09:30:47 +02:00
Wolfgang Huß
199079cff8 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-12 08:46:36 +02:00
roschaefer
10418f061b Various changes to build pipeline 
* Use `production` docker images for cypress tests. As one of our contributors
pointed out: It is bad practice to end-to-end test sth. else than the actual
production images.
* Have a dedicated `docker-compose.travis-integration.yml` to test
backend integration tests. The backend *needs* a database when doing
integration tests. So there is no way around using docker-compose. But
we could stop using the `build-and-test` stage when we do cypress tests.
* Remove a couple of unused ports and DRY `docker-compose.override.yml`
* Build and tag all images first and then run `docker-compose .. up` - I
hope this will not rebuild the image.
* Reduce docker image size
 2019-09-12 00:29:36 +02:00
mattwr18
6ff532ab4a
Merge pull request #1517 from Human-Connection/better_maintenance_page 
Better maintenance page
 2019-09-11 18:25:21 +02:00
mattwr18
c36ec623ec Make container wider 
- the text is all jumbled up, and there is nothing else on the page
 2019-09-11 16:43:45 +02:00
mattwr18
73db6c5e58 Left align text on password-rest page 
- to maintain consistency with login page

- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-09-11 16:40:39 +02:00
mattwr18
1a65d75c10 Add back blank layout 
- The new maintenance page will use a blank layout that does not have a
footer because we don't want users thinking they can click on a link
that will just lead back to the maintenance page
 2019-09-11 16:40:39 +02:00
mattwr18
fa3053dca7 Tidy up, follow @roschaefer, @Tirokk PR suggestions 
- Fix tests by stubbing LocaleSwitch/client-only
- Add portuguese translations
- Add back to login link
- Use span over &nbsp following @alina-becks PR review on another PR
 2019-09-11 16:40:39 +02:00
mattwr18
17f2c990db Fix lint 2019-09-11 16:40:39 +02:00
Brent Vardy
ca49c2296c improved class names for current component 2019-09-11 16:40:39 +02:00
Brent Vardy
53408f4bf4 refactor create-user-account to have no header 
- also added locale switch to card
 2019-09-11 16:40:39 +02:00
Brent Vardy
ea16d1652a used no header for login and password reset pages 
- added locale switch back on login
- added locale switch to password reset
- increased width of login and password reset
- added logo to password reset

- co-authored-by: mattwr18 <mattwr18@gmail.com>
- co-authored-by: mikeaono <aonomike@gmail.com>
 2019-09-11 16:40:39 +02:00
Vasily Belolapotkov
f4b3c84815 moved footer styles into footer component and added shadow 2019-09-11 16:40:39 +02:00
Brent Vardy
5d73cad168 refactor page footer to component 2019-09-11 16:40:39 +02:00
Brent Vardy
e9ac462889 update name of blanks layout to basic layout 2019-09-11 16:40:39 +02:00
Brent Vardy
e0fec965dc improved navigation layout when not logged in, moved locale selector to nav on login page 2019-09-11 16:40:39 +02:00
Brent Vardy
6589fe10af WIP - refactor of blank layout to have header and footer 2019-09-11 16:40:38 +02:00
Brent Vardy
a751a10783 update login page to use blank layout 2019-09-11 16:40:38 +02:00
gha-gozu
7fdabd9ac4 fix(header-alignment): Fix logo and locale position. 2019-09-11 16:40:38 +02:00
Wolfgang Huß
7dc5856845 write tests and fix minor appearing and position problems with context menu 2019-09-11 15:13:31 +02:00
Wolfgang Huß
0e39f1de86 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-11 13:56:50 +02:00