]> cat aescling's git repositories - mastodon.git/commit
Allow joining several hashtags in a single column (#8904)
authorJames Kiesel <james.kiesel@gmail.com>
Mon, 5 Nov 2018 17:53:25 +0000 (06:53 +1300)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 5 Nov 2018 17:53:25 +0000 (18:53 +0100)
commit4c03e05a4e1a237f8a414a0861c03abe3269dbc8
tree6caa724b3ce982af4e40237a43ecf38d7595030a
parentbb5558de627ca9bc26949570025f6193cd7cbd98
Allow joining several hashtags in a single column (#8904)

* Nascent tag menu on frontend

* Hook up frontend to search

* Tag intersection backend first pass

* Update yarnlock

* WIP

* Fix for tags not searching correctly

* Make radio buttons function

* Simplify radio buttons with modeOption

* Better naming

* Rearrange options

* Add all/any/none functionality on backend

* Small PR cleanup

* Move to service from scope

* Small cleanup, add proper service tests

* Don't use send with user input :D

* Set appropriate column header

* Handle auto updating timeline

* Fix up toggle function

* Use tag value correctly

* A bit more correct to use 'self' rather than 'all' in status scope

* Fix some style issues

* Fix more code style issues

* Style select dropdown more better

* Only use to_id'ed value to ensure no SQL injection

* Revamp frontend to allow for multiple selects

* Update backend / col header to account for more flexible tagging

* Update brakeman ignore

* Codeclimate suggestions

* Fix presenter tag_url

* Implement initial PR feedback

* Handle additional tag streaming

* CodeClimate tweak
18 files changed:
app/controllers/api/v1/timelines/tag_controller.rb
app/controllers/tags_controller.rb
app/javascript/mastodon/actions/streaming.js
app/javascript/mastodon/actions/timelines.js
app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js [new file with mode: 0644]
app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js [new file with mode: 0644]
app/javascript/mastodon/features/hashtag_timeline/index.js
app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/reducers/timelines.js
app/javascript/styles/mastodon/_mixins.scss
app/javascript/styles/mastodon/components.scss
app/models/status.rb
app/services/hashtag_query_service.rb [new file with mode: 0644]
config/brakeman.ignore
package.json
spec/services/hashtag_query_service_spec.rb [new file with mode: 0644]
yarn.lock