Commit Graph

764 Commits

Author SHA1 Message Date
Andrew Brown
df27905a5c update 1GB -> 10GB references I missed 2017-10-18 02:54:42 +03:00
Andrew Brown
2d5fb83665 Merge branch 'master' of https://git.heroku.com/production-1 2017-10-17 16:45:01 +03:00
Andrew Brown
83de8f4221 Merge branch 'master' of github.com:indentlabs/notebook 2017-10-12 14:01:04 +02:00
Andrew Brown
365e76951a Bugfix: Display identmarks field on characters 2017-10-12 13:59:28 +02:00
Andrew Brown
57c5145ff4 Add tool for datafilling characters 2017-10-09 00:26:29 +02:00
Andrew Brown
617391366a De-dupe contributable content from dashboard content counts 2017-10-08 23:51:58 +02:00
Andrew Brown
22eded2e8c Slightly bigger cards on the dashboard 2017-10-08 23:40:43 +02:00
Andrew Brown
67638b13a3 Update content to reflect recent premium upgrades 2017-10-08 23:28:34 +02:00
Andrew Brown
0d930b0760 Remove community drive blurb 2017-10-02 19:19:02 +02:00
Andrew Brown
baf7d2795d Make everything free 2017-10-02 18:26:21 +02:00
Andrew Brown
333f98a526 Add a 'new' badge on contributors in content sidelinks 2017-10-01 23:05:59 +02:00
Andrew Brown
5aa61e1c76 Don't show invitees to anyone other than content owner 2017-10-01 22:58:16 +02:00
Andrew Brown
9e62bd003b Include referral codes on emails sent to new users 2017-10-01 21:52:48 +02:00
Andrew Brown
38f04ed461 Add mailer and emails for contributor invitations 2017-10-01 12:51:03 +02:00
Andrew Brown
fb602b7d95 Fix tests that were creating a universe with no user 2017-10-01 12:21:53 +02:00
Andrew Brown
d95f0f1c73 Don't show content footer to universe owner 2017-09-30 23:42:30 +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
e021acc60c Fix content editing/saving tests 2017-09-30 14:47:55 +02:00
Andrew Brown
93a7ba3f54 polishing 2017-08-17 19:56:59 +02:00
Andrew Brown
f55791f10d fix intermittent 500s 2017-08-17 18:23:40 +02:00
Andrew Brown
0e972c186b we're legitimate hackers now 2017-08-17 03:28:55 +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
3bcd339ef4 do a little raisin' to find this bug 2017-08-17 00:28:58 +02:00
Andrew Brown
cfddd9a7ad allow scoping to contrib universes 2017-08-15 14:30:54 +02:00
Andrew Brown
d1d157dbb4 privacy on private notes vs contributors 2017-08-15 14:17:46 +02:00
Andrew Brown
39327f8d5f assign invites to users on signup 2017-08-15 13:51:17 +02:00
Andrew Brown
b6240fc814 treat contribs as contribs even on content they create in another universe 2017-08-15 13:45:07 +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
189ad8d221 Polish up card list ui 2017-08-05 02:33:33 +02:00
Andrew Brown
10d121aed6 Whoops, fix 500 2017-08-05 02:27:48 +02:00
Andrew Brown
06c2d08c9b Universe-specific relation pages for content types 2017-08-05 01:52:20 +02:00
Andrew Brown
f2ae51b1b6 Update facebook page link in footer 2017-07-31 13:36:21 +02:00
Andrew Brown
053b16fd4e polishing 2017-07-31 03:49:24 +02:00
Andrew Brown
7ce2864d3a add flora to contexts 2017-07-31 03:37:15 +02:00
Andrew Brown
d6daf0c204 Add Flora model #migration 2017-07-31 02:39:13 +02:00
Andrew Brown
206b78e7e0 Remove links to community drive and feature voting from navbar 2017-07-24 13:40:17 +02:00
Andrew Brown
63d4c442cc Add content changelogs #migration 2017-07-14 13:36:32 +02:00
Andrew Brown
8f37f197a7 Scope dashboard content to the current universe scope 2017-06-20 17:46:11 +00:00
Andrew Brown
9def48fa3b Add search UI to navbar 2017-06-20 17:16:03 +00:00
Andrew Brown
578b365c22 Add super-secret search results page 2017-06-20 16:34:17 +00:00
Andrew Brown
7927099028 Fix display bug on universe picker name 2017-06-20 14:45:21 +00:00
Andrew Brown
e186c86aa9 Conclude community drive 2017-06-20 14:38:32 +00:00