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
6,227 Commits 117 Branches 1,511 Tags
Commit Graph

208 Commits

Author SHA1 Message Date
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
Robert Schäfer
f5afdf2435 Merge Notification with NotificationPostCard 
cc @mattwr18 Please don't see this as a revert of your work. Your
structure of the `notification-post-card` component was helpful and showed
the redundancy with `hc-post-card`. I reused a lot of the code, but
because I merged both components it now *looks* as if I authored all the code.
 2019-04-17 01:10:17 +02:00
Robert Schäfer
85973be5b0 Contribute German translations for social media 2019-04-12 18:00:25 +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
Ulf Gebhardt
c70e6227ba
first implementation - unclear if specifications are correct 2019-04-10 13:35:24 +02:00
Robert Schäfer
22367417de Implement component test 2019-03-23 01:37:36 +01:00
Robert Schäfer
c91a61af89 Merging webapp to master 2019-03-20 21:06:17 +01:00