ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

2667 Commits

Author SHA1 Message Date
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
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
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
Robert Schäfer
304fd028f0 Leftover token=>code 2019-06-18 23:51:54 +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
Robert Schäfer
3948cb8ace VerifyCode.spec passes 2019-06-18 13:51:30 +02:00
Robert Schäfer
559210d204 Oh, forgot, you have to add the email again 
Well, this is not good practice. If an attacker has access to the
mailbox then she knows also the email account as well. It's better to
ask the user for the unique username, e.g. `@username`.

https://stackoverflow.com/a/16018373
 2019-06-18 13:25:25 +02:00
Robert Schäfer
288e5002fd Flesh out VerifyCode.spec.js 2019-06-18 13:13:13 +02:00
Robert Schäfer
a641ab6884 Turn off autocomplete for all password fields 2019-06-18 13:01:19 +02:00
Robert Schäfer
5a781b0bc6 Copy+Paste code form Password/Change, DRY later 2019-06-18 12:58:43 +02:00
Robert Schäfer
de40499007 Move to next step after verify code 2019-06-18 12:41:58 +02:00
Robert Schäfer
8fc74b9e14 Put validation error translations together 2019-06-18 12:09:06 +02:00
senderfm
8484704460 Fix a text description for the filter bubble 2019-06-18 10:49:20 +02:00
senderfm
0a66ad56d9 Fix Specs, lint, fix test 2019-06-18 09:58:29 +02:00
Robert Schäfer
21506335b5 Add validations for the code 2019-06-17 22:52:58 +02:00
Robert Schäfer
0da7b906bd Start with verify code component 2019-06-17 21:11:10 +02:00
Wolfgang Huß
4e780f52dc Copy and refactoring Mentions to Tags, Started 2019-06-17 18:44:17 +02:00
Matt Rider
863060149a Add UI for adding tags to a contribution 2019-06-17 12:41:02 -03:00
Robert Schäfer
edd6a3f0c3 PW-Reset page switches password reset and verify 2019-06-17 15:20:02 +02:00
Robert Schäfer
aa6855434d Emit submitted from PasswordReset component 2019-06-17 15:20:02 +02:00
Robert Schäfer
0e3eb43276 Split PasswordResetPage into subcomponents 2019-06-17 15:20:02 +02:00
Matt Rider
35428fbaaa Add test for LocaleSwitch 2019-06-17 10:07:53 -03:00
Matt Rider
01eb25eca6 Update CommentForm with vuex 2019-06-15 16:15:49 -03:00
Matt Rider
4adc450f43 Fix failing test 
- add Vuex, with editor/placeholder getter
 2019-06-15 15:53:30 -03:00
Matt Rider
e583486143 Set up editor placeholder to use Vuex 
- to make reactive
- safer than using global event buses ($root.$emit)

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-06-15 15:23:51 -03:00
mattwr18
53ce72908b
Merge pull request #833 from Human-Connection/832-fix-empty-placeholder-new-contributions 
Add placeholder for new contributions
 2019-06-15 08:52:23 -03:00
mattwr18
54ca9a6e0c
Merge pull request #831 from Human-Connection/804-turn-root-listener-off 
Turn off $root listeners in beforeDestroy
 2019-06-15 08:51:54 -03:00
Matt Rider
ebb73c8782 Add placeholder for new contributions 2019-06-14 17:18:09 -03:00
Wolfgang Huß
68dcbacaff Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/components/ContributionForm/index.vue
#	webapp/graphql/PostMutations.js
 2019-06-14 19:02:33 +02:00
Matt Rider
7d00b73530 Turn off $root listeners in beforeDestroy 2019-06-14 14:02:22 -03:00
Wolfgang Huß
0b0fd6e825 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/post/_id/_slug/index.vue
#	webapp/pages/profile/_id/_slug.vue
 2019-06-14 18:56:02 +02:00
mattwr18
dd627535e4
Merge pull request #795 from Human-Connection/781-language-of-contribution 
Create Posts with a specified language, or fallback
 2019-06-14 13:53:22 -03:00
Wolfgang Huß
736dc7d601 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 2019-06-14 18:46:44 +02:00
Wolfgang Huß
472bfc2a88 Used PostMutations in PostHelpers now 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-14 18:44:56 +02:00
Matt Rider
1c10e0863f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-14 13:31:39 -03:00
Matt Rider
614a7eebc1 Refactor ContributionForm to deal with posts with no languages 2019-06-14 13:30:00 -03:00
Matt Rider
664a8b327f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:37:45 -03:00
Wolfgang Huß
58b36372b9 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js

Defined missing `$filter.truncate` which made console errors in the webapp Jest test.
 2019-06-14 11:11:22 +02:00
Wolfgang Huß
45bd1299ce Rewrote the PostHelpers and put them in a utils folder 2019-06-14 10:37:43 +02:00