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
6,417 Commits 117 Branches 1,511 Tags
Commit Graph

6417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
7f2adfaa9e Add back missing locale to type User 2019-10-18 15:20:06 +02:00
mattwr18
ddf8b657be Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 15:17:03 +02:00
Alexander Friedland
c819edc293
Merge pull request #1927 from Human-Connection/Set_and_save_language_in_user_settings 
Language will be saved in the database of the user during registration
 2019-10-18 15:11:04 +02:00
mattwr18
be0c8044e8 Return pinnedAt date from pinPost resolver/clean up 
- it's good to return the pinnedAt date for ordering
- move test to a better describe block
- remove unneeded outdated variables from graphql/PostQuery UpdatePost
- fix indentation in Post.gql
- fix pinnedAt to return pinned.createdAt, not post.createdAt

Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-10-18 15:10:26 +02:00
Alexander Friedland
f6e87b87ff
locale 
change language to locale
 2019-10-18 12:54:55 +02:00
Alexander Friedland
1fce840efb
locale 
change language to locale
 2019-10-18 12:16:32 +02:00
Alexander Friedland
a6108f6a00
locale 
change language to locale
 2019-10-18 12:15:21 +02:00
Alexander Friedland
abaa9b7759
locale 
change language to locale
 2019-10-18 12:14:11 +02:00
Alexander Friedland
713feb4347
locale 
change language to locale
 2019-10-18 12:13:01 +02:00
Alexander Friedland
6d1bf2c3e8
locale 
change language to locale
 2019-10-18 12:10:44 +02:00
Alexander Friedland
3346048e3e
locale 
change language to locale
 2019-10-18 11:53:29 +02:00
Alexander Friedland
0b5c1f831d
locale 
change language to locale
 2019-10-18 11:52:48 +02:00
Alexander Friedland
bfb3923023
locale 
change language to locale
 2019-10-18 11:50:42 +02:00
Alexander Friedland
18fe54e095
Update Registration.js 
change language to locale
 2019-10-18 11:49:14 +02:00
mattwr18
6d63434751
Merge pull request #1951 from Human-Connection/update-version-to-0.1.5 
Update to version 0.1.5
 2019-10-18 11:39:20 +02:00
mattwr18
bb053afcad Update to version 0.1.5 2019-10-18 11:05:34 +02:00
mattwr18
411bbabcd5 Add profilePagePostsQuery to deal with bug 
- we do not want to add pinnedPosts to every user's profile page
 2019-10-18 00:42:44 +02:00
mattwr18
b45fd51d15 Pin post on user profile as well 2019-10-18 00:13:01 +02:00
mattwr18
b800c7d5c9 Resolve pinnedAt undefinedToNull, clean up 
- this was causing the noftications to break since they were using the
post fragment and pinnedAt was returning null
- remove unused bits of code
- revert changes to cypress since they were not causing the error
- can be changed in another PR
 2019-10-18 00:01:46 +02:00
mattwr18
8b27250393 Fix vue warning webapp, try to find source of cypress failure 
- clean up
 2019-10-17 22:44:44 +02:00
mattwr18
973912fb87 Add tests for unpinPost, refactor 
- following @roschaefer's PR review suggestions
- simplify UpdatePost by using pinPost/unpinPost
- did not remove filtering because attempting to have two queries caused
problems as well to do with duplicate records, etc... and it's working
now
 2019-10-17 21:51:41 +02:00
roschaefer
3e04b26068 Add styling to pinned post 2019-10-17 17:56:16 +02:00
mattwr18
cbeecce775 Prefer persistent pinnedPost filter in backend 2019-10-17 17:56:16 +02:00
mattwr18
f871df02ae Start setting up frontend pinning/unpinning 
- Add pin/unpin post to content menu
- Update apollo cache to reactively unpin
- Update apollo cache in root path to re-order Posts
- Order with pinned post first
- Start setting up filters, so that the pinned post is always the first
post visible
 2019-10-17 17:56:16 +02:00
mattwr18
36f6be9e36 Support unpinning Post 2019-10-17 17:56:16 +02:00
mattwr18
dd55d11739 Add backend test for PostOrdering 2019-10-17 17:56:16 +02:00
mattwr18
f1243c6df0 Add createdAt attribute to PINNED and test 2019-10-17 17:56:16 +02:00
mattwr18
0007533b8c Add tests that admin can pin anyone's post/limit 1 pinned post 2019-10-17 17:56:16 +02:00
mattwr18
64f9d02c1a Start refactoring backend to pin posts on update 
- we want to give the admins the ability to create posts, then pin them
later, or pin other admins posts, etc...
 2019-10-17 17:56:15 +02:00
aonomike
56d88d6e84 Resolve failing test 2019-10-17 17:56:15 +02:00
aonomike
ab06e8a91f Add relationship for pinned posts and user 
- The CreateUser mutation now returns the user who pinned a post and so we can see the user who pinned the post
 2019-10-17 17:56:15 +02:00
mattwr18
774581f2e0 Allow admins to create a post as pinned 
- at the moment, it is created as a property of Post, but will be
refactored to create a relationship[:PINNED] from the admin to the Post

- Co-authored-by: kachulio1 <jngugi88@gmail.com>
 2019-10-17 17:56:15 +02:00
mattwr18
227239cc8b
Merge pull request #1917 from Human-Connection/dependabot/npm_and_yarn/dotenv-8.2.0 
build(deps-dev): bump dotenv from 8.1.0 to 8.2.0
v0.1.5 		2019-10-17 16:46:24 +02:00
mattwr18
3f2d476cf9
Merge pull request #1941 from Human-Connection/1311-fix-vue-errors 
Fix vue errors for Contribution form
 2019-10-17 16:45:27 +02:00
Robert Schäfer
613de33bbb
Merge pull request #1940 from Human-Connection/update-email-to-hyphenate 
Follow @alina-beck and @Tirokk PR suggestions
 2019-10-17 16:16:25 +02:00
Vasily Belolapotkov
20d9ba2439 wrap user component with client-only 2019-10-17 16:45:09 +03:00
Wolfgang Huß
4a2f8edb9e
Merge pull request #1926 from Human-Connection/1924-moderators-reports-list-sort-desc 
🍰 Add Cypher statement for ordering
 2019-10-17 14:28:47 +02:00
mattwr18
5505deee79
Follow @alina-beck and @Tirokk PR suggestions 2019-10-17 12:44:30 +02:00
Robert Schäfer
56b7aa6d0a
Merge pull request #1925 from Human-Connection/better-truncate-comments 
Improved comment truncation
 2019-10-17 12:21:43 +02:00
Robert Schäfer
ea1b9d6e1e
Merge pull request #1911 from Human-Connection/typo 
fix: typo in German translation
 2019-10-17 12:18:01 +02:00
Wolfgang Huß
72290e1c8a Add ascendant ordering as enum to ReportOrdering 2019-10-17 10:16:27 +02:00
Wolfgang Huß
681733bb0f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1924-moderators-reports-list-sort-desc 2019-10-17 10:05:13 +02:00
dependabot-preview[bot]
5b25240aed
build(deps-dev): bump dotenv from 8.1.0 to 8.2.0 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.1.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-17 08:04:54 +00:00
ppelegrin
3d88e532f9
Merge pull request #1923 from Human-Connection/dependabot/submodules/styleguide-d46fc15 
build(deps): bump styleguide from `808b3c5` to `d46fc15`
 2019-10-17 10:04:28 +02:00
ppelegrin
48cfc017ea
Merge pull request #1921 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.5.0 
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /webapp
 2019-10-17 10:03:38 +02:00
ppelegrin
76a22af46d
Merge pull request #1915 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.5.0 
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /backend
 2019-10-17 10:02:58 +02:00
Alexander Friedland
cca1e2c04a
remove change 2019-10-17 09:44:26 +02:00
Alexander Friedland
8fd1bb28ef
Merge pull request #1935 from Human-Connection/1932-use-filename-for-cropped-images 
Maintain filename for cropped images
 2019-10-17 09:40:03 +02:00
ogerly
54465c04a3 Fix Jest tests 2019-10-17 08:26:15 +02:00
mattwr18
d62ee23f2a Create new File with blob 
- maintain filename
- reduce image size
 2019-10-16 17:20:35 +02:00