IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-15 01:14:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,883 Commits 5 Branches 2 Tags
Commit Graph

135 Commits

Author SHA1 Message Date
Matt Rider
dbaa8e687f Fix vue warnings, fix tests, refactor 
- was throwing an error when trying to update commentsCount because of new implementation by @roschaefer which uses countResolver, but there was no related for commentsCount, it was r... also commentsCount is no longer needed anywhere in the code base, it is commentedCount now
 2019-08-16 13:28:55 +02:00
Alexander Friedland
048c4a2502
Merge pull request #1224 from Human-Connection/A-1208-Registration-without-user-condition-confirmation 
🍰 Registration confirmation of terms of use added II
 2019-08-14 18:09:07 +02:00
Robert Schäfer
b6c96b7a57
Merge pull request #1261 from Human-Connection/1201-localise-categories 
Localise categories
 2019-08-14 17:44:21 +02:00
roschaefer
58a7e1ce2d Simplifycomponent, improve texts 
@ogerly there is a difference between read and confirm: You can read but
don't have to confirm the terms and conditions. Therefore it's quite
important that the user also confirms the terms and conditions.
 2019-08-14 16:38:35 +02:00
mattwr18
ab6cd501fe
Merge pull request #1209 from Human-Connection/1054-blocked-users 
🍰 1054 blocked users
 2019-08-14 16:36:41 +02:00
ogerly
a5f448036c Suggestions implemented II 2019-08-14 14:27:44 +02:00
Matt Rider
ee93efd6d9 Localise categories 2019-08-14 13:57:39 +02:00
Wolfgang Huß
ab7d158b26 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 451-lokalise-unlocalised-texts-20190812 2019-08-14 08:24:29 +02:00
roschaefer
6b884d84c1 Add translations 2019-08-13 19:56:01 +02:00
Matt Rider
3eee50d952 Maintain consistent naming/punctuation conventions 2019-08-13 11:24:55 +02:00
Robert Schäfer
bc4bffdc52 Add How-To for blocking a user 2019-08-13 11:05:29 +02:00
Robert Schäfer
7f509b3201 Implement block/unbock UI 2019-08-13 11:05:29 +02:00
Robert Schäfer
824b2a5561 Implement page for blocked users 2019-08-13 11:05:29 +02:00
Wolfgang Huß
33007c6bbe
Update webapp/locales/de.json 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-08-12 20:00:54 +02:00
Wolfgang Huß
1d180480c4 Translated several texts and corrected and added some functionalities 2019-08-12 15:35:09 +02:00
Wolfgang Huß
5932d184d7 Corrected namings and countings 2019-08-12 13:27:14 +02:00
Robert Schäfer
3261237b48
Merge pull request #1169 from Human-Connection/964-filter-posts-by-followers 
Move filter by followers functionality to filter dropdown
 2019-08-09 11:57:17 +02:00
ogerly
d1830f5bed add ceckbox, confirmed terms of use 2019-08-08 17:46:04 +02:00
Matt Rider
f3dc5c6a68 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 964-filter-posts-by-followers 2019-08-06 10:31:29 +02:00
Matt Rider
9613250710 Fix German translation, mobile responsive tweak 
- follow @Tirokk's PR review suggestions
 2019-08-06 08:13:02 +02:00
Matt Rider
1593eab9cf Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-06 08:07:39 +02:00
Robert Schäfer
a67cfa88be Refactor terms-and-conditions 
* DRY template
* avoid numeric translations keys - if you can, use telling translations
keys
* fix links! @ogerly so many hrefs pointing to http://localhost:3000/...
how is that possible?
 2019-08-06 00:50:58 +02:00
ogerly
550bf2cf69 language file adapted 2019-08-06 00:37:17 +02:00
ogerly
8f67c60f73 Fix terms and conditions template, english and german 2019-08-06 00:30:18 +02:00
Robert Schäfer
a6f5fe8ea3 Rename privacy->data-privacy 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
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
ec7a5865f7 Update tests, showFilterPostsDropdown only on route 2019-08-02 15:41:19 +02:00
Matt Rider
afb9dbe241 Move filter by followers functionality to filter dropdown 2019-08-02 13:02:12 +02:00
Matt Rider
fb9a632d55 Query a currentUsers emotions for a post, translations 2019-08-01 15:11:41 +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
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
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
Alina Beck
7217bb37a4 avoid duplicate social media urls 2019-07-15 13:30:40 +02:00
Robert Schäfer
5da5b8658e Display creation date in user view 2019-07-13 14:14:21 +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
3f0afa0834 Localise placeholder 2019-07-12 13:12:24 +02:00
Robert Schäfer
08a5a70fd0 Fine tuning of admin users page 2019-07-12 01:24:09 +02:00
Robert Schäfer
448f350c2e Implement paginating user view for admins 2019-07-10 21:45:37 +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
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