catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

3794e4e307 Fix syntax error Eugen 2016-11-18 19:10:38 +01:00
9d9bb1d728 doing spanish translation victorhck 2016-11-18 19:06:33 +01:00
305d0375ab added spanish translation victorhck 2016-11-18 18:52:48 +01:00
85d1b74ac3 Adding german localization Eugen Rochko 2016-11-18 15:36:16 +01:00
c1be1ac7c6 Merge pull request #149 from larkinscott/master Eugen 2016-11-17 20:42:52 +01:00
e177ff305a Create .codeclimate.yml Scott Larkin 2016-11-17 12:40:23 -05:00
a6e4f754fc Add an Intl polyfill Eugen Rochko 2016-11-17 16:34:36 +01:00
7ac574d9a9 Fix #148 - Devise mailer fixed, test spec added so it won't slip past again Eugen Rochko 2016-11-17 12:29:11 +01:00
b2e504616a Remove broken test Eugen Rochko 2016-11-16 19:11:30 +01:00
116ab27e08 i18n for devise mailer too Eugen Rochko 2016-11-16 18:25:21 +01:00
2c766bd4b4 Add user locale setting Eugen Rochko 2016-11-16 17:51:02 +01:00
01e43c3e57 Adding react-intl i18n to the frontend. No translations yet Eugen Rochko 2016-11-16 17:20:52 +01:00
546c4718e7 Localizations for most server-side strings Eugen Rochko 2016-11-15 23:56:03 +01:00
3ce6ac0ce2 Adding some localizations Eugen Rochko 2016-11-15 23:02:57 +01:00
a4313224d9 Improve how public status pages look slightly Eugen Rochko 2016-11-15 18:45:54 +01:00
489bd99803 Support emojis in display name, bio Eugen Rochko 2016-11-15 18:38:57 +01:00
4f07fb1f0a Fix #144 - Filter statuses from blocked users out of ancestors/descendants results Eugen Rochko 2016-11-15 17:33:41 +01:00
fdc17bea58 Fix rubocop issues, introduce usage of frozen literal to improve performance Eugen Rochko 2016-11-15 16:56:29 +01:00
a91c3ef6ce Delegate processing of incoming PuSH data to background workers Eugen Rochko 2016-11-15 15:43:33 +01:00
cea28e0c1d Fix wrong link header on followers API, wrong link in tabs component, order account results Eugen Rochko 2016-11-14 01:19:25 +01:00
f8f15e5697 Fix #63 - Filter mentions that reply to blocked users Eugen Rochko 2016-11-13 21:11:45 +01:00
bcfa49aea7 Fix another mistake with infinite user list for following Eugen Rochko 2016-11-13 21:02:10 +01:00
4286d49ade Fix another mistake Eugen Rochko 2016-11-13 20:55:24 +01:00
44f236e889 Fix infinite scrolling mistake Eugen Rochko 2016-11-13 20:52:11 +01:00
dbfe1e4be6 Infinite scroll for followers/following lists Eugen Rochko 2016-11-13 20:42:54 +01:00
49b7896953 Fix stale reference Eugen Rochko 2016-11-13 19:44:19 +01:00
3f54fba0d3 Use privacy policy from Discourse Eugen Rochko 2016-11-13 19:35:45 +01:00
7ce4670164 Force utf-8 encoding when processing XML Eugen Rochko 2016-11-13 19:12:40 +01:00
50d3083cbd Making upload button into a smaller icon button Eugen Rochko 2016-11-13 19:08:52 +01:00
d42ed78aa4 Fix #110 - Make web UI use browser history, change links in e-mails to link to that Eugen Rochko 2016-11-13 14:01:21 +01:00
c4eb63c1d4 Debounce autosuggestions requests Eugen Rochko 2016-11-13 13:13:36 +01:00
f0bdfadab7 Search component Eugen Rochko 2016-11-13 13:04:18 +01:00
8152584cf5 Fix #142 - Escape ILIKE special characters from Account.find_remote Eugen Rochko 2016-11-13 11:27:13 +01:00
20aa777c58 Weigh username matches higher than domain matches in account search Eugen Rochko 2016-11-12 14:56:40 +01:00
afded319d2 Add limit to search results Eugen Rochko 2016-11-12 14:49:28 +01:00
09218d4c01 Use full-text search for autosuggestions Eugen Rochko 2016-11-12 14:33:21 +01:00
cd765f26a9 Upgrade ruby to 2.3.1 Eugen Rochko 2016-11-11 23:37:39 +01:00
ff229aa978 Fix #141 - Add "Server: Mastodon" header to responses Eugen Rochko 2016-11-10 23:34:33 +01:00
1c17b932fe Enable emojis in reply indicator as well Eugen Rochko 2016-11-10 23:30:42 +01:00
82fd74d101 Fix modals sizing and add animation to it, fix #140 by only making the text of status clickable (this also fixes multiple dropdown being openable at the same time) Eugen Rochko 2016-11-10 23:21:24 +01:00
0320ea4b85 Fix public timeline query Eugen Rochko 2016-11-10 21:58:22 +01:00
36921be9aa Fix #131 - Make active favourite buttons yellow Eugen Rochko 2016-11-10 01:32:32 +01:00
ca3b364aea Fix #122 - Add microformats-2 classes to mention links Eugen Rochko 2016-11-10 01:19:04 +01:00
bf5f55a6bb Fix live status removal from public/hashtag channels Eugen Rochko 2016-11-10 00:47:47 +01:00
aabf884c5f Discard misattributed remote statuses, improve timelines filter Eugen Rochko 2016-11-10 00:15:49 +01:00
17903c6dae Improve filtering of public/hashtag timelines, both in backlog and real-time Eugen Rochko 2016-11-10 00:03:33 +01:00
c5e03a2e0d Status removal is broadcast to public/hashtag timelines too Eugen Rochko 2016-11-09 19:16:27 +01:00
448ab18a20 Replace setting custom CORS headers with rack-cors, set it on /oauth/token endpoint Eugen Rochko 2016-11-09 18:06:01 +01:00
b13e7dda1f API pagination for all collections using Link header Eugen Rochko 2016-11-09 17:48:44 +01:00
8d7fc5da6c Update README with attribution links and FAQ link Eugen Rochko 2016-11-08 23:33:59 +01:00
9aecc0f48a Move timelines API from statuses to its own controller, add a check for resources that require a user context vs those that don't (such as public timeline) Eugen Rochko 2016-11-08 23:22:44 +01:00
86574ea524 Adding Emoji One Eugen Rochko 2016-11-08 21:45:51 +01:00
b6832553ff Adding more logging Eugen Rochko 2016-11-08 19:37:08 +01:00
cff0b03cbb Fix for thread resolve service and process feed service url method Eugen Rochko 2016-11-08 19:09:22 +01:00
2f21f4cc01 Fix region setting for AWS gem Eugen Rochko 2016-11-08 18:55:46 +01:00
2d69bf4b3a Fix 50x page image for non-/ paths Eugen Rochko 2016-11-08 02:18:09 +01:00
bb4d1eb2e8 Improve feed regeneration Eugen Rochko 2016-11-08 02:08:32 +01:00
096bfbad96 Fix typo Eugen Rochko 2016-11-08 01:48:17 +01:00
11cbe49ffc ProcessFeedService refactor Eugen Rochko 2016-11-08 01:32:34 +01:00
dbe00a4156 Improved configuration from ENV, cleaned up timeline filter methods to be more readable, add extra logging to process feed service Eugen Rochko 2016-11-07 23:20:52 +01:00
0400734df7 Click video player to toggle playback Eugen Rochko 2016-11-07 19:05:32 +01:00
a39a92bd22 Fix #135 - More prominent focus style for inputs Eugen Rochko 2016-11-07 18:45:44 +01:00
bec47e40f5 Better look/behaviours for video player/lightbox Eugen Rochko 2016-11-07 18:42:39 +01:00
d0d799f911 Replace react-skylight with own solution that centers images better Eugen Rochko 2016-11-07 18:23:36 +01:00
f5c6baf29d Fix account and hashtag regex Eugen Rochko 2016-11-07 17:35:25 +01:00
c3559d18a3 Do not modify scroll position unless content has been added to the top, not bottom Eugen Rochko 2016-11-07 02:11:38 +01:00
4a6cc46e81 Keep scroll position when scrolled down and new content is added Eugen Rochko 2016-11-07 02:02:55 +01:00
23fc424b7a Account notes (bios) can now contain links. Character limit upped to 160 Eugen Rochko 2016-11-07 01:14:12 +01:00
b835f4aa1c Fix insecure S3 URLs Eugen Rochko 2016-11-06 20:59:06 +01:00
ea4170785a Downgrade aws gem as this one was incompatible with Paperclip Eugen Rochko 2016-11-06 20:55:57 +01:00
d14967e1c8 Fix URL configuration when S3 is enabled Eugen Rochko 2016-11-06 20:43:16 +01:00
45230c56ab Improve S3 config Eugen Rochko 2016-11-06 18:55:20 +01:00
3ab193bc3f Adding optional S3, fail-mastodon Eugen Rochko 2016-11-06 18:35:46 +01:00
93212bc2c4 Add test for FanOutOnWriteService Eugen Rochko 2016-11-06 15:56:34 +01:00
7bb28bf780 Improve @mention regex Eugen Rochko 2016-11-05 22:09:51 +01:00
262adb9791 Fix remote hashtag linking Eugen Rochko 2016-11-05 17:54:19 +01:00
eb47409036 Fix mistake Eugen Rochko 2016-11-05 17:48:53 +01:00
a698b767c1 Fix linking of remote hashtags in UI, add public view of hashtags Eugen Rochko 2016-11-05 17:44:14 +01:00
48b9619439 Adding hashtags Eugen Rochko 2016-11-05 15:20:05 +01:00
62292797ec Adding hashtag model Eugen Rochko 2016-11-04 19:12:59 +01:00
6471a548fe Add pghero for analyzing postgres performance in production Eugen Rochko 2016-11-04 18:35:04 +01:00
4ea13d8dc9 Fix web app manifests Eugen Rochko 2016-11-04 14:19:58 +01:00
2463c72006 Add forgotten reducer for FAVOURITES_FETCH_SUCCESS Eugen Rochko 2016-11-04 14:15:25 +01:00
087b993892 Adding list of who favourited status Eugen Rochko 2016-11-04 13:39:24 +01:00
6d5ef89356 Reduce code duplication, add touch scrolling behaviour for webkit browsers on scrollable areas Eugen Rochko 2016-11-04 13:32:14 +01:00
98c3a5e9c3 Optimize how statuses are re-rendered and relative time intervals Eugen Rochko 2016-11-04 12:48:53 +01:00
6d26bfd147 Add list of who reblogged status Eugen Rochko 2016-11-03 20:16:14 +01:00
0405ef977a Aria-labels actually didn't work in React, so removing. Fixing some bugs Eugen Rochko 2016-11-03 19:52:09 +01:00
159203a7bc Fix #136: Add aria-labels Eugen Rochko 2016-11-03 19:19:39 +01:00
1828df9bc0 Disable accounts caching too Eugen Rochko 2016-11-03 19:06:11 +01:00
abf664b560 Disable caching of statuses (maybe this will help with the weird bug) Eugen Rochko 2016-11-03 18:55:55 +01:00
829d189f44 Add tests for recently added API end points Eugen Rochko 2016-11-03 18:53:37 +01:00
3731230c6d Allow @username@domain/@username in follow form, prevent duplicate accounts created via remote look-up when domains differ but point to the same resource Eugen Rochko 2016-11-03 16:57:44 +01:00
e4671adc25 Fix reblogged/favourited caching; add API endpoints for who favd/reblogged status Eugen Rochko 2016-11-03 14:50:22 +01:00
c003e70758 Caching should work correctly now (fingers crossed) Eugen Rochko 2016-11-03 14:12:45 +01:00
562044f36a Need to disable caching again due to bug in Rabl Eugen Rochko 2016-11-03 13:59:31 +01:00
0160d1d9b5 Enable caching for some rabl views Eugen Rochko 2016-11-03 13:28:36 +01:00
aff22bfdb5 Add own composed status to home without waiting for websocket event This makes the UI appear less laggy. After all, the status *is* created right there and then, it's the distribution to home timelines that can take a while Eugen Rochko 2016-11-03 11:06:55 +01:00
4b357ecf98 Fix subtle bugs, new icon button Eugen Rochko 2016-11-02 22:29:19 +01:00
d427df4a8a Merge pull request #132 from marcus-herrmann/master Eugen 2016-11-02 21:53:05 +01:00
76a717d549 Merge pull request #129 from fhemberger/fix/a11y-labels Eugen 2016-11-02 21:53:00 +01:00
87aabeb7af a11y: Improve icon button component regarding semantics and screen reader usage mhe 2016-11-02 20:18:39 +01:00
77045d0886 Merge pull request #130 from fhemberger/feature/manifest Eugen 2016-11-02 17:41:32 +01:00
bc1dba22c5 Fix syntax errors Eugen 2016-11-02 17:13:47 +01:00
e7723ab662 Add puma preloading, decrease DB pool size to size of threads per worker Eugen Rochko 2016-11-02 16:38:54 +01:00
e7cd6da938 Add touch icons for Chrome, iOS and Windows 10 Frederic Hemberger 2016-11-02 15:18:40 +01:00
5ff2762fcf a11y: Add labels to input fields for screenreader Frederic Hemberger 2016-11-02 14:53:39 +01:00
53fb7b1aa8 Replace in-memory cache store with redis store, should decrease memory footprint of each running process by 128mb Eugen Rochko 2016-11-02 13:30:52 +01:00
a59d10d3df Fix missing default headers Eugen Rochko 2016-11-02 13:12:18 +01:00
9467b900a2 Make cookies https-only if LOCAL_HTTPS is true, set X-Frame-Options to DENY, add permissive CORS to API controllers Eugen Rochko 2016-11-02 12:57:14 +01:00
0a6b5e2c17 Merge pull request #125 from fhemberger/fix/a11y-language Eugen 2016-11-02 11:04:27 +01:00
d991869498 a11y: Add HTML lang attribute and utf8 encoding meta tag Frederic Hemberger 2016-11-02 11:01:18 +01:00
dd03118098 Fix follow icon changing plus to minus, add terms page stub Eugen Rochko 2016-11-01 18:03:51 +01:00
57304ac375 Catch 404 errors when downloading remote media, add screenshot to landing page Eugen Rochko 2016-11-01 16:58:13 +01:00
bab4904492 Actually fix the reblogs/favs reducer issue Eugen Rochko 2016-10-31 18:11:49 +01:00
d88d148d89 Fix forgotten reducers for reblogs/favourites Eugen 2016-10-31 16:59:36 +01:00
3692051561 Updated screenshot Eugen 2016-10-31 12:39:41 +01:00
50aaf4667f Fix accounts not being normalized from context statuses Eugen 2016-10-31 01:27:19 +01:00
7e35650398 Actually complete the autosuggestion feature Eugen Rochko 2016-10-30 18:21:38 +01:00
c49f6290eb Basic username autocomplete for text area Eugen Rochko 2016-10-30 18:13:05 +01:00
fa1cc2d05a Limit returned followees/followers by API to 40 for now Eugen Rochko 2016-10-30 15:14:07 +01:00
f10feb2e70 Fix common followers API Eugen Rochko 2016-10-30 15:08:36 +01:00
e8ff4c8e56 Refactoring redux state into different reducers Eugen Rochko 2016-10-30 15:06:43 +01:00
7060bdf04b Hide notes on user lists for now Eugen Rochko 2016-10-29 01:31:33 +02:00
e0a197650a Adding common followers API, fixing fallback query again Eugen Rochko 2016-10-29 01:29:19 +02:00
c913bdfc98 Fix follow suggestion fallback to exclude already followed users Eugen Rochko 2016-10-28 20:35:30 +02:00
bfb6cc5f2c Make suggestions box also use user list components Eugen Rochko 2016-10-28 20:26:49 +02:00
ac4f53a3a2 Improved how user lists look, added follow button to them Eugen Rochko 2016-10-28 20:05:44 +02:00
1c84d505c8 Adding following/followers lists to the UI Eugen Rochko 2016-10-27 21:59:56 +02:00
909d0d5e88 Adding public timeline silencing Eugen Rochko 2016-10-27 19:33:04 +02:00
e5565a7e4a Fix suggestions fallback query Eugen Rochko 2016-10-27 19:03:05 +02:00
19615a2c37 Add restart policy to docker compose Eugen Rochko 2016-10-25 13:21:48 +02:00
c1a0633a12 Guard against unexisting statuses rendering Eugen Rochko 2016-10-25 11:13:16 +02:00
de50eff6ac Add opening images in a modal window Eugen Rochko 2016-10-24 18:07:40 +02:00
f8f40f15da Move status components inside individual containers. We still need to select all statuses/accounts to assemble, but at least lists don't have to be re-rendered all the time now. Also add "mention" dropdown option Eugen Rochko 2016-10-24 17:11:02 +02:00
61db14bcbe Add more useful links to the readme Eugen 2016-10-24 12:37:06 +02:00
720d1f8f3d Restrict access to oauth/applications to admins only Eugen Rochko 2016-10-23 12:08:52 +02:00
b746a931a5 Fix OAuth authorization redirect Eugen Rochko 2016-10-23 12:05:55 +02:00
abb8f5837e Fix public channel Eugen Rochko 2016-10-23 11:56:04 +02:00
a9e40a3d80 Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting to the API Eugen Rochko 2016-10-22 19:38:47 +02:00
17122df80d Merge pull request #101 from kschaper/master Eugen 2016-10-20 18:39:30 +02:00
852c82435d Fix method return when rescuing Eugen Rochko 2016-10-20 18:36:12 +02:00
4b0e3eb1fb Merge remote-tracking branch 'upstream/master' Kai Schaper 2016-10-20 17:35:05 +02:00
19cfe64455 add/update specs for Button, DisplayName, DropdownMenu Kai Schaper 2016-10-20 17:34:44 +02:00
04bbc57690 Fix #100 - Add "back" button to certain views Also fix reloading of timelines after merge-type events Eugen Rochko 2016-10-19 18:20:19 +02:00
8698cd3281 Remember scroll position when navigating back, do not needlessly reload entire timelines (only fetch since last known ID). Side effect: account timelines no longer update in real-time Eugen Rochko 2016-10-18 23:06:28 +02:00
1d2175f73c Do not force-transcode uploaded videos to webm (leave mp4 as-is) Eugen Rochko 2016-10-18 17:51:45 +02:00
f88b8ce757 Improve how errors are displayed in the UI Eugen Rochko 2016-10-18 17:09:45 +02:00
aea151a0de Fix #97 - plain text version of devise e-mails Eugen Rochko 2016-10-18 16:39:21 +02:00
43df35213e Improving all forms Eugen Rochko 2016-10-18 16:37:15 +02:00
6f7c9774c7 Only run mastodon:push:clear on accounts that are still subscribed to Eugen Rochko 2016-10-18 12:23:38 +02:00
2e0a38d07c Added e-mail edit field to settings, proper format default for webfinger Eugen Rochko 2016-10-18 03:34:26 +02:00
d5e086a47b Adding application/jrd+json webfinger resource Eugen Rochko 2016-10-18 02:54:49 +02:00
7bb72ff198 Small clean up Eugen Rochko 2016-10-18 01:48:46 +02:00
b62c31306e This should fix it Eugen Rochko 2016-10-18 01:44:26 +02:00
f8b9b0810d Debugging Eugen Rochko 2016-10-18 01:38:32 +02:00
225ce8cfce More debugging Eugen Rochko 2016-10-18 01:34:38 +02:00
ea44d89383 More debugging Eugen Rochko 2016-10-18 01:31:03 +02:00
dd02fc0ec4 More debugging Eugen Rochko 2016-10-18 01:22:28 +02:00
f3e5625d2d More debugging Eugen Rochko 2016-10-18 01:16:50 +02:00
fdd30af595 Will this fix the issue? Eugen Rochko 2016-10-18 01:11:00 +02:00
6611e3a2ef More debugging Eugen Rochko 2016-10-18 00:59:18 +02:00
4baca34a45 Do not compress JS (perhaps it removes source maps, needed for debugging) Eugen Rochko 2016-10-18 00:48:40 +02:00
564e01eaf6 Add console.error to all axios failures Eugen Rochko 2016-10-18 00:42:04 +02:00
c9a7e6e1e3 Enable source maps Eugen Rochko 2016-10-18 00:36:01 +02:00
6c05e3063a Include <id> (identical value to <uri>) on person-type objects in Atom This might help with GS compatibility Eugen Rochko 2016-10-17 15:36:37 +02:00
a782e3b39d Actually fix public timeline Eugen Rochko 2016-10-17 01:59:34 +02:00
53deeeca01 Update ostatus2 version Eugen Rochko 2016-10-17 01:41:45 +02:00
e865673175 Fix #82 - only show latest reblog of status in UI Eugen Rochko 2016-10-17 01:34:16 +02:00
b5c6d00afa Fix #99 - public timeline not just reblogs, fix #98 infinite scrolling issues Eugen Rochko 2016-10-17 01:23:41 +02:00
13ee88926d Increase default number of loaded suggestions to 10 Eugen Rochko 2016-10-16 19:30:01 +02:00
f0f791bb76 Don't preload timelines as props, load them when timeline component is mounted This prevents the bug where if you go "back" to the UI after navigating to another page it loads with the old set of statuses Eugen Rochko 2016-10-16 19:23:17 +02:00
0895ff414e Fix RemoveStatusService trying to send delete salmons on behalf of remote statuses Eugen Rochko 2016-10-16 19:14:23 +02:00
de1f3aab86 Fix #16 - Optimize n+1 queries when checking reblogged/favourited values for status lists in API Eugen Rochko 2016-10-16 18:57:54 +02:00
1de2833f30 Filter out reblogs of blocked users from public timeline (the not real-time variant) Eugen Rochko 2016-10-16 18:35:20 +02:00
b8eda3026f Fix scrolling on small devices for account timelines and compose column Eugen Rochko 2016-10-16 17:09:00 +02:00
4470330385 Backfill follow suggestions with fallback when not enough results. Cycling through suggestions in UI Eugen Rochko 2016-10-16 17:04:13 +02:00
f9c9fef157 Maybe it will work like this Eugen Rochko 2016-10-15 18:19:35 +02:00
07e56d52b1 Trying a travis fix Eugen Rochko 2016-10-15 18:15:47 +02:00
6394baff4d Debugging travis Eugen Rochko 2016-10-15 18:13:23 +02:00
2a22d4076e Trying to fix travis Eugen Rochko 2016-10-15 17:44:43 +02:00
2993370de0 Fix travis node installation Eugen Rochko 2016-10-15 17:35:05 +02:00
db4671fd3f Fix suggestions fallback Eugen Rochko 2016-10-15 17:34:00 +02:00
6e0b3ddb0d Fix follow suggestions order Eugen Rochko 2016-10-15 17:19:18 +02:00
df2c0b8dad Fix typo Eugen Rochko 2016-10-15 16:57:10 +02:00
04bfd4262f Fix follow suggestions ranking Eugen Rochko 2016-10-15 16:54:50 +02:00
7075cef8f9 Adding sort by node rank to follow suggestions and fallback to most influential users Eugen Rochko 2016-10-15 16:43:52 +02:00
492a682e34 Add custom neo4j dockerfile with graphaware and noderank plugins Eugen Rochko 2016-10-15 16:13:16 +02:00
67b35a601a Exclude blocked users from follow suggestions, fix tests Eugen Rochko 2016-10-15 13:48:38 +02:00
aa9d48343d Fix suggestions box style for long names Eugen Rochko 2016-10-15 13:05:37 +02:00
edefd87adf Fix multiple results return from FollowSuggestion.get Eugen Rochko 2016-10-15 12:58:34 +02:00
70ab6624f5 Merge branch 'feature-suggestions' into development Eugen Rochko 2016-10-15 12:38:28 +02:00
4d336cefac Add sync command for neo4j, fix configuration, add neo4j to docker-compose, fix seed Eugen Rochko 2016-10-15 12:37:43 +02:00
20f581f796 Display follow suggestions Eugen Rochko 2016-10-15 12:06:30 +02:00
e21a3fe0cd Adding sync of follow relationships to Neo4J, accounts/suggestions API Eugen Rochko 2016-10-14 23:10:07 +02:00
91144d46ec Fix duplication of media attachments when a remote status reblogs a local one Eugen Rochko 2016-10-14 20:14:53 +02:00
244d1307a3 Fix remove status service sending salmons Eugen Rochko 2016-10-14 20:09:33 +02:00
a3384b6ea6 Add "edit profile" link to dropdown on own profile Eugen Rochko 2016-10-14 02:45:20 +02:00
cc54683694 Update yarn lockfile Eugen Rochko 2016-10-14 02:31:13 +02:00
ab7cb80dd5 Merge branch 'kschaper-avatar-component-testing' into development Eugen Rochko 2016-10-14 02:30:08 +02:00