Closed polyamAdmin closed 5 months ago
Conflicts:
tsconfig.json
app/models/custom_filter.rb
app/models/invite.rb
app/models/user_invite_request.rb
app/services/notify_service.rb
config/locales/simple_form.en-GB.yml
config/locales/simple_form.en.yml
Also includes following changes:
app/javascript/flavours/polyam/theme.yml
app/javascript/flavours/polyam/packs
Ported changes:
Additional changes:
Conflicts:
tsconfig.json
Upstream removed entry close to an additional one for polyam-glitch. Removed as upstream.app/models/custom_filter.rb
Upstream added new constant close to one added for polyam-glitch. Added constant.app/models/invite.rb
Upstream made changes close to a polyam-glitch change. Applied code change.app/models/user_invite_request.rb
Same as above.app/services/notify_service.rb
Upstream added a new type close to one added for polyam-glitch. Added type.config/locales/simple_form.en-GB.yml
Upstream removed lines close to ones modified to say "toot". Deleted lines and kept "toot".config/locales/simple_form.en.yml
Upstream changed string modified to say "toot". Applied changes and kept "toot".Also includes following changes:
app/javascript/flavours/polyam/theme.yml
app/javascript/flavours/polyam/packs
Ported changes:
Additional changes: