Commit Graph

84 Commits

Author SHA1 Message Date
Andrew Brown
720659cbe0 create content activators for new accounts 2017-12-27 12:25:05 -06:00
Andrew Brown
e0b83eefa3 Create user content type activators 2017-12-27 12:22:13 -06:00
Andrew Brown
0f33c98d29 fix forums permission 2017-12-26 21:38:44 -06:00
Andrew Brown
05de8b7ef7 blowin up 2017-12-26 16:35:34 -06:00
Andrew Brown
f626b65d53 redesign account info page 2017-12-26 15:01:23 -06:00
Andrew Brown
50070c4a9f Add soft deletion to users and all content models 2017-12-26 14:37:09 -06:00
Andrew Brown
5b2f0a064d prepend forum usernames with @ 2017-10-29 02:00:56 +03:00
Andrew Brown
4e8d1ba9b8 Merge branch 'master' into thredded 2017-10-28 21:10:24 +03:00
Jorge Luiz
ea6ac42e75 Removed own email validation to avoid duplicate error messages 2017-10-17 23:47:44 -02:00
Andrew Brown
617391366a De-dupe contributable content from dashboard content counts 2017-10-08 23:51:58 +02:00
Andrew Brown
baf7d2795d Make everything free 2017-10-02 18:26:21 +02:00
Andrew Brown
dfdc958ab8 it'll all be over soon 2017-08-17 02:35:38 +02:00
Andrew Brown
32cd18c7cf helper methods for contributable content types 2017-08-17 02:04:22 +02:00
Andrew Brown
e1e5c9bdfa cleanup 2017-08-17 00:49:07 +02:00
Andrew Brown
dfdb81d854 more permissions 2017-08-17 00:30:48 +02:00
Andrew Brown
0022adb953 Contributor invite flow #migration 2017-08-15 01:41:43 +02:00
Andrew Brown
ead954094b polishing 2017-07-26 20:53:05 +02:00
Andrew Brown
63d4c442cc Add content changelogs #migration 2017-07-14 13:36:32 +02: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
ce6dda81b6 Add worldbuilding prompts page 2017-04-11 17:47:47 +01:00
Andrew Brown
3a0617b144 Subscription page redesign design 1? 2017-04-03 20:45:17 +01:00
Andrew Brown
29395d276a Add user referral codes 2017-03-31 01:23:09 +01:00
Andrew Brown
963769e3c9 Add mixpanel action tracking for all server actions 2017-02-21 17:12:43 +00:00
Andrew Brown
863116d8e4 Don't create stripe customers in test env :( 2017-01-25 16:45:33 +00:00
Andrew Brown
c6c34c5ac7 Rake task to add default stripe customers to all existing users 2017-01-23 15:33:49 +00:00
Andrew Brown
81b26c2505 Add stripe + initialize stripe customers on user create 2017-01-23 15:22:58 +00:00
Andrew Brown
c8502f1737 Methods for fetching active subscriptions and billing plans on users 2017-01-21 16:38:50 +00:00
Andrew Brown
6a8bebd01c Merge branch 'master' into authority
Conflicts:
	app/models/user.rb
2017-01-21 16:21:46 +00:00
Andrew Brown
16f58c81cb Clean up User model with has_content concern 2017-01-21 16:20:59 +00:00
Andrew Brown
8ae77f4b67 Implement authority for user permissions 2017-01-14 00:06:33 +01:00
Andrew Brown
efd4181972 Fix text data export 2016-11-02 14:00:18 +01:00
Andrew Brown
9e3b12bc6b Add new content types to user content count 2016-11-02 13:49: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
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
657be159c7 Minor dashboard/sidebar styling 2016-10-24 15:10:31 +02:00
Andrew Brown
69f6a7cbf0 Graphical headers on content index pages 2016-10-19 00:20:46 +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
4440c7b2df Add creatures content type 2016-10-14 23:26:32 +02:00
Matthew Werner
7b109eb12b clean up 2016-10-10 16:45:03 -07:00
Matthew Werner
5a3cfcb6d1 Convert attribute_categories to system categories 2016-10-10 14:47:51 -07:00