1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
16fee0335f
Show card modal on public pages ( #7428 )
2018-05-09 16:22:52 +02:00
a9c440637c
Improve report layout ( #7188 )
...
* Use table for statuses in report
* Display reported account and reporter in the same table
* Split accounts and general report info into two tables again
* Redesign report statuses table, notes, merge notes and action log
* Remove unused translations
* Fix code style issue
* Fix code style issue
* Fix code style issue
2018-04-20 02:28:48 +02:00
837b3804bf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-25 15:17:21 +00:00
ff7941e652
Show media modal on public pages ( #6801 )
2018-03-24 12:52:26 +01:00
7a6eaad445
Do not require images in about.js and share.js ( #6622 )
...
They are already required by common.js.
2018-03-04 20:27:40 +01:00
8cd2828e91
Fix hide and show media button on admin page ( #6347 )
2018-01-24 13:29:46 +01:00
cda845ae0e
Fix mailer to use webpack core
2018-01-15 21:17:03 -08:00
89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
2018-01-15 22:17:48 -06:00
5276c0a090
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
2018-01-16 03:29:11 +01:00
541fe9b110
Skins support
2017-11-30 19:29:47 -08:00
bdbbd06dad
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
a9ed857171
WIP static themeing
2017-11-18 15:12:52 -08:00
08a01dd037
Public pack fix
2017-11-18 11:05:39 -08:00
45c44989c8
Forking glitch theme
2017-11-17 19:29:16 -08:00
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
37ff061d9b
satisfy eslint and jest
2017-10-16 22:24:44 +02:00
4b397adb5b
fix some lint errors
2017-10-16 21:13:34 +02:00
dbb1fce94d
Merge remote-tracking branch 'upstream/master' into gs-master
2017-10-16 09:23:59 -05:00
bf0ee1a25c
Enable ESLint rules import/* ( #5414 )
...
* Enable ESLint rules import/*
* fix
2017-10-16 11:12:09 +02:00
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
f486ef2666
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
fd7f0732fe
Compress and combine emoji data ( #5229 )
2017-10-06 03:42:34 +02:00
daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
2017-09-28 09:20:59 +02:00
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
2017-09-28 09:12:17 +02:00
86e617a839
Better themeing support!!
2017-09-25 19:24:32 -07:00
0401a24558
Add support for multiple themes ( #4959 )
...
* Add support for selecting a theme
* Fix codeclimate issues
* Look up site default style if current user is not available due to e.g. not being logged in
* Remove outdated comment in common.js
* Address requested changes in themes PR
* Fix codeclimate issues
* Explicitly check current_account in application controller and only check theme availability if non-nil
* codeclimate
* explicit precedence with &&
* Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml
* codeclimate: indentation + return
2017-09-19 16:36:23 +02:00
2bbf987a0a
Redesign video player ( #4911 )
...
* Redesign video player
* Use new video player on static public pages too
* Use media gallery component on static public pages too
* Pause video when hiding it
* Full-screen sizing on WebKit
* Add aria labels to video player buttons
* Display link card on public status page
* Fix fullscreen from modal sizing issue
* Remove contain: strict property to fix fullscreen from columns
2017-09-14 03:39:10 +02:00
47d48fed8d
Reset preview image if avatar/header image selection was cancelled ( #4893 )
2017-09-11 16:19:54 +02:00
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
b9f7bc149b
Merge branch 'origin/master' into sync/upstream
...
Conflicts:
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/services/reblog_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
config/webpack/loaders/babel.js
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
6867681c7c
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
d1a78eba15
Embed modal ( #4748 )
...
* Embed modal
* Proxy OEmbed requests from web UI
2017-08-31 03:38:35 +02:00
e95bdec7c5
Update status embeds ( #4742 )
...
- Use statuses controller for embeds instead of stream entries controller
- Prefer /@:username/:id/embed URL for embeds
- Use /@:username as author_url in OEmbed
- Add follow link to embeds which opens web intent in new window
- Use redis cache in development
- Cache entire embed
2017-08-30 10:23:43 +02:00
fb8aa2b3ba
Apply user timezone for the title attribute of .time-ago ( #4693 )
2017-08-25 17:21:16 +02:00
3c6503038e
Add protocol handler. Handle follow intents ( #4511 )
...
* Add protocol handler. Handle follow intents
* Add share intent
* Improve code in intents controller
* Adjust share form CSS
2017-08-14 04:53:31 +02:00
b61e3daf98
Multiple frontend support ( #110 )
...
* Initial multiple frontend support
* Removed unnecessary require()
* Moved styles/images out of common
2017-07-30 19:28:21 +02:00
984d2d4cb6
Merge that good fresh upstream shit
2017-07-22 01:16:53 +00:00
f2390e2803
Dynamicaly change avatar and header bg from account setting ( #4289 )
2017-07-21 12:47:16 +02:00
e7edb4d1ee
Merge pull request #87 from tootsuite/master
...
merge upstream
2017-07-20 11:24:32 -04:00
bc1f9dc24b
Fix a typo in public.js (double semicolons) ( #4269 )
...
Signed-off-by: Cygnan <mail@cygnan.com>
2017-07-19 13:35:22 +02:00
d69fa9e1f4
Merge changes from upstream with the CSS reload fix
2017-07-18 18:58:47 +02:00
4d42a38954
Improve admin page ( #4121 )
...
* Improve admin page
* Fix test
* Add spec
* Improve select style
2017-07-18 16:38:22 +02:00
b11ac88692
Require any modules after loading polyfill in entry points ( #4231 )
...
app/javascript/mastodon/main.js delayed the execution of modules,
but other entry points didn't. That leads to failure in executing
modules, which requires those polyfills.
Strictly enforce the rule to require any modules after loading
polyfill in entry points.
2017-07-18 00:19:02 +02:00
c727eae441
Updated from tootsuite
2017-07-17 20:03:57 +02:00
b15f790221
Require images in common.js ( #4232 )
2017-07-17 10:23:28 +02:00
09cfc079b0
Merge upstream ( #81 )
2017-07-15 14:33:15 -07:00
9008ab3407
Do not load unnecessary script files ( #4193 )
2017-07-14 11:08:56 +02:00
79d898ae0a
Merge upstream!! #64 <3 <3
2017-07-12 02:03:17 -07:00
297921fce5
Moved glitch files to their own location ;)
2017-07-12 01:02:51 -07:00
Thibaut Girka