mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,396 Commits 83 Branches 44 Tags 172 MiB
6e2c96bc2a
Commit Graph

353 Commits

Author SHA1 Message Date
Andrew Brown
67f24b792c add version to migration 2018-08-23 23:40:04 -05:00
Andrew Brown
fe3ce777ee deletion logic 2018-08-18 16:49:17 -05:00
Andrew Brown
c7429de844 add hidden flags to attributes 2018-08-16 12:34:04 -05:00
Andrew Brown
90990320c1 Merge branch 'rails5-upgrade' of github.com:indentlabs/notebook into rails5-upgrade 2018-08-15 17:43:43 -05:00
Andrew Brown
dab5d5f0ea Merge branch 'master' into rails5-upgrade 2018-08-15 16:31:37 -05:00
Tristan
66dec09d6b wMerge branch 'master' of https://git.heroku.com/papercut-server into rails5-upgrade 2018-07-25 18:44:16 -05:00
Andrew Brown
a5784576b6 Add deity link to religions 2018-07-15 13:52:40 -05:00
Andrew Brown
7a4c9dfbc1 update tests for 5.2 2018-07-05 02:07:12 -05:00
Andrew Brown
59904a861d rails 5 prep 2018-07-05 01:10:52 -05:00
Andrew Brown
f6d80346df thredded migrations 2018-07-04 21:01:14 -05:00
Andrew Brown
c69e4cf390
Merge branch 'master' into thredded-15 2018-06-19 20:59:24 -05:00
Tristan
6980a4de7f add forum moderator flag to users 2018-06-19 20:30:53 -05:00
Tristan
075919d857 Upgrade thredded to 0.15.1 2018-06-09 15:02:45 -05:00
Andrew Brown
f755fc6fc9 add thredded upgrade migration 2018-02-10 12:23:15 -06:00
Andrew Brown
d9e4ccd500 Add race link to deity 2018-02-02 00:45:00 -06:00
Andrew Brown
7a5873603d Add deity and character siblings to deities 2018-02-02 00:19:14 -06:00
Andrew Brown
786569315f add material uses to flora 2018-01-31 00:50:47 -06:00
Andrew Brown
9befdaad13 add classification to creatures 2018-01-31 00:47:22 -06:00
Andrew Brown
3ac56861d4 add requested relations 2018-01-31 00:39:08 -06:00
Andrew Brown
b0035ffdbe add magic link to items 2018-01-31 00:21:36 -06:00
Andrew Brown
a4ec437b06 new relations on locations 2018-01-31 00:18:32 -06:00
Andrew Brown
963c942779 new character relations 2018-01-31 00:09:15 -06:00
Andrew Brown
346f2839be move content groupers 2018-01-30 17:54:30 -06:00
Andrew Brown
f80df7ff61 add deity relation models 2018-01-30 17:44:59 -06:00
Andrew Brown
a174f2d88c add technology relation models 2018-01-30 17:43:10 -06:00
Andrew Brown
162e7c5d1b add planet relations 2018-01-30 17:38:33 -06:00
Andrew Brown
7ee02b2e45 deity categories + rename universe technologies field to technology 2018-01-28 21:50:33 -06:00
Andrew Brown
55e7b9bfa9 Add government preconf 2018-01-27 14:32:43 -06:00
Andrew Brown
07e586d34c Add technology and deity 2018-01-27 14:22:36 -06:00
Andrew Brown
32a062e122 prep page create script 2018-01-27 13:19:25 -06:00
Andrew Brown
9de730da34 add universe id indices 2018-01-19 21:35:07 -06:00
Andrew Brown
f4408875c3 more db indices 2018-01-19 21:29:56 -06:00
Andrew Brown
8a91b4cf70 add content type/id indices to contentchangeevent 2018-01-19 21:19:31 -06:00
Andrew Brown
679c372c96 add universe_id index to characters table 2018-01-19 19:04:05 -06:00
Andrew Brown
6cd54ef072 Add site administrator flag to Users 2018-01-11 22:31:55 -06:00
Ahmad Saleem
0702d18daa Add table to store stripe event logs. 2018-01-07 23:45:10 +05:00
Andrew Brown
40e4473827 Hook up relations on new location types 2018-01-01 15:05:18 -06:00
Andrew Brown
cab9d0ca51 Add and hook up town/country/landmark 2017-12-31 15:56:33 -06:00
Andrew Brown
e0e0fea6e6 add models for Country, Town, and Landmark 2017-12-31 11:44:53 -06:00
Andrew Brown
807f116420 Revert "temporarily comment out migration for staging" 
This reverts commit f49d056fe5.
 2017-12-27 15:31:20 -06:00
Andrew Brown
a7ba11c540 Revert "temporary commenting out of old migration for staging" 
This reverts commit 93f4f341ce.
 2017-12-27 15:31:12 -06:00
Andrew Brown
93f4f341ce temporary commenting out of old migration for staging 2017-12-27 15:24:13 -06:00
Andrew Brown
f49d056fe5 temporarily comment out migration for staging 2017-12-27 15:20:21 -06:00
Andrew Brown
e0b83eefa3 Create user content type activators 2017-12-27 12:22:13 -06:00
Andrew Brown
08e03fd70f Show forum followers per thread 2017-12-26 19:14:57 -06:00
Andrew Brown
049b59ac15 Add 'love interest' linked field to characters 2017-12-26 15:44:35 -06:00
Andrew Brown
50070c4a9f Add soft deletion to users and all content models 2017-12-26 14:37:09 -06:00
Andrew Brown
dcee646739 add delayed_job table 2017-10-29 02:03:56 +03:00
Andrew Brown
807f67d702 remove wrong admin flag 2017-10-29 01:17:46 +03:00
Andrew Brown
c503825fd5 add boolean admin flag for forums 2017-10-29 01:11:32 +03:00
Andrew Brown
d253e7c36c hide sidenav link for soft launch + testing 2017-10-28 22:19:25 +03:00
Andrew Brown
4e8d1ba9b8 Merge branch 'master' into thredded 2017-10-28 21:10:24 +03:00
Andrew Brown
07caf0ba6f Fix migration name so it runs properly 2017-10-04 14:10:55 +02:00
Andrew Brown
7f183c4a41 Rename migration potentially breaking literally everything 2017-09-30 21:32:47 +02:00
Andrew Brown
577de5f447 Merge branch 'master' into thredded 
Conflicts:
	db/schema.rb
 2017-09-30 15:44:27 +02:00
Andrew Brown
e1e5c9bdfa cleanup 2017-08-17 00:49:07 +02:00
Andrew Brown
0022adb953 Contributor invite flow #migration 2017-08-15 01:41:43 +02:00
Andrew Brown
8a5c53e467 Add flora relations 2017-07-31 03:20:36 +02:00
Andrew Brown
d6daf0c204 Add Flora model #migration 2017-07-31 02:39:13 +02:00
Andrew Brown
ead954094b polishing 2017-07-26 20:53:05 +02:00
Andrew Brown
8bbd46af3f thredded in place 2017-07-24 14:17:57 +02:00
Andrew Brown
63d4c442cc Add content changelogs #migration 2017-07-14 13:36:32 +02:00
Andrew Brown
82e8da4d6f Give users a choice between full-width and fixed-width designs #migration 2017-05-17 17:51:55 +01:00
Andrew Brown
6eb2e08102 Add scratchpad page and update sidebar design #migration 2017-05-17 16:54:30 +01:00
Andrew Brown
4aef7b9d83 Add raffle entries to users #datamigration 2017-04-17 20:08:58 +01:00
Andrew Brown
88a0d973b2 Add votable and votes 2017-04-15 20:26:15 +01:00
Andrew Brown
29d7a203d4 Add SecureCode to all users 2017-04-15 19:38:00 +01:00
Andrew Brown
a63afd71fc Integrate referral codes with signup #migrations 2017-04-03 19:10:05 +01:00
Andrew Brown
29395d276a Add user referral codes 2017-03-31 01:23:09 +01:00
Andrew Brown
5856865504 Add genre field to universe 2017-03-26 18:03:00 +01:00
Andrew Brown
7e782f7c40 Add languages link to locations 2017-03-26 17:44:52 +01:00
Andrew Brown
476cc7e7ab Add seed flag for generating a lot more seed data 2017-03-02 14:09:25 +00:00
Andrew Brown
e80c6a22a6 Add character-spouse two-way relation, and 2w related creatures relation 2017-02-28 16:46:47 +00:00
Andrew Brown
3da3e694a6 Show bandwidth on billing page, up kb to 1GB for premium users 2017-02-18 02:55:59 +00:00
Andrew Brown
565d5b9db8 Add 50MB upload bandwidth to all users 2017-02-18 01:13:43 +00:00
Andrew Brown
eec596133b Add ImageUpload model 2017-02-16 21:20:55 +00:00
Andrew Brown
95d2b338f7 Include missing migration for selected_billing_plan_id 2017-02-01 15:22:31 +00:00
Andrew Brown
459fee484b Add per-user email subscription preference and way to edit 2017-01-27 21:00:11 +00:00
Andrew Brown
1ec58d3b7b Model for subscriptions #migration 2017-01-20 21:48:05 +00:00
Andrew Brown
0434242a94 BillingPlan model #migration 2017-01-20 21:45:39 +00:00
Andrew Brown
7186f59665 Add stripe customer id field to user #migration 2017-01-20 21:42:57 +00:00
Andrew Brown
d5ab5dc14b Stop trying to drop tables that don't exist - fixes #166 2016-11-05 23:09:35 +01:00
Andrew Brown
9451c60d6f Add group memberships and locations 2016-11-02 21:35:41 +01:00
Andrew Brown
f4eb1ed4b5 Add plan type on user model 2016-11-02 10:52:40 +01:00
Andrew Brown
5c75658778 drop languages table on the ol' roku 2016-11-01 23:06:42 +01:00
Andrew Brown
3482464e0b Drop magics table 2016-11-01 23:03:38 +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
Andrew Brown
4fbbbce411 Fix privacy fields on new content types 2016-10-30 02:33:59 +02:00
Matthew Werner
0c84046330 clean up unnecessary changes 2016-10-25 16:48:07 -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
Andrew Brown
c70c079f56 Add characters, locations, and items relations to scenes 2016-10-24 22:55:46 +02:00
Andrew Brown
3a0f23b3e1 Add magic relations, add spoken language relation to characters 2016-10-24 22:30:38 +02:00
Andrew Brown
8b0ce69d56 Add relations to groups 2016-10-24 14:52:30 +02:00
Andrew Brown
44d13f7086 Fix up religion links 2016-10-24 14:06:28 +02:00
Andrew Brown
33f11a8c0b Add links to religions 2016-10-22 01:21:44 +02:00
Andrew Brown
411eff77bb Create and associate races for each character with a race value 2016-10-22 00:26:00 +02:00
Andrew Brown
c3830ed4c8 Remove old password_digest field from users 2016-10-21 23:38:36 +02:00
Andrew Brown
f2895837f8 Round out race planning 2016-10-21 23:02:26 +02:00
Andrew Brown
8dd30d181e Link creatures to Location habitats 2016-10-21 13:53:55 +02:00
Andrew Brown
77ab817ddf Add groups as content type 2016-10-17 23:54:23 +02:00
Andrew Brown
8d3e7ecbad Add scenes as a content type 2016-10-17 00:18:15 +02:00
Andrew Brown
618c791377 Add languages as content type 2016-10-16 23:58:54 +02:00
Andrew Brown
7add2f055a Add magic as a content type 2016-10-16 23:29:36 +02:00
Andrew Brown
275ab75355 Add religion as a content type 2016-10-15 00:46:46 +02:00
Andrew Brown
3440db3b5e Add race as content type 2016-10-15 00:15:36 +02:00
Andrew Brown
1f4198828a Clean up redundant views 2016-10-14 23:34:59 +02:00
Andrew Brown
4440c7b2df Add creatures content type 2016-10-14 23:26:32 +02:00
Matthew Werner
b983fb36ad more small adjustments 2016-10-10 23:21:43 -07:00
Matthew Werner
5a3cfcb6d1 Convert attribute_categories to system categories 2016-10-10 14:47:51 -07:00
Andrew Brown
6eda3a9fa3 Add requested fields to locations 2016-10-05 14:09:21 +02:00
Andrew Brown
ee9841c387 Add 'nature' tab to characters 2016-10-05 14:00:03 +02:00
Andrew Brown
ff83359f1b Add rules field to universe 2016-10-05 13:25:29 +02:00
Andrew Brown
b0b57e2e40 Don't prepopulate author name to 'Anon author' on signup 2016-10-05 12:42:51 +02:00
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
Robert Richter
af7af4a3e2
Rubocop auto-correct 2016-08-26 14:56:52 -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
b7771f4a27 Merge branch 'master' of https://github.com/indentlabs/Indent 2016-07-31 02:00:39 -05:00
Andrew Brown
28cd4c4739 add proof of concept editor 2016-07-31 00:20:28 -05:00
Robert Richter
534c9519e1 Start getting build closer to passing 
Also updated URLs to point to new org repo.
 2016-07-05 17:47:47 -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
395fc83b89 Remove siblings from Character 2016-04-29 13:58:53 -05:00
Andrew Brown
9719fdbeed cleanup 2016-04-27 16:22:12 -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
a2390a1c47 Add missing variable to seeds files 2015-04-19 15:33:14 -05:00
Robert Richter
b0b4b2cc0f Clean style of seeds file 2015-03-28 22:03:23 -05:00
Robert Richter
00e793bf1e Refactor style using the Rubocop auto-correct 2015-03-25 22:42:45 -05:00
Robert Richter
4ff118e112 Uncomment Location seed 2015-03-23 23:53:55 -05:00
Robert Richter
4ef4e082ff Write seeds.rb. Closes #356. 
However, due to bugs #415 and #416, we are currently unable to seed locations.
 2015-03-22 16:12:20 -05:00
Robert Richter
a505eaaa5d Create Model tables in the database 2015-03-17 21:08:11 -05:00
Andrew Brown
51caaa56cc Add field tests pointed out didn't export 2015-03-16 02:26:00 -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
Andrew Brown
bb7c5eeee4 rails app 2012-12-22 17:39:34 -06:00