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,560 Commits 5 Branches 2 Tags
Commit Graph

1539 Commits

Author SHA1 Message Date
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
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
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
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
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
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
roschaefer
5cf82d5e18 Fix build 
Here are the issues
* webapp was built with `NODE_ENV=production` but started with
`NODE_ENV=development`
* using the provided `docker-compose.travis.yml` the command `yarn run
start` would look in the wrong folder
* removed duplicate environment definition
 2019-09-11 02:22:08 +02:00
Robert Schäfer
5586a2b5ea
Merge pull request #1512 from Human-Connection/refactor_email_middleware 
Refactor email middleware
 2019-09-11 01:58:37 +02:00
mattwr18
3712a5d2cf
Merge pull request #1513 from Human-Connection/bugfix_about_me_not_saved_on_signup_verification 
Bugfix: `about me` not saved on signup
 2019-09-10 17:37:22 +02:00
roschaefer
8bf11b18aa Remove dead code 2019-09-10 16:37:13 +02:00
roschaefer
656834fa0b Remove nodemon, use nuxt cli tools 
@appinteractive can you tell me why we had the custom code in
`server/index.js`?
 2019-09-10 16:37:13 +02:00
Robert Schäfer
6cebb61d0f
Merge pull request #1490 from Human-Connection/1488-filter-posts-by-emotion 
Filter posts by emotions
 2019-09-10 15:53:05 +02:00
roschaefer
b656b5aeb9 Check that about actually gets saved 2019-09-10 15:39:34 +02:00
mattwr18
1fda99e198
Merge pull request #1540 from Human-Connection/remove_editor_store 
Remove obsolete code
 2019-09-10 15:04:46 +02:00
mattwr18
0c83d276bb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-10 09:32:45 +02:00
mattwr18
72ae2a4e44 Improve CSS 
- filter by users followed button was slightly higher than emotions
buttons
 2019-09-10 09:31:59 +02:00
mattwr18
b91fab7a3c
Merge pull request #1541 from Human-Connection/dependabot/npm_and_yarn/webapp/human-connection/styleguide-0.5.21 
Bump @human-connection/styleguide from 0.5.19 to 0.5.21 in /webapp
 2019-09-10 08:32:57 +02:00
mattwr18
1b677b6cb4
Merge pull request #1532 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.6.0 
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /webapp
 2019-09-10 08:32:29 +02:00
mattwr18
e6716302a3
Merge pull request #1529 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-jest-3.0.5 
Bump vue-jest from 3.0.4 to 3.0.5 in /webapp
 2019-09-10 08:31:45 +02:00
mattwr18
d44b515e92
Merge pull request #1527 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.1.0 
Bump date-fns from 2.0.1 to 2.1.0 in /webapp
 2019-09-10 08:31:23 +02:00
mattwr18
da359e5e71
Merge pull request #1525 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.6.0 
Bump @babel/core from 7.5.5 to 7.6.0 in /webapp
 2019-09-10 08:31:08 +02:00
Vasily Belolapotkov
fac7faf877 Sync 293-fix-follower-counter with master 2019-09-10 09:02:52 +03:00
Wolfgang Huß
fb672410f9 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-10 06:58:33 +02:00