ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,450 Commits 113 Branches 1,511 Tags
Commit Graph

255 Commits

Author SHA1 Message Date
Wolfgang Huß
b5bd77b539 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1000_find_users_by_email_address 
# Conflicts:
#	webapp/layouts/default.vue
 2019-07-16 08:44:42 +02:00
Robert Schäfer
b97f7e464f
Merge pull request #969 from Human-Connection/967-filter-post-by-category 
Filter posts by category
 2019-07-16 00:50:56 +02:00
Robert Schäfer
2736738c36 Fix @Tirokk's suggestions 
Wow @Tirokk that was a good catch! I thought that the emitting side
knows the `index`, but no, it only emits `removePostFromList` and that's
it. In order to delete the right post, we have to pass in the `index`
ourselves. So, the caller of the function is the page component itself.

I didn't see the error myself, because in Javascript if you parse
`undefined` or `null` as Integer, you get 0 and it does not raise an
error.
 2019-07-15 18:26:23 +02:00
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00
Robert Schäfer
585e798dc0 Fix #822 by updating the counts of the user 
The load more button depends on the total of the posts available.
Removing posts changes the total counts, so we have to manually update
it.
 2019-07-13 23:57:14 +02:00
Robert Schäfer
99740e6ad6 Follow @Tirokk's suggestion and rename key=>id 2019-07-13 14:27:19 +02:00
Robert Schäfer
5da5b8658e Display creation date in user view 2019-07-13 14:14:21 +02:00
Robert Schäfer
f9969b964c Implement conditional filtering 2019-07-13 14:07:51 +02:00
Robert Schäfer
88ef6c00f2 Display "no users found" for empty user list 2019-07-12 15:47:22 +02:00
Robert Schäfer
4d10b7aece Basic email filtering on admin/users page 2019-07-12 15:37:13 +02:00
Robert Schäfer
3f0afa0834 Localise placeholder 2019-07-12 13:12:24 +02:00
Robert Schäfer
ed8605875e Adding input field 
Note: Apparently there is a nasty side-effect when you combine `loading`
and `disabled`. The `disabled` flag gets overridden, if `loading` is
false.
 2019-07-12 02:24:03 +02:00
Robert Schäfer
08a5a70fd0 Fine tuning of admin users page 2019-07-12 01:24:09 +02:00
Robert Schäfer
8b1d92ee7e Implement pagination without a total count 
This is necessary, because once we filter the collection, the
`countUsers` is not valid anymore.
 2019-07-12 00:43:17 +02:00
Robert Schäfer
095a5e7c67 Id is not so important, it's in the profile URL 2019-07-10 21:49:15 +02:00
Robert Schäfer
448f350c2e Implement paginating user view for admins 2019-07-10 21:45:37 +02:00
Robert Schäfer
95a06a8344 Refactor all badges resolvers to use neode 
FYI: @Tirokk I think we'll never remove or add new badges through
graphql. Instead, we will seed them manually with direct access to the
database. Therefore I removed the respective mutations and also your
tests regarding permissions.
 2019-07-10 14:36:42 +02:00
Matt Rider
0113751003 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-10 07:09:58 -03:00
Robert Schäfer
e6e9b1b7d7
Merge pull request #994 from Human-Connection/signup_as_admin 
Signup new users as admin
 2019-07-10 11:46:50 +02:00
Alexander Friedland
6703b54b0e
Merge pull request #999 from Human-Connection/381-footer 
footer created imprint and all language ok
 2019-07-10 06:40:36 +02:00
Robert Schäfer
65679d417d Move page components into single file 
+ Spice it up a little by translating the page component's title.
 2019-07-10 01:25:34 +02:00
Robert Schäfer
813a6b5c50 Subpages of registration/ must be unauthenticated 2019-07-09 22:12:40 +02:00
Robert Schäfer
29bbeaa0fa Fix tests by calling wrapper.html() once more 
I really don't understand why, but apparently `wrapper.html()` does some
re-rendering which in our cases fixes the tests, because we reach the
new sub component in the DOM tree.
 2019-07-09 22:12:40 +02:00
Robert Schäfer
d76923c471 Copy all relevant files changed from branch signup 2019-07-09 22:12:40 +02:00
Matt Rider
fdde050f17 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-09 13:29:23 -03:00
Matt Rider
c7959dadb7 Refactor code 
- Remove vuex as we don't need with vue-apollo and watch
- Use chunk[i] instead of firstGroup, etc...
- Extract Category query to its own file
- Mobile responsive categories dropdown
 2019-07-09 13:00:08 -03:00
Robert Schäfer
6f24f066d6 Revert "Get rid of obsolete /search/hashtag page" 
This reverts commit ec19c732e5678544d8dfd50c25f2c33e5aeb217e.

Ok, native module URL cannot parse relative URLs. It ensures that all parts
of the URL are present. So I'll revert this to get the ball rolling. We
can refactor out the obsolete page later on.

FYI @Tirokk
 2019-07-09 14:39:28 +02:00
senderfm
48454dda56 fix review, page conditions of use in german and english ok 2019-07-09 10:59:21 +02:00
senderfm
f2d0cd1f6a footer created, new pages, imprint, terms and conditions, history, privacy policy, imprint created and languages adapted 2019-07-09 10:00:45 +02:00
Robert Schäfer
ec19c732e5 Get rid of obsolete /search/hashtag page 
@Tirokk there is this neat URL module: https://nodejs.org/api/url.html

It has convenience methods for adding query params. I'm just not quite
sure about browser compatibility though.
 2019-07-08 23:10:46 +02:00
Matt Rider
3b6db5f631 Set up posts in store, get working from FilterPosts 
- also, set it up to be mobile responsive
 2019-07-05 12:47:44 -03:00
Matt Rider
65f11d6f98 Add functionality to filter posts by category 
- only filters if you send two requests :'(
 2019-07-04 20:32:16 -03:00
Wolfgang Huß
1c8dac7359 Get the links of the Tags in the Post as a URL driven query to work 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-04 19:55:06 +02:00
Matt Rider
1c1a390d0c Refactor code to extract query to it's own file 2019-07-02 18:38:41 -03:00
Matt Rider
f302961376 Get categories working with UpdatePost, refactor 2019-07-01 18:00:55 -03:00
Matt Rider
2baaf85b21 Extract TeaserImage component, refactor tests 2019-06-25 20:49:09 -03:00
Matt Rider
145f488556 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-25 09:41:40 -03:00
Robert Schäfer
90fe507791 Page size of 12 entries on / page 
It annoys me that there are gaps for the 3 column layout, even if there
are more records left. So, the newsfeed layout has 1 column on mobile, 2
columns on tablet, and 3 columns on a desktop pc. So we should choose a
page size which is dividable by 1,2 and 3 that is 6. I have chosen 12
which is 2*6 to avoid clicking the reload posts button so often.
 2019-06-24 21:28:06 +02:00
Matt Rider
9cbeacea64 Update test to use filters 2019-06-21 19:00:02 -03:00
Matt Rider
bbeb61e1eb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-21 18:51:34 -03:00
Matt Rider
6367d226ff Styling, tweak to work with edit and create 2019-06-21 13:16:18 -03:00
Robert Schäfer
9723bb12e3 Merge branch 'master' into 801_reset_password 2019-06-21 13:59:45 +02:00
Matt Rider
d2d692ec8f Get working with edit contribution, styling 2019-06-20 22:47:31 -03:00
Matt Rider
be70088dd7 Get imageUpload working for Posts 2019-06-20 17:05:47 -03:00
Matt Rider
7d9e6623ea Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-20 12:28:26 -03:00
Robert Schäfer
ff46740e90 Follow @mattwr18 suggetions don't enter mail twice 2019-06-20 15:13:22 +02:00
Ulf Gebhardt
0c3e53a239
Merge pull request #836 from Human-Connection/835-use-vuex-to-make-editor-placeholder-reactive 
Set up editor placeholder to use Vuex
 2019-06-19 14:59:17 +02:00
Robert Schäfer
c85c94aa40 Splitting components, better route navigation 
This also allows us to generate a password reset link to quickly reset
your password without entering the code and email manually.
 2019-06-19 14:23:22 +02:00
Robert Schäfer
a7eced5f8e Redirect to `/' if user is authenticated 2019-06-19 13:40:08 +02:00
Robert Schäfer
217c905800 Merge remote-tracking branch 'origin/master' into 801_reset_password 2019-06-19 13:26:13 +02:00