Andrew Brown
|
29e374f3be
|
Show character aliases in form
|
2016-11-02 21:54:58 +01:00 |
|
Andrew Brown
|
9451c60d6f
|
Add group memberships and locations
|
2016-11-02 21:35:41 +01:00 |
|
Andrew Brown
|
544da91a78
|
Expose spoken languages on Character form
|
2016-11-01 22:14:20 +01:00 |
|
Andrew Brown
|
a896c3c5ae
|
Migrate content types to the new attribute system
|
2016-11-01 21:51:57 +01:00 |
|
Andrew Brown
|
d107512438
|
Merge branch 'custom-attributes' into content-expansion
Conflicts:
app/models/content_types/character.rb
app/models/user.rb
app/views/content/_form.html.erb
app/views/content/form/_text_input.html.erb
app/views/content/index.html.erb
app/views/content/list/_list.html.erb
app/views/content/show.html.erb
app/views/items/edit.html.erb
app/views/items/new.html.erb
app/views/locations/edit.html.erb
app/views/locations/new.html.erb
app/views/universes/edit.html.erb
app/views/universes/new.html.erb
config/locales/en.yml
config/routes.rb
db/schema.rb
|
2016-11-01 21:02:12 +01:00 |
|
Matthew Werner
|
0c84046330
|
clean up unnecessary changes
|
2016-10-25 16:48:07 -07:00 |
|
Matthew Werner
|
9299699f4b
|
better category and field creation
|
2016-10-25 16:37:35 -07:00 |
|
Matthew Werner
|
5b58364c97
|
merge in upstream
|
2016-10-25 11:05:22 -07:00 |
|
Matthew Werner
|
01f791d149
|
merge upstream
|
2016-10-25 10:43:18 -07:00 |
|
Matthew Werner
|
eca50c3276
|
make attribute categories accessible
|
2016-10-10 16:20:47 -07:00 |
|
Matthew Werner
|
5a3cfcb6d1
|
Convert attribute_categories to system categories
|
2016-10-10 14:47:51 -07:00 |
|