Commit Graph

28 Commits

Author SHA1 Message Date
Andrew Brown
6f381c889d Merge branch 'master' into achetype
Conflicts:
	db/schema.rb
2016-10-04 00:16:56 +02:00
Ashley Sullins
eb281b6165 Add archetype to character information 2016-10-02 22:24:52 -05:00
Andrew Brown
7e8c60bbe0 Add 'past owners' relation on items 2016-10-02 01:41:31 +02:00
Robert Richter
7cae32a3e9
Add privacy to items and locations 2016-09-22 16:06:21 -05:00
Robert Richter
9218e97441
Add privacy field to Character 2016-09-20 13:08:41 -05:00
Andrew Brown
c839f0d9c2 Add original and current owner relations, maker relations, for items 2016-09-03 17:50:21 -05:00
Andrew Brown
f3d7dbca2b Add leaders relation between location and characters 2016-09-03 17:21:10 -05:00
Andrew Brown
51fecdcaea Add capital cities as location sr-relation to locations 2016-09-03 17:15:26 -05:00
Andrew Brown
75f6d6580b Relate notable_cities as location link on locations 2016-09-03 17:11:34 -05:00
Andrew Brown
10ee0a916d Set up location linking for location#largest_cities 2016-09-03 17:08:03 -05:00
Andrew Brown
5044122b11 Fix childrenship migration 2016-08-06 01:42:35 -05:00
Andrew Brown
76be39d214 Allow specifying children of a character 2016-08-06 01:36:24 -05:00
Andrew Brown
28cd4c4739 add proof of concept editor 2016-07-31 00:20:28 -05:00
Andrew Brown
c809b3ed9c Character birthplace / tweaking for Character-->Location relations 2016-05-03 15:46:58 -05:00
Andrew Brown
5062a41f89 All self-referential relations for Characters 2016-05-03 14:48:01 -05:00
Andrew Brown
ffdb9c7b26 Character#mothers is now a relation 2016-05-03 13:45:14 -05:00
Andrew Brown
bd6a2236db Characters#fathers is now a relation 2016-05-03 13:34:05 -05:00
Andrew Brown
b065cd8908 Link to siblings in Character#show 2016-04-29 16:11:02 -05:00
Andrew Brown
1d12e96506 Siblingship join model 2016-04-29 14:01:35 -05:00
Andrew Brown
45169258ed Remove magics and languages tables 2016-04-26 23:51:28 -05:00
Andrew Brown
467cf6e33d Abstract new/edit forms to content model 2016-04-06 23:30:14 -05:00
Andrew Brown
d1295ef243 ponr: replace custom login with devise login 2016-04-06 15:04:06 -05:00
Andrew Brown
c5564968fd Add devise 2016-04-04 22:58:47 -05:00
Robert Richter
3df0ff50e1 Migrate to built-in ActiveModel secure passwords 2015-04-19 19:29:42 -05:00
Robert Richter
00e793bf1e Refactor style using the Rubocop auto-correct 2015-03-25 22:42:45 -05:00
Robert Richter
a505eaaa5d Create Model tables in the database 2015-03-17 21:08:11 -05:00
Andrew Brown
3283337406 Tweak migration schema to match current fields 2015-03-16 02:18:32 -05:00
Andrew Brown
06c6b0ce89 Merge resolution 2015-03-13 20:12:42 -05:00