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
noiob
cea2ecda2b
Add awoospace branding
2019-12-10 20:02:47 +01:00
Thibaut Girka
ff67385cfb
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
koyu
823dcc4dc6
Updated Twemoji to 12.1.3 ( #12342 )
2019-11-11 00:04:24 +02:00
Thibaut Girka
1488be7d96
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
Eugen Rochko
28636f43e4
Add OCR tool to media editing modal ( #11566 )
2019-08-15 15:13:26 +02:00
an
b2ce0b84da
minor changes
2019-07-21 04:27:14 -04:00
noiob
bd942ac2a5
Merge remote-tracking branch 'glitchsoc/master'
2019-07-18 05:34:20 +02:00
noiob
51c61671d8
Change vecttor favicon to white and remove circle
2019-07-06 03:29:03 +02:00
noiob
d0b9f922e7
Change SVG favicon to the Awoospace logo
2019-07-06 02:58:30 +02:00
Thibaut Girka
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
ThibG
c4f2433300
Disallow robots from indexing /interact/ ( #10666 )
...
This does not provide any new information and may just triple the number
of crawled pages
2019-05-02 00:10:19 +02:00
Noiob
76c05126c8
Merge remote-tracking branch 'glitchsoc/master'
2019-04-12 22:47:24 +02:00
Eugen Rochko
80388a3ffe
Change error graphic to hover-to-play ( #10055 )
...
Fix #6060
2019-02-15 23:33:25 +01:00
Thibaut Girka
06cc04fd23
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-15 18:02:45 +01:00
nightpool
a5992e5883
Change robots.txt to exclude only media proxy URLs ( #10038 )
...
* Revert "Change robots.txt to exclude some URLs (#10037 )"
This reverts commit 80161f4351
.
* Let's block media_proxy
/media_proxy/ is a dynamic route used for requesting uncached media, so it's
probably bad to let crawlers use it
* misleading comment
2019-02-14 03:11:47 +01:00
Eugen Rochko
80161f4351
Change robots.txt to exclude some URLs ( #10037 )
...
- Exclude static assets
- Exclude uploaded files
- Exclude alternate versions of the profile page
- Exclude media proxy URLs
2019-02-13 21:28:18 +01:00
Thibaut Girka
0c2d48b60a
Replace animated oops.gif by a non-animated image
...
Fixes #6060
2018-12-19 20:49:58 +01:00
James
537192fee5
non-blank 500
2018-08-15 00:12:53 +02:00
Awoo Space
e40b154797
Update 501 page
2018-08-15 00:12:53 +02:00
James
f889096133
added 501 for upgrade + new gif
2018-08-15 00:12:53 +02:00
James
6d0ecdb9a7
add awoo.space mascot back
2018-08-15 00:12:53 +02:00
James
058baa3434
block robots
2018-08-15 00:11:04 +02:00
Awoo Space
89d9b60e06
add some awoo.space customizations
...
Update front page screenshot
Add some front page customization hacks
add new front page image and update front page
fix /about page for awoo.space
2018-08-15 00:01:43 +02:00
Thibaut Girka
d392020da6
Merge branch 'master' into glitch-soc/tentative-merge
...
Conflicts:
README.md
app/controllers/statuses_controller.rb
app/lib/feed_manager.rb
config/navigation.rb
spec/lib/feed_manager_spec.rb
Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
2018-07-09 07:13:59 +02:00
Dryusdan
17b928502a
update twemojie to v2 ( #7911 )
2018-07-06 01:58:07 +02:00
Maciek Baron
ca2cc556f1
Crush PNGs to reduce overall size ( #7954 )
2018-07-05 15:20:16 +02:00
Jenkins
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
Renato "Lond" Cerqueira
268d90e810
Rename emoji sheet to avoid caching issue ( #7777 )
2018-06-10 16:12:47 +02:00
Renato "Lond" Cerqueira
0c3ce41031
Update to emojimart 2.6.1 ( #7746 )
...
* Update to emojimart 2.6.1
WIP using local updated version. Sheet comes from emoji-data@4.0.4,
file sheet_twitter_32_indexed_256.png.
* Update to 2.6.1 and uncompress data if needed
* Remove changes that were not needed
* Fix yarn lock file
* Match emojiToShowFilter behavior to new version of emoji-mart
* Fix codeclimate issue
* Match custom emoji behavior to new version of emoji-mart
* Replace emoji without shortcode in tests
* Fix code climate issues
2018-06-07 19:40:23 +02:00
Jenkins
33c2bbdda7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-11 00:50:09 +00:00
Una
e057c0e525
Optimize public/headers/missing.png ( #7084 )
2018-04-09 11:34:48 +02:00
Thibaut Girka
cf754e6a91
Fix error 500 page
2018-03-16 22:31:20 +01:00
David Yip
f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
2018-03-12 17:52:19 -05:00
Konrad Pozniak
cd252b794e
add new avatar placeholder missing.png ( #6728 )
2018-03-11 14:55:38 +01:00
Surinna Curtis
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
David Yip
37b267e2ab
Add artist, title, and date metadata to boop.{mp3,ogg} ( #5531 )
...
For boop.mp3, this commit adds both ID3v1 and ID3v2 tags. For boop.ogg,
we use Vorbis metadata.
In the case of boop.mp3, this also adds a cover image. Interestingly, it
didn't seem to affect the size of boop.mp3 much, despite being ~8k.
boop.ogg seemed to be much more affected and so no cover image was added
to that version.
2017-10-28 00:05:04 +09:00
David Yip
13e05fece2
Merge tag 'v2.0.0rc2' into gs-master
2017-10-12 04:22:59 -05:00
Eugen Rochko
8e9911962d
Change Android icon padding again to half of previous ( #5339 )
2017-10-12 00:58:14 +02:00
Ondřej Hruška
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
kibigo!
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
Eugen Rochko
b17e571bc2
Add padding to Android icon, change Apple and MS icons ( #5321 )
2017-10-11 19:11:15 +02:00
Eugen Rochko
96c942e8ab
Fix wrong dimensions on Android icon ( #5296 )
2017-10-10 12:41:30 +02:00
Eugen Rochko
aafe55af81
Material app icon for Chrome ( #5291 )
2017-10-09 21:27:16 +02:00
Eugen Rochko
92e7815d1d
Fix #5274 - Create symlink from public/500.html to public/assets/500.html ( #5288 )
2017-10-09 20:51:24 +02:00
Ondřej Hruška
83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
2017-09-28 09:18:35 +02:00
Eugen Rochko
3b60832214
New error page graphic. Other error page improvements ( #5099 )
...
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A >)
- 500 content appended with "on our end" to make clear it's
not user's fault
2017-09-25 23:05:54 +02:00
Eugen Rochko
2c8e3fbbfb
Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )
2017-09-25 04:04:04 +02:00
Eugen Rochko
846cd4e838
Switch from EmojiOne to Twemoji, different emoji picker ( #5046 )
...
* Switch from EmojiOne to Twemoji, different emoji picker
* Make emoji-mart use a local spritesheet
* Fix emojify test
* yarn manage:translations
2017-09-23 01:41:00 +02:00
David Yip
67ad453373
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
...
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
2017-09-09 23:56:21 -05:00