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

875 Commits

Author SHA1 Message Date
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
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
Matt Rider
c7094d82b8 Fix styling, follow @Tirokk suggestions 2019-07-12 10:37:27 -03: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
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
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
Robert Schäfer
238d6b98de
Merge pull request #1013 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.5.4 
Bump @babel/preset-env from 7.4.5 to 7.5.4 in /webapp
 2019-07-10 11:04:50 +02:00
Robert Schäfer
b7b47e4dde
Merge pull request #1007 from Human-Connection/remove_right_padding 
Follow up of #958
 2019-07-10 11:04:23 +02:00
dependabot-preview[bot]
7a2eb2a026
Bump @babel/preset-env from 7.4.5 to 7.5.4 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:50:37 +00:00
Robert Schäfer
049f19043f
Merge pull request #1010 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.5.4 
Bump @babel/core from 7.5.0 to 7.5.4 in /webapp
 2019-07-10 08:48:15 +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
dependabot-preview[bot]
db4122da09
Bump @babel/core from 7.5.0 to 7.5.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:24:01 +00:00
Robert Schäfer
d90bb90d0c Follow up of #958 
I think I deleted the styling by using bot `:width` and `style`
property. I'm not quite sure if this resolves our problem. Anyways
I don't see a reason for having a right padding so I just removed it.
 2019-07-10 02:11:12 +02:00
Robert Schäfer
54947b113d
Merge pull request #958 from Human-Connection/984-minimum-size-of-body 
🐛 [Bug]  full ads width use with small devices
 2019-07-10 02:00:29 +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
310cc52ddf Don't remove the previous styling 2019-07-10 01:23:36 +02:00
Robert Schäfer
ce397b6746 Fix English locale 2019-07-10 00:03:26 +02:00
Robert Schäfer
17743043ca Always prefer <nuxt-link> over <a> 
@ogerly, if we link into another page of our application, we should
always use `nuxt-link`. It is a feature of NuxtJs and it does
prefetching, among other things. So it improves the performance of
our site!
 2019-07-09 23:35:34 +02:00
Matt Rider
1399da8b70 Add router callback, clear searches on logo click 2019-07-09 18:35:27 -03:00
Matt Rider
0d4617399b Fix/add tests 2019-07-09 18:29:31 -03:00
Robert Schäfer
4b308886ff
Merge pull request #976 from Human-Connection/961-thumbnail-for-the-contributions-must-get-a-maximum-height 
large images are set to maximum height
 2019-07-09 23:21:27 +02:00
Robert Schäfer
4b09284011 Merge remote-tracking branch 'origin_https/master' into 984-minimum-size-of-body 2019-07-09 22:52:58 +02:00
Robert Schäfer
4207aee09d DRY up password validations 2019-07-09 22:12:40 +02:00
Robert Schäfer
47a9d38790 Consistency for email success messages 2019-07-09 22:12:40 +02:00
Robert Schäfer
90aa1822b5 Disable the form button with a slot scope 2019-07-09 22:12:40 +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
Wolfgang Huß
458229eb77
Merge pull request #848 from Human-Connection/779-tags-of-contribution-in-text 
Tags in the Text of a Contribution like Mentions
 2019-07-09 16:47:17 +02:00
Robert Schäfer
5342f0d435
Merge pull request #995 from alina-beck/update-docs 
Update docs
 2019-07-09 15:19:52 +02: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
Matt Rider
014de3b97b Destructure category from result 2019-07-09 07:58:15 -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
Robert Schäfer
8303febc80 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-07-08 23:51:56 +02:00
Robert Schäfer
f36333c8ce
Merge pull request #985 from Human-Connection/dependabot/docker/webapp/node-12.6-alpine 
Bump node from 12.5-alpine to 12.6-alpine in /webapp
 2019-07-08 23:47:36 +02:00
Robert Schäfer
21054c9858
Merge pull request #983 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.7.2 
Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in /webapp
 2019-07-08 23:46:54 +02:00
Robert Schäfer
8aa61cf1b0
Merge pull request #980 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.5.0 
Bump @babel/core from 7.4.5 to 7.5.0 in /webapp
 2019-07-08 23:45:54 +02:00
Robert Schäfer
7c3008a72d
Merge pull request #978 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-2.2.1 
Bump eslint-loader from 2.2.0 to 2.2.1 in /webapp
 2019-07-08 23:45:10 +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
Robert Schäfer
20c118eab1 Prefer nuxt-link component over events 
@Tirokk I believe the Logo should also reset the search and filter
settings. However, even the previous implementation did not behave in
that way. A click on the logo will bring you back to the index page but
it will not reset your filter settings.

I fixed this because `$router.push(...).go(...)` will certainly throw an
null pointer error.
 2019-07-08 22:54:17 +02: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
Alina Beck
1f9f7e205a remove "not required" line from webapp docs 2019-07-08 19:10:21 +02:00