Fix conflicts#182

Open

LuCCoelho wants to merge 46 commits intoexcid3:jumpstartfrom

OmnicodeSolutions:upstream-master

Commits on Feb 6, 2019

Support Rails 5+ attributes api for virtual attributes
excid3
committed

Commits on Mar 6, 2019

Merge remote-tracking branch 'upstream/master'
excid3
committed

Commits on May 16, 2023

Merge remote-tracking branch 'upstream/main'
ErickArgollo2
committed
Eager load rails app for routes generator and add virtual attribute support

excid3
authored and
ErickArgollo2
committed
Fix punditize module loading for rails 6

excid3
authored and
ErickArgollo2
committed
Add rich text field support

excid3
authored and
ErickArgollo2
committed
Add route when generating dashboard

excid3
authored and
ErickArgollo2
committed
Fix route injection

excid3
authored and
ErickArgollo2
committed
Add route when generating new dashboards

excid3
authored and
ErickArgollo2
committed
Fix admin namespace option

excid3
authored and
ErickArgollo2
committed
Fix admin namespace reference

excid3
authored and
ErickArgollo2
committed
Edit administrate translation

elvisserrao
authored and
ErickArgollo2
committed
Remove useless comments

elvisserrao
authored and
ErickArgollo2
committed
Include Date Field

mateussoaresr
authored and
ErickArgollo2
committed
Change .datetimepicker format

mateussoaresr
authored and
ErickArgollo2
committed

Commits on Jun 11, 2024

Support Rails 5+ attributes api for virtual attributes

excid3
authored and
LuCCoelho
committed

Commits on Jun 12, 2024

Merge branch 'jumpstart' into upstream-master
LuCCoelho
authored

Commits on Jun 13, 2024

Commits on Apr 10, 2025

Commits on Apr 11, 2025

Commits on Apr 14, 2025