Jorge Luiz
ea6ac42e75
Removed own email validation to avoid duplicate error messages
2017-10-17 23:47:44 -02:00
Andrew Brown
56d9ffdef2
Merge branch 'master' of github.com:indentlabs/notebook
2017-10-18 02:55:38 +03:00
Andrew Brown
350cbafcf9
Merge branch 'master' of https://git.heroku.com/production-1
2017-10-18 02:55:15 +03:00
Andrew Brown
df27905a5c
update 1GB -> 10GB references I missed
2017-10-18 02:54:42 +03:00
Andrew Brown
c9059ddfa8
Merge branch 'master' of https://git.heroku.com/production-1
2017-10-17 21:43:50 +02:00
Andrew Brown
51249a447e
Don't try to delete siblings if they've already been deleted
2017-10-17 21:43:26 +02:00
Andrew Brown
2d5fb83665
Merge branch 'master' of https://git.heroku.com/production-1
2017-10-17 16:45:01 +03:00
Andrew Brown
0a8d36d470
Show pets field on character form
2017-10-17 16:42:10 +03:00
Andrew Brown
8539623c27
Merge pull request #242 from babu-thomas/babu-thomas-patch-1
...
Update README to add Docker Compose install step
2017-10-15 21:02:24 +03:00
Babu Thomas
91e3720af5
Update README to add Docker Compose install step
...
While setting up the project through Docker, Docker Compose needs to be installed separately after installation of Docker. So, added that as a step in the installation instructions.
2017-10-15 21:42:44 +05:30
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
c310bf2406
Upgrade rake
2017-10-04 14:31:57 +02:00
Andrew Brown
4a92f60396
Update readme with libpq-dev and data_migrations:create_default_billing_plans
2017-10-04 14:17:14 +02:00
Andrew Brown
07caf0ba6f
Fix migration name so it runs properly
2017-10-04 14:10:55 +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
0c32e2b59b
fix 500
2017-10-02 16:35:56 +02:00
Andrew Brown
67e83c2f43
Allow anyone on premium to create universes regardless of current subscription
2017-10-02 16:33:44 +02:00
Andrew Brown
fa57f7a3a4
Exclude attributefields from containing-universe checks
2017-10-02 15:33:00 +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
37d94ba461
Include proper params on contrib notice
2017-10-01 22:51:38 +02:00
Andrew Brown
4202d90fed
Merge pull request #229 from indentlabs/collaboration
...
Allows users to collaborate on universes together
2017-10-01 15:45:29 -05:00
Andrew Brown
9e62bd003b
Include referral codes on emails sent to new users
2017-10-01 21:52:48 +02:00
Andrew Brown
9ac6597256
Send invitation emails to new collaborators
2017-10-01 13:17:25 +02:00
Andrew Brown
38f04ed461
Add mailer and emails for contributor invitations
2017-10-01 12:51:03 +02:00
Andrew Brown
eba5096129
Require user presence on universe
2017-10-01 12:23:52 +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
f9ccf97020
Merge branch 'master' into collaboration
2017-09-30 23:01:27 +02:00
Andrew Brown
a0e6c27332
regenerated schema
2017-09-30 23:01:22 +02:00
Andrew Brown
7f183c4a41
Rename migration potentially breaking literally everything
2017-09-30 21:32:47 +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
52563da51e
Merge pull request #232 from indentlabs/fix-tests
...
Fix tests
2017-09-30 08:01:57 -05:00
Andrew Brown
c3ea552ed8
Fix serendipitious test on content pages
2017-09-30 14:51:53 +02:00
Andrew Brown
e021acc60c
Fix content editing/saving tests
2017-09-30 14:47:55 +02:00
Andrew Brown
7d9539388f
Only use mixpanel in production
2017-09-30 14:08:49 +02:00
Andrew Brown
ff62dd7f84
Remove unnecessary dependencies for app.json/staging
2017-09-29 22:18:23 +02:00
Andrew Brown
16828ed1fc
Update app.json that heroku added to repo without confirmation?
2017-09-29 21:59:36 +02:00
Andrew Brown
170a4e13f7
Merge branch 'master' of github.com:indentlabs/notebook
2017-09-29 21:57:29 +02:00
Andrew Brown
d57944d5ac
Add Heroku generated app.json
2017-09-29 14:56:30 -05: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