marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/public
History
an 7126d53baf Merge branch 'master' of https://github.com/noiob/awoospace 
# Conflicts:
#	app/controllers/settings/preferences_controller.rb
#	app/helpers/settings_helper.rb
#	app/javascript/flavours/glitch/features/compose/components/compose_form.js
#	app/javascript/flavours/glitch/features/compose/components/publisher.js
#	app/javascript/flavours/glitch/styles/about.scss
#	app/javascript/flavours/glitch/styles/variables.scss
#	app/javascript/mastodon/features/ui/components/modal_root.js
#	app/javascript/styles/mastodon/variables.scss
#	app/lib/ostatus/activity/creation.rb
#	app/models/status.rb
#	app/services/pubsubhubbub/subscribe_service.rb
#	app/services/resolve_account_service.rb
#	app/services/send_interaction_service.rb
#	app/services/update_remote_profile_service.rb
#	app/validators/status_length_validator.rb
#	app/views/about/more.html.haml
#	app/views/about/show.html.haml
#	app/workers/pubsubhubbub/delivery_worker.rb
#	config/application.rb
#	config/locales/simple_form.en.yml
 		2019-12-21 22:29:34 -05:00
..
assets Update 501 page 2018-08-15 00:12:53 +02:00
avatars/original add new avatar placeholder missing.png (#6728) 2018-03-11 14:55:38 +01:00
emoji Updated Twemoji to 12.1.3 (#12342) 2019-11-11 00:04:24 +02:00
headers/original Optimize public/headers/missing.png (#7084) 2018-04-09 11:34:48 +02:00
ocr/lang-data Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
sounds Add artist, title, and date metadata to boop.{mp3,ogg} (#5531) 2017-10-28 00:05:04 +09:00
500.html minor changes 2019-07-21 04:27:14 -04:00
android-chrome-192x192.png Add awoospace branding 2019-12-10 20:02:47 +01:00
apple-touch-icon.png Add awoospace branding 2019-12-10 20:02:47 +01:00
awoo logo bk.png Add awoospace branding 2019-12-10 20:02:47 +01:00
awoo logo.svg Add awoospace branding 2019-12-10 20:02:47 +01:00
background-cybre.png All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
badge.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
browserconfig.xml New logo (#4306) 2017-07-23 02:40:39 +02:00
clock.js cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
doggif.gif Add awoospace branding 2019-12-10 20:02:47 +01:00
embed.js Add script to make embedded iframes autosize (#4853) 2017-09-09 16:23:44 +02:00
favicon-dev.ico Use the "m" version of the logo for favicons (#4345) 2017-07-24 19:54:59 +02:00
favicon.ico Add awoospace branding 2019-12-10 20:02:47 +01:00
logo-cybre-glitch.gif All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
mask-icon-inv.svg Merge remote-tracking branch 'glitchsoc/master' 2019-07-18 05:34:20 +02:00
mask-icon.svg Add awoospace branding 2019-12-10 20:02:47 +01:00
mstile-150x150.png Add awoospace branding 2019-12-10 20:02:47 +01:00
oops.gif New error page graphic. Other error page improvements (#5099) 2017-09-25 23:05:54 +02:00
oops.png Add awoospace branding 2019-12-10 20:02:47 +01:00
riot-glitch.png cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
robots.txt Disallow robots from indexing /interact/ (#10666) 2019-05-02 00:10:19 +02:00
sw.js fix #4356 : place sw.js to assets/sw.js (#4357) 2017-07-28 01:55:52 +02:00
web-push-icon_expand.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
web-push-icon_favourite.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
web-push-icon_reblog.png Use consistent icons for web push notifications, same as web UI (#4426) 2017-07-28 18:13:42 +02:00