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

3734 Commits

Author SHA1 Message Date
Matt Rider
7796483a46 Add test for upload error, update variable name 2019-06-24 12:45:53 -03:00
Wolfgang Huß
8c2c731322 Backfactored as close as possible to original of Mention.js 2019-06-24 12:34:14 +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ß
1f0f8c9e39 Set Hashtag also by press space and creates then a new one 
Changed Tag permissionMiddleware from isAdmin to allow.
 2019-06-24 09:25:36 +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
Matt Rider
f551e9a637 Fix failing build due to lorempixel.com being down 2019-06-22 12:01:00 -03:00
Matt Rider
6fccece6db Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-22 08:14:14 -03:00
Robert Schäfer
3c36cad373
Merge pull request #868 from Human-Connection/867-fix-vue-warn-enableDeletionValue 
Add enableDeletionValue to unlock deletion
 2019-06-22 08:54:48 +02:00
Matt Rider
9cbeacea64 Update test to use filters 2019-06-21 19:00:02 -03:00
Matt Rider
bbeb61e1eb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-21 18:51:34 -03:00
Robert Schäfer
181b4b48e6
Merge pull request #829 from Human-Connection/2019/kw24/fix_imported_img_urls 
🍰 2019/kw24/fix_imported_img_urls
 2019-06-21 23:41:32 +02:00
Robert Schäfer
86e538f7eb Merge branch 'fix_broken_master' into 801_reset_password 2019-06-21 22:39:51 +02:00
Robert Schäfer
3076f9f455 Get rid of console.errors in tests of FilterMenu 2019-06-21 22:11:41 +02:00
Matt Rider
6367d226ff Styling, tweak to work with edit and create 2019-06-21 13:16:18 -03:00
Robert Schäfer
5125967542
Merge pull request #871 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.7.0 
Bump eslint-plugin-jest from 22.6.4 to 22.7.0 in /webapp
 2019-06-21 14:33:41 +02:00
senderfm
9ae9cdacad Fix specs, Fix lint, Fix tests 2019-06-21 14:32:59 +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
9723bb12e3 Merge branch 'master' into 801_reset_password 2019-06-21 13:59:45 +02:00
senderfm
b160fe9b5a Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 844-Comments-cannot-be-expanded-if-they-are-too-long 2019-06-21 13:11:41 +02:00
dependabot-preview[bot]
ba9092fa75
Bump eslint-plugin-jest from 22.6.4 to 22.7.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.6.4 to 22.7.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.6.4...v22.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 09:53:14 +00:00
dependabot-preview[bot]
3f8dc10fab
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.35 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.34 to 2.0.0-alpha.35.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.34...v2.0.0-alpha.35)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 04:28:28 +00:00
Matt Rider
d2d692ec8f Get working with edit contribution, styling 2019-06-20 22:47:31 -03:00
Matt Rider
51153ca870 Update test, use destructuring to clean up code 2019-06-20 18:04:21 -03:00
Matt Rider
be70088dd7 Get imageUpload working for Posts 2019-06-20 17:05:47 -03:00
Matt Rider
7d9e6623ea Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-20 12:28:26 -03:00
Matt Rider
7a5636fdc2 Add enableDeletionValue to unlock deletion 
- Thanks @Tirokk for pointing this out. How was this even working before?
 2019-06-20 12:07:16 -03:00
Matt Rider
8a77fcff15 Fix failing test, console.errors 2019-06-20 11:57:52 -03:00
Robert Schäfer
9ec9034ea5 Fix translatios as suggested by @Tirokk 2019-06-20 15:25:59 +02:00
Robert Schäfer
ff46740e90 Follow @mattwr18 suggetions don't enter mail twice 2019-06-20 15:13:22 +02:00
Wolfgang Huß
c5f2d7cc78 Solve remaind merge conflict 2019-06-20 11:26:51 +02:00
Wolfgang Huß
42942e4777 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 
# Conflicts:
#	webapp/components/Editor/index.vue
 2019-06-20 10:37:10 +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
Ulf Gebhardt
0c3e53a239
Merge pull request #836 from Human-Connection/835-use-vuex-to-make-editor-placeholder-reactive 
Set up editor placeholder to use Vuex
 2019-06-19 14:59:17 +02:00
Ulf Gebhardt
8debbd03eb
Merge pull request #854 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-eslint-10.0.2 
Bump babel-eslint from 10.0.1 to 10.0.2 in /webapp
 2019-06-19 14:57:06 +02:00
Robert Schäfer
c85c94aa40 Splitting components, better route navigation 
This also allows us to generate a password reset link to quickly reset
your password without entering the code and email manually.
 2019-06-19 14:23:22 +02:00
Robert Schäfer
a7eced5f8e Redirect to `/' if user is authenticated 2019-06-19 13:40:08 +02:00
Robert Schäfer
217c905800 Merge remote-tracking branch 'origin/master' into 801_reset_password 2019-06-19 13:26:13 +02:00
Wolfgang Huß
4725b8cbd2 Got Tags as # in the editor as an extension to work 2019-06-19 09:12:26 +02:00
Wolfgang Huß
49568259b0 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-06-19 07:42:38 +02:00
dependabot-preview[bot]
a6a0ee16a0
Bump apollo-client from 2.6.2 to 2.6.3 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.2...apollo-client@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-19 04:19:09 +00:00
Robert Schäfer
304fd028f0 Leftover token=>code 2019-06-18 23:51:54 +02:00
Robert Schäfer
38327ddf71 Split password flow into different routes part 1 2019-06-18 23:49:38 +02:00
Robert Schäfer
d8eca07c21 Fix lint 2019-06-18 23:28:48 +02:00
Robert Schäfer
cc26d0be94 Handle passwordReset response on reset page 2019-06-18 22:48:53 +02:00
Robert Schäfer
506fe0fe94 Add support instructions 2019-06-18 22:35:52 +02:00
Robert Schäfer
7446464d6c Better translations 2019-06-18 19:08:59 +02:00
Robert Schäfer
ba185bcb65 Refactor backend 2019-06-18 19:03:59 +02:00
Robert Schäfer
69434cdc7f Nicer information messages 2019-06-18 16:11:05 +02:00
Alexander Friedland
5a80c6df6f
Merge pull request #855 from Human-Connection/436-Menu-in-Post-Scroll-to-Comment-section 
When you call up a post you can scroll to the comments
 2019-06-18 15:20:39 +02:00