aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'renovate/webpack-hot-middleware-2.x' into 'develop'tusooa2022-08-15
|\ | | | | | | | | Update dependency webpack-hot-middleware to v2.25.2 See merge request pleroma/pleroma-fe!1595
| * Update dependency webpack-hot-middleware to v2.25.2Pleroma Renovate Bot2022-08-14
| |
* | Merge branch 'renovate/cross-spawn-7.x' into 'develop'tusooa2022-08-15
|\ \ | | | | | | | | | | | | Update dependency cross-spawn to v7 See merge request pleroma/pleroma-fe!1598
| * | Update dependency cross-spawn to v7Pleroma Renovate Bot2022-08-15
| | |
* | | Merge branch 'renovate/chromedriver-104.x' into 'develop'tusooa2022-08-15
|\ \ \ | |/ / |/| | | | | | | | Update dependency chromedriver to v104 See merge request pleroma/pleroma-fe!1597
| * | Update dependency chromedriver to v104Pleroma Renovate Bot2022-08-14
| | |
* | | Merge branch 'renovate/eslint-8.x' into 'develop'HJ2022-08-14
|\ \ \ | |/ / |/| | | | | | | | Update dependency eslint to v8.22.0 See merge request pleroma/pleroma-fe!1596
| * | Update dependency eslint to v8.22.0Pleroma Renovate Bot2022-08-14
|/ /
* | Merge branch 'renovate/pin-dependencies' into 'develop'HJ2022-08-14
|\ \ | |/ |/| | | | | Pin dependencies See merge request pleroma/pleroma-fe!1594
| * Pin dependenciesPleroma Renovate Bot2022-08-14
|/
* Merge branch 'renovate/connect-history-api-fallback-2.x' into 'develop'tusooa2022-08-14
|\ | | | | | | | | Update dependency connect-history-api-fallback to v2 See merge request pleroma/pleroma-fe!1573
| * Update dependency connect-history-api-fallback to v2Pleroma Renovate Bot2022-08-11
| |
* | Merge branch 'renovate/vuelidate-core-2.x' into 'develop'tusooa2022-08-14
|\ \ | | | | | | | | | | | | Update dependency @vuelidate/core to v2.0.0-alpha.44 See merge request pleroma/pleroma-fe!1582
| * | Update dependency @vuelidate/core to v2.0.0-alpha.44Pleroma Renovate Bot2022-08-11
| |/
* | Merge branch 'renovate/vue-i18n-9.x' into 'develop'tusooa2022-08-14
|\ \ | | | | | | | | | | | | Update dependency vue-i18n to v9.2.2 See merge request pleroma/pleroma-fe!1590
| * | Update dependency vue-i18n to v9.2.2Pleroma Renovate Bot2022-08-11
| |/
* | Merge branch 'renovate/eslint-8.x' into 'develop'tusooa2022-08-14
|\ \ | |/ |/| | | | | Update dependency eslint to v8.21.0 See merge request pleroma/pleroma-fe!1591
| * Update dependency eslint to v8.21.0Pleroma Renovate Bot2022-08-11
|/
* Merge branch 'renovate/chai-4.x' into 'develop'tusooa2022-08-11
|\ | | | | | | | | Update dependency chai to v4 See merge request pleroma/pleroma-fe!1567
| * Fix test errorsTusooa Zhu2022-08-10
| |
| * Update dependency chai to v4Pleroma Renovate Bot2022-08-09
| |
* | Merge branch 'renovate/sass-1.x' into 'develop'tusooa2022-08-11
|\ \ | | | | | | | | | | | | Update dependency sass to v1.54.4 See merge request pleroma/pleroma-fe!1588
| * | Update dependency sass to v1.54.4Pleroma Renovate Bot2022-08-10
|/ /
* | Merge branch 'feat/report-notification' into 'develop'HJ2022-08-09
|\ \ | | | | | | | | | | | | #949 Feat/report notification See merge request pleroma/pleroma-fe!1322
| * \ Merge branch 'fix/merge-conflicts/report-notifications' into ↵Sean King2022-08-07
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'feat/report-notification' Fixing merge conflicts and lint for report notifications MR See merge request pleroma/pleroma-fe!1585
| | * | Fix lint stuffSean King2022-08-06
| | | |
| | * | Fix merge conflictsSean King2022-08-06
| |/| |
| * | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵Ilja2022-07-18
| |\ \ \ | | | | | | | | | | | | | | | feat/report-notification
| * | | | clean up leftoverIlja2022-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | There was a comment to enable something for eslint. This was a leftover from when it was dissabled. But the dissabling was removed in a privious commit f9393b0dab22279e9bdb97a1cf52fecfe278a4a7
| * | | | Use empty array for emji insteadIlja2022-03-21
| | | | | | | | | | | | | | | | | | | | Instead of relying on a key that isn't actually usefull, I just provide an empty array directly.
| * | | | Add default array for RichContent emojiIlja2022-03-21
| | | | | | | | | | | | | | | | | | | | Reports don't currently return an emoji key. There's an MR to add it, but in case something doesn't return this key, we now have a default empty array.
| * | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵Ilja2022-03-20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | feat/report-notification
| * | | | | Use RichContent component for ReportsIlja2022-03-20
| | | | | | | | | | | | | | | | | | | | | | | | Note that this expects an emoji list for the reports. I made an MR in BE to provide that: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3650
| * | | | | Use Select componentIlja2022-03-20
| | | | | | | | | | | | | | | | | | | | | | | | After merging develop, the dropdown didn't format properly any more because selects have been made into a component. Here I turn the select into a component as well.
| * | | | | Make linter happyIlja2022-02-26
| | | | | | | | | | | | | | | | | | | | | | | | `npm run lint` gave warnings for two files, fixed them with `./node_modules/.bin/eslint --fix $FILENAME`
| * | | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵Ilja2022-02-26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | feat/report-notification
| * | | | | | Fix up and code reviewIlja2022-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Check if it works properly * Notifs are shown as BE returns them * The Interaction view has Reports, but only when you're mod or admin * Do some extra translations * Fix some console spam
| * | | | | | Fix setting report state, add proper error handlingShpuld Shpuldson2021-02-03
| | | | | | |
| * | | | | | remove logsShpuld Shpuldson2021-02-01
| | | | | | |
| * | | | | | Fix report modal not working, add include_typesShpuld Shpuldson2021-02-01
| | | | | | |
| * | | | | | Merge branch 'develop' into feat/report-notificationShpuld Shpuldson2021-01-27
| |\ \ \ \ \ \
| * | | | | | | remove mock dataShpuld Shpuldson2021-01-27
| | | | | | | |
| * | | | | | | add proper state switcherShpuld Shpuldson2021-01-27
| | | | | | | |
| * | | | | | | wipShpuld Shpuldson2021-01-18
| | | | | | | |
| * | | | | | | Merge branch 'develop' into feat/report-notificationShpuld Shpuldson2021-01-13
| |\ \ \ \ \ \ \
| * | | | | | | | separated componentShpuld Shpuldson2021-01-11
| | | | | | | | |
| * | | | | | | | somewhat workign version still with fixtureShpuld Shpuldson2021-01-06
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into feat/report-notificationShpuld Shpuldson2021-01-05
| |\ \ \ \ \ \ \ \
| * | | | | | | | | add test data for devShpuld Shpuldson2020-12-04
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into feat/report-notificationShpuld Shpuldson2020-12-04
| |\ \ \ \ \ \ \ \ \