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

2598 Commits

Author SHA1 Message Date
roschaefer
0cf59743ab refactor: replace 'isemail' with 'validator' 
..and use `normalizeEmail` everywhere in the webapp.
 2019-11-05 00:24:12 +01:00
roschaefer
1d15176500 Write a test for #2057 2019-11-05 00:06:15 +01:00
Stephen Hogsten
3f7a7913c0 convert email to lowercase before submitting 2019-11-05 00:06:15 +01:00
mattwr18
abbd090eb7
Merge pull request #1956 from Human-Connection/cropper-enhancements 
Refactor and tidy up crop image implementation
 2019-11-04 11:13:21 +01:00
mattwr18
d3922a8149
Merge pull request #2059 from Human-Connection/2045-filter-posts-by-language 
🍰 First Implementation Of Filtering Posts By Language
 2019-11-04 10:20:13 +01:00
Tomas Bednarik
c3d28af321 Clickable tags by nuxt-link 2019-11-03 12:34:56 +01:00
mattwr18
a78a58ad8d Mock $t in TeaserImage test 2019-11-02 17:02:19 +01:00
Brent Vardy
99816f1c21 update cancel crop to keep previous image 
- Also refactor to split into more methods

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 12:09:28 +00:00
Brent Vardy
dfb59516d0 Add abiltiy to cancel out of cropper and remove image 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 11:48:56 +00:00
Brent Vardy
2670b48694 removed unused code and refactor cropper 
- Removed unused code
- updated confirm button to be ds-button component
- split into multiple functions

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 11:07:06 +00:00
Brent Vardy
daf40bbb7c Merge branch 'master' into cropper-enhancements 2019-11-02 09:42:38 +00:00
ogerly
4cb46b6178 Fix: Poll Interval 2019-11-01 12:11:54 +01:00
roschaefer
5715d3e9d5 Add vuex store tests for language filter 2019-10-31 17:32:18 +01:00
Moriz Wahl
3c8a35d371 Language Code As Buttons Instead Of Flag Icon 2019-10-31 14:35:36 +01:00
Moriz Wahl
6ffbd37c95 Language Code As Buttons Instead Of Flag Icon 2019-10-31 14:34:23 +01:00
Tomas Bednarik
194178627d Commit after lint --fix 2019-10-30 17:15:32 +01:00
Tomas Bednarik
f9d901c843 Feature added tags clickable (fix) 2019-10-30 14:54:05 +01:00
Tomas Bednarik
09457c22f2 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1850-tags-clickable 2019-10-30 14:21:24 +01:00
Tomas Bednarik
5dd74ef751 Feature added, tags clickable as hashtags 2019-10-30 13:20:46 +01:00
Moriz Wahl
dcb4196a1a Fix #2042 Back Link To Login Page 2019-10-29 23:52:50 +01:00
Moriz Wahl
1dbd36c1e1 Tests Added For Language Filter Of Posts 2019-10-29 17:20:33 +01:00
Moriz Wahl
aeae72f691 first implementation 2019-10-28 13:49:32 +01:00
Wolfgang Huß
d0e4a06015 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-10-28 12:45:52 +01:00
Moriz Wahl
cd9a15ee32 fix #1993 2019-10-25 15:06:13 +02:00
Wolfgang Huß
a949fce606 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-10-25 13:19:19 +02:00
mattwr18
ad282b8afe
Merge pull request #2028 from Human-Connection/2026_Add_FAQ 
add FAQ _blank-href in Footer
 2019-10-24 15:15:35 +02:00
ogerly
9308646a56 add FAQ, lint ok 2019-10-24 14:27:53 +02:00
mattwr18
6dfe0ce7af
Merge pull request #2025 from Human-Connection/fix_maintenance_dockerfile 
fix: Don't attempt to save locale if not authenticated
 2019-10-24 14:22:08 +02:00
mattwr18
5c12914e02 Add test cases for LocaleSwitch 
- if there is a currentUser then update their locale in the database,
otherwise, do not.
 2019-10-24 13:52:21 +02:00
Wolfgang Huß
d2fd33b102 Fix tests 2019-10-24 12:54:51 +02:00
mattwr18
821ea6d671 Update LocaleSwitch with guard clause 
- return if there is no currentUser
- do not copy graphql directory as there is no need to send messages to
backend
 2019-10-24 12:45:55 +02:00
mattwr18
a38731fcae
Merge pull request #1991 from Human-Connection/Locale_save_by_change_LocalSwitch 
Locale save by change local switch
 2019-10-24 10:02:46 +02:00
Alexander Friedland
b584f12bb1
change 
change()  change to updateUserLocale()
 2019-10-24 08:52:24 +02:00
Wolfgang Huß
f5126e919f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-10-23 08:22:41 +02:00
mattwr18
fee7f9ff12
Merge pull request #1872 from Human-Connection/1733-fix 
🍰 Fix - maintaining sorting after navigation
 2019-10-22 12:47:18 +02:00
mattwr18
98e3bb40d5
Merge pull request #1906 from Human-Connection/add_storybook_stories_for_our_university_students 
Add storybook stories for our university students
 2019-10-22 11:58:17 +02:00
ogerly
9dccb5fc0a Save language for the user permanently when changing the language 2019-10-22 11:34:04 +02:00
mattwr18
333b38d1b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1733-fix 2019-10-22 11:07:29 +02:00
mattwr18
6d1044d292 Hide new CommentForm while editing a comment 2019-10-21 16:08:01 +02:00
Alina Beck
c2c69a2f70 update styling and wording for pinned post ribbons 2019-10-21 14:34:26 +03:00
roschaefer
16d07bd3ba refactor: lint, frontend tests, vuex store 
This fixes the lint errors and failing frontend tests. Also, when the
user chooses another orderBy, the menu gets translated.

The refactoring moves code and complexity into the vuex store where it
can be tested separately.
 2019-10-18 21:58:53 +02:00
mattwr18
8872dc16cf Follow @Tirokk's PR review suggestions 
- add type :User to match
- remove unneeded outdated pinPost
 2019-10-18 18:27:20 +02:00
Wolfgang Huß
db77448505 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-10-18 15:42:55 +02:00
Wolfgang Huß
965882885a Refactor moderators report list 2019-10-18 15:41:18 +02:00
mattwr18
ddf8b657be Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 15:17:03 +02:00
Alexander Friedland
c819edc293
Merge pull request #1927 from Human-Connection/Set_and_save_language_in_user_settings 
Language will be saved in the database of the user during registration
 2019-10-18 15:11:04 +02:00
Alexander Friedland
0b5c1f831d
locale 
change language to locale
 2019-10-18 11:52:48 +02:00
Alexander Friedland
bfb3923023
locale 
change language to locale
 2019-10-18 11:50:42 +02:00
mattwr18
b800c7d5c9 Resolve pinnedAt undefinedToNull, clean up 
- this was causing the noftications to break since they were using the
post fragment and pinnedAt was returning null
- remove unused bits of code
- revert changes to cypress since they were not causing the error
- can be changed in another PR
 2019-10-18 00:01:46 +02:00
roschaefer
3e04b26068 Add styling to pinned post 2019-10-17 17:56:16 +02:00