IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,571 Commits 5 Branches 2 Tags
Commit Graph

5571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
1273d5f2b5 Implement automatic Github releases 
I hope this will create a git tag and upload a release for us.
 2019-09-13 03:04:19 +02:00
Robert Schäfer
8fa794f282
Merge pull request #1553 from Human-Connection/helper-for-backend-tests-failed-by-missing-constraints 
🍰 [Helper] Message for backend tests failed by missing constraints
 2019-09-12 23:51:15 +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
86f9824c2e Fix lint 2019-09-12 23:13:20 +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
roschaefer
9233049ff3 Show a helpful message only if test fails 
Inspired by the `ON FAIL` markup from the previous commit
0f2398295bcced3af3772bb4add1f42472c97893
 2019-09-12 17:16:10 +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
Robert Schäfer
43d93de6ef
Merge pull request #1551 from Human-Connection/dependabot/npm_and_yarn/cypress-plugin-retries-1.3.0 
Bump cypress-plugin-retries from 1.2.2 to 1.3.0
 2019-09-12 16:33:42 +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ß
0f2398295b Helper message for backend tests failed by missing constraints in database 2019-09-12 11:14:42 +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
dependabot-preview[bot]
7bb24a2215
Bump cypress-plugin-retries from 1.2.2 to 1.3.0 
Bumps [cypress-plugin-retries](https://github.com/Bkucera/cypress-plugin-retries) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/Bkucera/cypress-plugin-retries/releases)
- [Commits](https://github.com/Bkucera/cypress-plugin-retries/compare/v1.2.2...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-12 04:21:02 +00: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
Robert Schäfer
a01c73536f
Merge pull request #1542 from Human-Connection/1538_test-filter-by-followed-by 
Test filter by followed by
 2019-09-11 13:29:00 +02:00
mattwr18
32849ae920 Fix show less link not working reliably 
- Add a span wrapping the show more/less links with a pointer cursor and
margin... it's now clear it should be clicked and reliable works
 2019-09-11 12:58:56 +02:00
Robert Schäfer
5273f8b9fa
Merge pull request #1533 from Human-Connection/293-fix-follower-counter 
[WIP] 🍰 Update follower count on follow/unfollow
 2019-09-11 12:33:56 +02:00
mattwr18
030ff32b13 Fix lint 2019-09-11 09:16:06 +02:00
roschaefer
f3a9996962 Copy package.json from webapp/ 
This will install the dependencies of the webapp/ folder first and then
overwrite the package.json to use different scripts. If we would track
dependencies in a separate package.json we would have to update it
with dependabot. We don't want that because of our precious build
server time.
 2019-09-11 08:43:26 +02:00
roschaefer
5804b1352c Remove old docker files 2019-09-11 08:43:26 +02:00
roschaefer
d6b7374ddb Change strategy, only build docker image 
I couldnt' get the local build to run with the alternative
`nuxt.config.js`. So I'm building docker only now.
 2019-09-11 08:43:26 +02:00
roschaefer
61e583e31b Translatable, mobile-responsive maintenance page 2019-09-11 08:43:26 +02:00
mattwr18
04113a1d60
Merge pull request #1516 from Human-Connection/remove_nodemon 
Remove nodemon, use `nuxt` cli tools
 2019-09-11 08:39:56 +02:00
mattwr18
9487d0491e
Merge pull request #1546 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.3.0 
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /webapp
 2019-09-11 08:22:04 +02:00
mattwr18
e7cbdb4adc
Merge pull request #1545 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.3.0 
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /backend
 2019-09-11 08:21:46 +02:00
Wolfgang Huß
379f7d1ed7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 
# Conflicts:
#	webapp/components/Comment.vue
#	webapp/components/CommentForm/CommentForm.spec.js
#	webapp/components/CommentForm/CommentForm.vue
#	webapp/components/EditCommentForm/EditCommentForm.vue
#	webapp/store/editor.js
 2019-09-11 07:58:40 +02:00
dependabot-preview[bot]
1239071fab
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.2.0...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-11 04:20:54 +00:00
dependabot-preview[bot]
99c9d0d45e
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.2.0...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-11 04:20:41 +00:00