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

284 Commits

Author SHA1 Message Date
Robert Schäfer
a6f5fe8ea3 Rename privacy->data-privacy 2019-08-05 23:19:20 +02:00
ogerly
330b2fb590 edit layout default for gasts 2019-08-05 23:19:20 +02:00
Robert Schäfer
4b2a1d93f5 Refactor code-of-conduct 
* Add link in footer
* DRY template
* Structure translations into sections with a telling name
* Fix typos and links
 2019-08-05 22:56:36 +02:00
Robert Schäfer
56100010ec DRY template, restructure translations 2019-08-05 22:56:36 +02:00
ogerly
80d80f9c61 change add v-html, fixed lint 2019-08-05 22:56:36 +02:00
ogerly
29dc306187 add page code-of-conduct, english and german 2019-08-05 22:56:36 +02:00
Robert Schäfer
49acea9767 Improve changelog and translations 
* remove unnecessary markup
* remove manual translations of dates (we have a helper for that)
* fix typos and English translations
 2019-08-05 20:45:40 +02:00
ogerly
aba21a9c70 changes and history template, english, german 2019-08-05 09:26:51 +02:00
Matt Rider
8d7c55c97d Use a link's username, open separate window on click 2019-08-01 07:34:52 +02:00
Wolfgang Huß
0dad956c28
Merge pull request #1063 from Human-Connection/375-Sorting-II 
375 sorting (II)
 2019-07-31 14:49:37 +02:00
Matt Rider
88a14ebd4f Add tests, fix typo 2019-07-23 10:55:07 -03:00
Alina Beck
d1cb72b9a0 disable save button when link has not been changed 2019-07-23 14:51:45 +02:00
Alina Beck
fcc6a4a084 center arrow icon in list 2019-07-23 14:48:28 +02:00
Alina Beck
ee43d4aaa7 refactor frontend tests 2019-07-23 14:25:52 +02:00
Matt Rider
c8a6792627 Add parent class for css selector on cypress/component 2019-07-22 06:50:58 -03:00
Matt Rider
5fb89fd45c Merge branch 'master' of github.com:Human-Connection/Human-Connection into refine-social-media 2019-07-17 07:23:29 -03:00
ogerly
47324d4905 example II - lint ok, test local ok 2019-07-17 09:57:08 +02:00
Alina Beck
972425fb09 fix lint errors 2019-07-16 14:00:30 +02:00
Alina Beck
05b6c63006 add component tests 2019-07-16 12:01:10 +02:00
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
Alina Beck
7217bb37a4 avoid duplicate social media urls 2019-07-15 13:30:40 +02:00
Alina Beck
b633273ddd refactor social media component 2019-07-15 12:50:56 +02: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
Alina Beck
a586bc450c update link in store 2019-07-10 16:22:46 +02:00
Alina Beck
8847f071fd update social media links in database 2019-07-10 15:16:28 +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
Alina Beck
22c673f47e allow to cancel editing link 2019-07-10 12:57:43 +02:00
Alina Beck
d200b822db display input in list when editing 2019-07-10 12:52:03 +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
Alina Beck
0275971381 disable submit button for invalid input 2019-07-09 19:30:39 +02:00