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

2667 Commits

Author SHA1 Message Date
mattwr18
6d83299e75 Extract component, start story, styling (wip) 2020-03-18 19:46:40 +01:00
roschaefer
79fbdd7734 refactor: Avoid store use query parameters+routing 2020-03-18 16:02:15 +01:00
Alina Beck
7a818a04a7 refactor and design search results page (wip) 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
Co-authored-by: Raphael Beer <raphael.beer@protonmail.com>
 2020-03-18 14:33:01 +01:00
ogerly
1bf57cbf58 sorting result in users and posts 2020-03-17 06:15:48 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043) 
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2020-03-16 15:32:19 +01:00
ogerly
bba5a09ba9 search query extended to categories, sorting of results, first graphical display 2020-03-15 10:11:16 +01:00
ogerly
cbacbec724 feat: search on a new search page 2020-03-14 07:21:22 +01:00
Raphael Beer
7df4432601
Fix: named slot scopes 2020-03-13 00:09:33 +01:00
Raphael Beer
d465e94596
Refactor: use #shorthand for default v-slot attributes 2020-03-12 23:49:27 +01:00
Raphael Beer
5626cb2771
Revert "Refactor: replace default slots" 
This reverts commit f1e308074bc33e6762431f90f335ed849776f4d9.

  Let's take this one at a time...
 2020-03-12 23:49:01 +01:00
Raphael Beer
c3cf682fdf
Refactor: replace default slots 2020-03-12 23:49:01 +01:00
Raphael Beer
d90e4c2aa8
Refactor: replace named slots 2020-03-12 23:49:00 +01:00
Robert Schäfer
066506838f
Merge pull request #3219 from Human-Connection/2823-zero-bell-to-all-notifications-page 
feat: zero bell to all notifications page [2823]
 2020-03-10 13:01:38 +01:00
Alexander Friedland
404713a8ad
Merge branch 'master' into 17-Admin-Remove-user-profile 2020-03-09 14:25:37 +01:00
ogerly
2843635acb delete DeleteUserModal.specs.js 2020-03-06 10:24:28 +01:00
ogerly
7700865692 feat: Style change DeleteUserModal.vue display userdata overview 2020-03-06 09:04:03 +01:00
ogerly
a1114a8a83 feat: additional confirm inserted before really deleting 2020-03-06 08:09:38 +01:00
Raphael Beer
f3d2d35b26
Change: only attempt to style .main-navigation, if it exists 2020-03-05 12:03:11 +01:00
Raphael Beer
f3a7c10e8a
Fix: content shift when y-scrollbar disappears 2020-03-05 12:03:11 +01:00
Raphael Beer
8ffda5e908
Fix: linting, integration tests 2020-03-05 12:02:12 +01:00
Raphael Beer
d5cbfb142f
Change: remove counter from link to /notifications 2020-03-05 12:02:11 +01:00
Raphael Beer
be6c737452
Change: render link to /notifications when no new notifications 2020-03-05 12:02:08 +01:00
ogerly
26a547cdaf test: add propsData 2020-03-05 09:21:35 +01:00
ogerly
ee06039982 test: Added Spec for DeleteUserModal 2020-03-05 09:12:46 +01:00
ogerly
127ddcc77a deleteUserModal style changed, deleteData is no longer included 2020-03-05 08:20:37 +01:00
ogerly
9ab2d8395f feat: DeleteUser for Admin added in the profile dropdown menu, deleted from the Admin user overview 2020-03-04 16:23:00 +01:00
Alina Beck
21eae3dcd2 refactor ribbon css 2020-02-24 22:22:51 +01:00
ogerly
fdc0f492ad stepstep 2020-02-23 17:36:23 +01:00
ogerly
25b7f169e3 feature: add New Moadal - deleteUserModal 2020-02-23 06:38:22 +01:00
Robert Schäfer
e164104791
Merge pull request #3075 from Human-Connection/3074-don’t-expose-all-properties-of-report 
feat: 🍰 Expose sensitive report type to moderators only
 2020-02-21 12:43:28 +01:00
roschaefer
9b2175786e Fix client-only warning 2020-02-20 15:47:47 +01:00
roschaefer
9241305d43 fix: Prever FileReader over URL.createObjectUrl 
Apparently, URL.createObjectUrl is not supported in JSDom, see:
https://github.com/jsdom/jsdom/issues/1721

With FileReader we have the option to avoid it altogether.
 2020-02-20 15:42:47 +01:00
roschaefer
9c98e30bb8 Fix console.errors 
@mattwr18 @alina-beck there seems to be no switch or configuration to
let vue-test-utils or jest fail whenever there is a call to
`console.error`. The only way to test it for very specific tests is
this. I took it from here:

https://geedew.com/catching-prop-validation-in-vue-with-Jest/
 2020-02-20 14:20:57 +01:00
Wolfgang Huß
82f3eb2a29 Delete comments 2020-02-20 11:09:43 +01:00
Wolfgang Huß
4bd7f61fcc Refactor GQL schema, resolvers and moderators report list 
- Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-20 10:35:37 +01:00
Wolfgang Huß
a84d78e3ee Fix key doubling error in ReportTable.vue 
- Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-20 10:23:24 +01:00
Alina Beck
701564c708 Merge branch 'master' into migrate-styleguide-card 2020-02-20 00:37:07 +01:00
mattwr18
8a2b1d00b4
Merge pull request #3093 from Human-Connection/3004_Remove_Hover_Menu_from_User_Teaser 
fix(frontend): Remove Hover Menu from User Teaser
 2020-02-19 22:34:10 +01:00
Alina Beck
4a17cf0e07 move deleteImage logic to ImageUploader 2020-02-19 15:55:10 +01:00
Alina Beck
888051a6ae simplify formData in ContributionForm 2020-02-19 14:18:54 +01:00
Wolfgang Huß
3421afe4e0 Refactor tests, next step 2020-02-19 13:33:00 +01:00
Alina Beck
e38b6f9625 rename TeaserImage component to ImageUploader 2020-02-19 10:51:04 +01:00
roschaefer
f2e2db0bc7 fix(frontend): error when post.author null 2020-02-19 10:49:08 +01:00
Alina Beck
7d7b35d069 combine duplicate image uploader methods after merge 2020-02-19 10:46:27 +01:00
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +01:00
Robert Schäfer
523f6915de
Merge pull request #2585 from Human-Connection/1188-Delete_teaser_image 
🍰feat: Delete teaser image
 2020-02-18 22:50:33 +01:00
mattwr18
44652a34a7 Merge in master/refactor 
- Add cypress test for DeleteImage
- remove unnecessary ref and function call
- use tokens
- simplify logic to showDeleteImageButton
- emit event when cropInProgress
 2020-02-18 18:50:02 +01:00
Alina Beck
cca9ec8e81 avatar image spans 100% width and height 2020-02-18 16:17:27 +01:00
mattwr18
6f6b1534df Reload page to add Category button 
- I believe the cypress test is so fast that we visit the post/create
  page before the relationship CATEGORIZED is added, and therefore, we
must refresh the page.
- I am not happy about this solution, but I'm not sure what we can do...
  maybe wait for the post to be succesfully created with all it's
relationships?
 2020-02-18 13:33:34 +01:00
Alina Beck
e68b53eda2 add title to counter icons on PostTeaser 2020-02-18 10:25:42 +01:00