IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,626 Commits 5 Branches 2 Tags
Commit Graph

144 Commits

Author SHA1 Message Date
Wolfgang Huß
0dad956c28
Merge pull request #1063 from Human-Connection/375-Sorting-II 
375 sorting (II)
 2019-07-31 14:49:37 +02:00
Wolfgang Huß
a542b33f79
Merge pull request #1053 from Human-Connection/refine-social-media 
🍰 Refine social media
 2019-07-29 16:08:08 +02:00
Matt Rider
88a14ebd4f Add tests, fix typo 2019-07-23 10:55:07 -03:00
Matt Rider
211508f183 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 375-Sorting-II 2019-07-22 05:42:30 -03:00
Alexander Friedland
4fe3c08402
Merge branch 'master' into 375-Sorting-II 2019-07-19 11:53:01 +02:00
ogerly
66ea9f7a55 English adapted, lint ok 2019-07-19 06:55:18 +02: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ß
75758ab2e7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 09:29:22 +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
Matt Rider
36c4a22b76 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-15 18:29:26 -03: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
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
Alexander Friedland
4fd47bc258
Merge branch 'master' into 878-Update-of-polish-locales 2019-07-10 15:54:59 +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
ce397b6746 Fix English locale 2019-07-10 00:03:26 +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
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
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
Matt Rider
737d1f839a Style categories filter dropdown, get working with multiple categories 2019-07-08 21:44:47 -03:00
Wolfgang Huß
e69f292bd8 Hashtags restricted in the chars, in Editor Suggestions and Backend 
Refactor Seeding with Tag ids as Tag names.
In Frontend: Done as a suggestion with all the forbidden chars removed.
In Backend by Regex only the fitting links.
Rewrite backend test to make sure Hashtag „id“ is the name of the Hashtag.
Test for „https://www.example.org/#anchor“

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-08 19:25:57 +02:00
Wolfgang Huß
ac17f3fe1c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 
# Conflicts:
#	backend/src/middleware/index.js
#	backend/src/schema/resolvers/passwordReset.js
 2019-07-04 20:56:14 +02: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
senderfm
07b8116447 Update of polish locales 2019-07-03 22:51:39 +02:00
Matt Rider
b187fbb7b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-03 16:30:15 -03:00
Robert Schäfer
10ae4abaae Use neode to bring User mutations under control 
This commit takes all backend changes for signup and invite feature. I
was working on these features and removed the generated mutations for
type user along the way.
 2019-07-03 15:58:42 +02:00
senderfm
0c1403dda5 fix conflict 2019-07-03 10:06:48 +02:00
Alexander Friedland
76388d4c4b
Merge pull request #908 from Human-Connection/785-reporting-a-user-post-or-comment 
the one-time reporting of a user, post or comment
 2019-07-03 08:44:19 +02:00
Robert Schäfer
cbc8fc8d83 Add missing German translations 2019-07-02 14:18:39 +02:00
Wolfgang Huß
28e4433b87 Refactoring and second approach to change the database 2019-06-28 16:47:26 +02:00
ALau2088
5e9f46405e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-06-27 10:18:53 -07:00
Matt Rider
07576d084c Get categories working with CreatePost 2019-06-26 15:59:57 -03:00
senderfm
6c7ee1ef42 das einmalige melden eines User, Beitrags oder Kommentars 
ist jetzt möglich
 2019-06-25 17:51:14 +02:00
Wolfgang Huß
58810c6add Merge branch '779-tags-of-contribution-in-text' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-06-25 08:53:47 +02:00
senderfm
a678f05574 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 844-Comments-cannot-be-expanded-if-they-are-too-long 2019-06-24 11:32:41 +02:00
Wolfgang Huß
a80320007c Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-06-24 07:47:42 +02:00
Wolfgang Huß
5018e60a13 Renamed Tag to Hashtag in the Frontend 
Not in the database yet …
 2019-06-21 14:10:56 +02:00
Robert Schäfer
9ec9034ea5 Fix translatios as suggested by @Tirokk 2019-06-20 15:25:59 +02:00
Wolfgang Huß
ffbe0b949a Translate menu item, renamed variables and tried to get hashtag to work correct 2019-06-20 08:40:05 +02:00
senderfm
d85f49fb15 Fix: long comments can be folded up and down 2019-06-19 17:45:52 +02:00