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

1511 Commits

Author SHA1 Message Date
Matt Rider
3d2a982d3f Attempt to updated comments 
- by pushing to the post.comments array, which updates the array, but doesn't rerender the comments component
- by updating the apollo store as seen here https://akryum.github.io/vue-apollo/guide/apollo/mutations.html#server-side-example and https://github.com/Akryum/vue-apollo-todos
 2019-04-18 22:14:23 -03:00
Matt Rider
fc496aec51 Merge github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-18 19:00:05 -03:00
Matt Rider
86d075292c Update frontend 
- to work with new backend implementation
 2019-04-17 12:51:50 -03:00
Ulf Gebhardt
3eb96a20b2
lint fixes 2019-04-17 15:21:08 +02:00
Ulf Gebhardt
2efc77097f
match specification of Dennis - minimum 3 characters for username, no hint for user to change the username to "Anonymous", Toast error if userdata cannot be changed due to username restrictions, display "Anonymous" if no username is found in database (even tho this is against implemented rules) 2019-04-17 14:49:03 +02:00
Ulf Gebhardt
e5f98f2cee
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring 
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/pages/profile/_id/_slug.vue
 2019-04-17 13:59:30 +02:00
Matt Rider
dd9383ef40 Create two custom resolvers, get working with front end 
- Had difficulty adding a relationship with one custom resolver, if id for comment was not passed in, the comment was not created, hard coding it in also wasn't a good solution
 2019-04-16 23:12:13 -03:00
Robert Schäfer
4f2e70e871 Refactor and harden PostCard component 2019-04-17 00:08:21 +02:00
Robert Schäfer
d885fd1beb Move ContributionForm in dedicated folder 2019-04-17 00:08:21 +02:00
Matt Rider
674cdddfc3 Add Editor, cancel/submit buttons for comments 
- to PagesPost_id_slugIndex.vue
- handle simple comment creation using auto-generated resolver

Co-authored-by: Joseph "Kachulio" Ngugi <jngugi88@gmail.com>
 2019-04-16 13:45:07 -03:00
Robert Schäfer
c0bff47275 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-12 17:49:14 +02:00
Wolfgang Huß
26be224464 Localised HC URL on Login page 2019-04-12 16:08:39 +02:00
Wolfgang Huß
d4ce1ef80b Localized HC link on Login page 2019-04-12 16:00:44 +02:00
Robert Schäfer
d3ff3ca241 Merge remote-tracking branch 'origin/master' into 342-merge_documentation 2019-04-12 14:48:27 +02:00
Matt Rider
444f01f879 Refactor test, component 
- Remove redundant code
- change socialMediaUrl to add the attributes().href since that's the url
- grab last element of url as username, makes an assumption, but a safer one
 2019-04-12 08:34:06 -03:00
Ulf Gebhardt
54bfb17e31
tests for tag & category, directory refactoring, lint fixes,more 2019-04-12 11:00:54 +02:00
Matt Rider
366c5d776b Fix lint 2019-04-11 22:28:18 -03:00
Matt Rider
1e4fad8425 Add cucumber scenario, component tests 2019-04-11 21:23:17 -03:00
Matt Rider
8f32df2597 Add translation, linkify avatar 2019-04-11 21:22:33 -03:00
mattwr18
4383431260
GitBook: [342-merge_documentation] 56 pages and 14 assets modified 2019-04-11 22:12:37 +00:00
Matt Rider
60c56f8872 Start adding social media card section to user profile 2019-04-11 16:38:31 -03:00
Matt Rider
9bdd0742c9 Update tests, start test driving new scenario 
- tests had become outdated thanks to new implementation details, namely that a socialMedia node is being created and associated with a user instead of it being an attribute of the User
- scenario to ensure other user's can view my social media
 2019-04-11 16:35:22 -03:00
Ulf Gebhardt
7e258bc3d3
basic stuff from alpha 2019-04-11 17:24:05 +02:00
Matt Rider
edd37db8fe Update frontend to display urls, update currentUser 2019-04-10 20:33:37 -03:00
Robert Schäfer
102a03f552 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-10 15:17:18 +02:00
Robert Schäfer
87fbdb576d
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-10 14:22:13 +02:00
Ulf Gebhardt
c70e6227ba
first implementation - unclear if specifications are correct 2019-04-10 13:35:24 +02:00
Ulf Gebhardt
5d8da41bba
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-10 11:00:03 +02:00
Ulf Gebhardt
1c78e969c6
Merge branch 'master' into 2019/kw15/hide_all_unfuctional_content 2019-04-10 10:58:11 +02:00
mattwr18
9c64220c92
Merge branch 'master' into 236-list-social-media-accounts 2019-04-09 21:06:41 -03:00
Robert Schäfer
92be747112
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-09 22:13:20 +02:00
Robert Schäfer
98138f2500
Merge branch 'master' into 2019/kw15/new_post_button_position 2019-04-09 22:10:04 +02:00
Ulf Gebhardt
5e28ef32ab
lint fixes 2019-04-09 11:14:41 +02:00
Ulf Gebhardt
03eb58ed3b
lint fixes 2019-04-09 11:13:19 +02:00
Ulf Gebhardt
93ab590903
lint fixes 2019-04-09 11:10:50 +02:00
Ulf Gebhardt
bc868044ef
lint fix 2019-04-09 11:07:41 +02:00
Matt Rider
4de8407620 Rename variable, mutation 
- result is not a good name in this case because we know what is coming back, the result is a socialMedia node
- update the mutation name in the front end
 2019-04-08 12:05:57 -03:00
Ulf Gebhardt
0e09b0fb74
fixed design differences between alpha & nitro - Post Page 
- [X] Title and Author Position reversed
- [X] Design & Format of Post-Date + Position
- [X] No Category Names
- [X] Actions/Reactions & Tags reversed
 2019-04-08 15:53:00 +02:00
Ulf Gebhardt
e51fd361ed
fixed position of new post button to fit all devices and be completely visible at any time 2019-04-08 12:45:03 +02:00
Ulf Gebhardt
1f31c29552
make post sticky - fixes https://github.com/Human-Connection/Human-Connection/issues/385 2019-04-08 11:39:39 +02:00
Ulf Gebhardt
5d1cb43e8c
hide all unfunctional content - fixes https://github.com/Human-Connection/Human-Connection/issues/429 2019-04-08 10:48:04 +02:00
Robert Schäfer
138d9a0011 Merging origin to 342-merge_documentation 2019-04-04 00:52:21 +02:00
Matt Rider
94288ced54 Update currentUser after successful addSocialMedia mutation 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-03-28 15:54:45 -03:00
Robert Schäfer
209b63715f Show social media links as list 2019-03-27 14:28:20 +01:00
Robert Schäfer
9de652c631 Fix render error bug 
🙌 @mattwr18
 2019-03-27 14:17:47 +01:00
Robert Schäfer
8fb9ebd2b5 Expose bug: Server-side render error 2019-03-27 14:07:24 +01:00
Robert Schäfer
9daa7b81b9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-03-27 12:55:36 +01:00
Robert Schäfer
88ac0601f7 DRY: persistentLink implementation 2019-03-26 23:52:01 +01:00
Matt Rider
597d1a0cb0 Pull in icons from currentUser 
Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-03-26 17:43:23 -03:00
Robert Schäfer
5d440d2e5b Fix wrong implementation of cucumber test 2019-03-26 20:49:04 +01:00