Commit Graph

366 Commits

Author SHA1 Message Date
Andrew Brown
fb602b7d95 Fix tests that were creating a universe with no user 2017-10-01 12:21:53 +02:00
Andrew Brown
f09bf94e39 Merge branch 'master' into collaboration
Conflicts:
	app/controllers/content_controller.rb
2017-09-30 15:09:11 +02:00
Andrew Brown
7d9539388f Only use mixpanel in production 2017-09-30 14:08:49 +02:00
Andrew Brown
f47741558b we're making things happen 2017-08-17 03:10:18 +02:00
Andrew Brown
dfdc958ab8 it'll all be over soon 2017-08-17 02:35:38 +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
c150e20eac content creation permissions 2017-08-17 00:29:48 +02:00
Andrew Brown
cfddd9a7ad allow scoping to contrib universes 2017-08-15 14:30:54 +02:00
Andrew Brown
39327f8d5f assign invites to users on signup 2017-08-15 13:51:17 +02:00
Andrew Brown
5be74214cc allow leaving a universe as collaborator 2017-08-15 13:38:56 +02:00
Andrew Brown
4b57069fa6 Allow viewing/editing collaborative content 2017-08-15 04:47:30 +02:00
Andrew Brown
8be6113fbe include contributor content in content lists 2017-08-15 04:08:26 +02:00
Andrew Brown
4eea63b868 removing contributors flow 2017-08-15 03:10:46 +02:00
Andrew Brown
1f9346f2fd Create contributors in flow 2017-08-15 02:10:31 +02:00
Andrew Brown
0022adb953 Contributor invite flow #migration 2017-08-15 01:41:43 +02:00
Andrew Brown
f3f40c97fd Scope content properly 2017-08-08 01:08:09 +02:00
Andrew Brown
cbda4b4c71 Order universe content list 2017-08-05 02:05:11 +02:00
Andrew Brown
06c2d08c9b Universe-specific relation pages for content types 2017-08-05 01:52:20 +02:00
Andrew Brown
bd1a16cbff Allow changing flora privacy 2017-07-31 13:35:18 +02:00
Andrew Brown
7ce2864d3a add flora to contexts 2017-07-31 03:37:15 +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
a706444e83 Require users to be logged in to search 2017-06-20 17:16:41 +00:00
Andrew Brown
578b365c22 Add super-secret search results page 2017-06-20 16:34:17 +00:00
Andrew Brown
30cc6101f0 Clarify hour of drawing 2017-06-14 18:20:43 +00:00
Andrew Brown
f8eb898e92 add pinboard starter 2017-06-02 17:12:03 +00:00
Andrew Brown
6bab8f6cb3 Default billing plans should have 0 cents per month 2017-05-23 17:26:08 +00:00
Andrew Brown
258e49a105 Require login for notes page 2017-05-18 00:01:17 +01: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
310dd17ed0 If a user subscribes without a referrer, treat them as referring themselves 2017-05-03 17:51:25 +01:00
Andrew Brown
adcea851f4 Add babel translation app 2017-05-01 15:35:03 +01:00
Andrew Brown
8bcd9172b7 Integrated js navigator PoC 2017-04-30 01:57:44 +01:00
Andrew Brown
be30adb9f2 Redirect after voting even if no referer is set 2017-04-28 13:21:04 +01:00
Andrew Brown
e731074e1c syntax error 2017-04-27 21:31:29 +01:00
Andrew Brown
c6d93ee94f Don't give extra kb for switching between premiums 2017-04-27 21:17:17 +01:00
Andrew Brown
5d59c8f3a3 update raffle date 2017-04-27 19:49:05 +01:00
Andrew Brown
b1eb2a8155 Add community drive infos to billing page 2017-04-17 21:47:25 +01:00
Andrew Brown
4aef7b9d83 Add raffle entries to users #datamigration 2017-04-17 20:08:58 +01:00
Andrew Brown
cc0662c1c3 Store referral codes in session so users can browse around a bit before signing up 2017-04-17 18:29:44 +01:00
Andrew Brown
8d0bda1230 Add sign in link for referral login origin 2017-04-17 17:55:54 +01:00
Andrew Brown
c3b00257a2 Voting MVP 2017-04-17 16:22:02 +01:00
Andrew Brown
86ae882c51 Add one-click unsubscribe action for emails 2017-04-15 19:44:30 +01:00
Andrew Brown
6ebb512085 Fix subscription reporting 2017-04-11 18:05:57 +01:00
Andrew Brown
ce6dda81b6 Add worldbuilding prompts page 2017-04-11 17:47:47 +01:00
Andrew Brown
5a14e17957 Verbiage tweaks on new plans 2017-04-11 17:01:25 +01:00
Andrew Brown
a63afd71fc Integrate referral codes with signup #migrations 2017-04-03 19:10:05 +01:00
Andrew Brown
b9d0f8640d Clean up unused views 2017-04-03 17:28:52 +01:00
Andrew Brown
4f58fed792 /for/friends improvements 2017-03-30 21:38:45 +01:00