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
10,123 Commits 5 Branches 2 Tags
Commit Graph

3556 Commits

Author SHA1 Message Date
Robert Schäfer
3f00140220
Merge pull request #1041 from Human-Connection/822_fix_load_more_button 
Fix #822 by updating the counts of the user
 2019-07-16 00:45:01 +02:00
Matt Rider
c7dc2f6a5c Hide CommentForm when an edit is in progress 
- Follow @Tirokk PR review
 2019-07-15 19:09:33 -03: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
2dca04523d Remove key request in badge queries 
- clean up from `PR` which uses id, not key
 2019-07-15 15:04:19 -03:00
Matt Rider
a91ddd22b7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 14:47:36 -03: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
Robert Schäfer
417500eb3e
Merge pull request #1043 from Human-Connection/silence_codecov 
Silence codecov
 2019-07-15 17:38:42 +02:00
Robert Schäfer
9199458cbb
Merge pull request #1047 from Human-Connection/dependabot/npm_and_yarn/webapp/linkify-it-2.2.0 
Bump linkify-it from 2.1.0 to 2.2.0 in /webapp
 2019-07-15 17:36:50 +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
Matt Rider
bb4532827a Refactor search input, navbar 
- fix search input width on desktop
- removed adding removing classes on focus/blur search input
- fix notifications dropdown on mobile

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:20:28 -03:00
Matt Rider
b0f999ac05 Fix styling of navbar 
- Follow @Tirokk suggestions

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:06:56 -03:00
Matt Rider
d42083a32e Move header to left, add border left 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 09:55:09 -03:00
Alina Beck
7217bb37a4 avoid duplicate social media urls 2019-07-15 13:30:40 +02:00
Robert Schäfer
fa024ac47a Sledgehammer the file permission problem on docker 
NuxtJS wants to write into .nuxt. If the docker container writes into
.nuxt it will have the file permissions of the docker container user
even on the host system. So on the host system you cannot remove the
folder .nuxt anymore. This gets in the way of running NuxtJS on the host
system.
 2019-07-15 13:14:40 +02:00
Alina Beck
b633273ddd refactor social media component 2019-07-15 12:50:56 +02:00
Wolfgang Huß
6430c9e1bf Comment can notify a Mention of a User in the database 
Frontend notification is still missing.
 2019-07-15 09:42:24 +02:00
Wolfgang Huß
5aec13caa1 Refactored avoiding Hashtags in Comments 2019-07-15 09:03:09 +02:00
Wolfgang Huß
2c9855e584 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-07-15 08:30:10 +02:00
dependabot-preview[bot]
5360038ac0
Bump linkify-it from 2.1.0 to 2.2.0 in /webapp 
Bumps [linkify-it](https://github.com/markdown-it/linkify-it) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/markdown-it/linkify-it/releases)
- [Changelog](https://github.com/markdown-it/linkify-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/linkify-it/compare/2.1.0...2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 04:26:52 +00:00
Robert Schäfer
5bde0ab036 No global codecov install, less verbose CI output 2019-07-14 01:45:38 +02:00
Robert Schäfer
1ec26ccdb5
Merge pull request #968 from Human-Connection/878-Update-of-polish-locales 
polish language on current status
 2019-07-14 00:00:14 +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
mattwr18
4c91d8fbc5
Merge pull request #1016 from Human-Connection/277_reward_badges 
Refactor reward/unreward Badges in backend
 2019-07-13 10:08:52 -03: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
Matt Rider
cc61dac818 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-12 10:50:14 -03:00
Robert Schäfer
88ef6c00f2 Display "no users found" for empty user list 2019-07-12 15:47:22 +02:00
Matt Rider
c7094d82b8 Fix styling, follow @Tirokk suggestions 2019-07-12 10:37:27 -03: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
e83aa5c921 Typo: .main-container was missing bottoM padding 
FYI: @ogerly
 2019-07-12 12:45:32 +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
dependabot-preview[bot]
c648d62288
[Security] Bump lodash from 4.17.11 to 4.17.14 in /webapp 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 10:32:28 +00:00
Matt Rider
2e97af074c Remove duplicate code 
- was silly for writing so much duplicate code to change the index of the array
- woke up with inspiration
 2019-07-11 07:10:57 -03:00
dependabot-preview[bot]
6fd166deca
[Security] Bump lodash.template from 4.4.0 to 4.5.0 in /webapp 
Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.4.0...4.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 01:42:34 +00:00
Matt Rider
b6dcafcc2b Fix linting 2019-07-10 18:52:23 -03:00
Matt Rider
79930dcdc4 Refetch posts when a user clicks on the HC logo 2019-07-10 18:44:07 -03:00
Matt Rider
6536574a3b Refactor FilterPosts 
- extract FilterPostsMenuItems to its own component
- update tests accordingly
- add _.chunk from lodash to dry out code
 2019-07-10 17:10:01 -03: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
Wolfgang Huß
1255a46b7a Avoid Hashtags in Comments in the Editor 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-10 18:35:19 +02:00
Robert Schäfer
9a72e7b9e6 Proper null handling 
FYI @mattwr18
 2019-07-10 18:01:18 +02:00
senderfm
1fa4e75b07 merge origin 2019-07-10 17:26:02 +02:00
senderfm
acebf94b83 fix lint error 2019-07-10 17:20:08 +02:00
Alina Beck
a586bc450c update link in store 2019-07-10 16:22:46 +02:00
Alexander Friedland
4fd47bc258
Merge branch 'master' into 878-Update-of-polish-locales 2019-07-10 15:54:59 +02:00
Alina Beck
8847f071fd update social media links in database 2019-07-10 15:16:28 +02:00